From 9c87f9d3b2d375b5ebd337907adb7de9d0d64e40 Mon Sep 17 00:00:00 2001
From: Samuel Jackson <samueljackson@outlook.com>
Date: Thu, 26 Jul 2018 12:21:55 +0100
Subject: [PATCH] Fix clang-tidy modernize-use-nullptr warnings

---
 .../MantidICat/ICat3/GSoapGenerated/ICat3H.h  |  5224 ++--
 .../ICat3ICATPortBindingProxy.h               |   300 +-
 .../ICat3/GSoapGenerated/ICat3Stub.h          |   750 +-
 Framework/ICat/src/GSoap/soapserializersC.cpp |    10 +-
 Framework/ICat/src/GSoap/stdsoap2.cpp         |    45 +-
 .../ICat/src/ICat3/GSoapGenerated/ICat3C.cpp  | 22426 ++++++++--------
 .../ICat3ICATPortBindingProxy.cpp             |  1849 +-
 .../ICat/src/ICat4/GSoapGenerated/ICat4C.cpp  |  7019 ++---
 .../ICat4ICATPortBindingProxy.cpp             |   332 +-
 Framework/MDAlgorithms/test/LoadDNSSCDTest.h  |     8 +-
 MantidPlot/src/ApplicationWindow.cpp          |     4 +-
 MantidPlot/src/Process.cpp                    |     4 +-
 qt/widgets/common/src/DropEventHelper.cpp     |     2 +-
 qt/widgets/common/src/InterfaceManager.cpp    |     2 +-
 .../src/InstrumentWidgetPickTab.cpp           |     4 +-
 .../instrumentview/src/RotationSurface.cpp    |     2 +-
 16 files changed, 19430 insertions(+), 18551 deletions(-)

diff --git a/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3H.h b/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3H.h
index 1ec94efe057..f26d8082055 100644
--- a/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3H.h
+++ b/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3H.h
@@ -798,14 +798,14 @@ soap_instantiate_ns1__elementType_(struct soap *, int, const char *,
 
 inline ns1__elementType_ *soap_new_ns1__elementType_(struct soap *soap,
                                                      int n = -1) {
-  return soap_instantiate_ns1__elementType_(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__elementType_(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__elementType_ *
 soap_new_req_ns1__elementType_(struct soap *soap,
                                enum ns1__elementType __item) {
   ns1__elementType_ *_p =
-      soap_instantiate_ns1__elementType_(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__elementType_(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__elementType_::__item = __item;
@@ -817,7 +817,7 @@ inline ns1__elementType_ *
 soap_new_set_ns1__elementType_(struct soap *soap, enum ns1__elementType __item,
                                char *__item1) {
   ns1__elementType_ *_p =
-      soap_instantiate_ns1__elementType_(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__elementType_(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__elementType_::__item = __item;
@@ -873,14 +873,15 @@ soap_instantiate_ns1__parameterType_(struct soap *, int, const char *,
 
 inline ns1__parameterType_ *soap_new_ns1__parameterType_(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__parameterType_(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__parameterType_(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__parameterType_ *
 soap_new_req_ns1__parameterType_(struct soap *soap,
                                  enum ns1__parameterType __item) {
   ns1__parameterType_ *_p =
-      soap_instantiate_ns1__parameterType_(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__parameterType_(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__parameterType_::__item = __item;
@@ -891,7 +892,7 @@ soap_new_req_ns1__parameterType_(struct soap *soap,
 inline ns1__parameterType_ *soap_new_set_ns1__parameterType_(
     struct soap *soap, enum ns1__parameterType __item, char *__item1) {
   ns1__parameterType_ *_p =
-      soap_instantiate_ns1__parameterType_(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__parameterType_(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__parameterType_::__item = __item;
@@ -946,14 +947,14 @@ soap_instantiate_ns1__keywordType_(struct soap *, int, const char *,
 
 inline ns1__keywordType_ *soap_new_ns1__keywordType_(struct soap *soap,
                                                      int n = -1) {
-  return soap_instantiate_ns1__keywordType_(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__keywordType_(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__keywordType_ *
 soap_new_req_ns1__keywordType_(struct soap *soap,
                                enum ns1__keywordType __item) {
   ns1__keywordType_ *_p =
-      soap_instantiate_ns1__keywordType_(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__keywordType_(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__keywordType_::__item = __item;
@@ -965,7 +966,7 @@ inline ns1__keywordType_ *
 soap_new_set_ns1__keywordType_(struct soap *soap, enum ns1__keywordType __item,
                                char *__item1) {
   ns1__keywordType_ *_p =
-      soap_instantiate_ns1__keywordType_(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__keywordType_(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__keywordType_::__item = __item;
@@ -1022,14 +1023,15 @@ soap_instantiate_ns1__comparisonOperator_(struct soap *, int, const char *,
 
 inline ns1__comparisonOperator_ *
 soap_new_ns1__comparisonOperator_(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__comparisonOperator_(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__comparisonOperator_(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__comparisonOperator_ *
 soap_new_req_ns1__comparisonOperator_(struct soap *soap,
                                       enum ns1__comparisonOperator __item) {
-  ns1__comparisonOperator_ *_p =
-      soap_instantiate_ns1__comparisonOperator_(soap, -1, NULL, NULL, NULL);
+  ns1__comparisonOperator_ *_p = soap_instantiate_ns1__comparisonOperator_(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__comparisonOperator_::__item = __item;
@@ -1039,8 +1041,8 @@ soap_new_req_ns1__comparisonOperator_(struct soap *soap,
 
 inline ns1__comparisonOperator_ *soap_new_set_ns1__comparisonOperator_(
     struct soap *soap, enum ns1__comparisonOperator __item, char *__item1) {
-  ns1__comparisonOperator_ *_p =
-      soap_instantiate_ns1__comparisonOperator_(soap, -1, NULL, NULL, NULL);
+  ns1__comparisonOperator_ *_p = soap_instantiate_ns1__comparisonOperator_(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__comparisonOperator_::__item = __item;
@@ -1097,14 +1099,15 @@ soap_instantiate_ns1__parameterValueType_(struct soap *, int, const char *,
 
 inline ns1__parameterValueType_ *
 soap_new_ns1__parameterValueType_(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__parameterValueType_(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__parameterValueType_(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__parameterValueType_ *
 soap_new_req_ns1__parameterValueType_(struct soap *soap,
                                       enum ns1__parameterValueType __item) {
-  ns1__parameterValueType_ *_p =
-      soap_instantiate_ns1__parameterValueType_(soap, -1, NULL, NULL, NULL);
+  ns1__parameterValueType_ *_p = soap_instantiate_ns1__parameterValueType_(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__parameterValueType_::__item = __item;
@@ -1114,8 +1117,8 @@ soap_new_req_ns1__parameterValueType_(struct soap *soap,
 
 inline ns1__parameterValueType_ *soap_new_set_ns1__parameterValueType_(
     struct soap *soap, enum ns1__parameterValueType __item, char *__item1) {
-  ns1__parameterValueType_ *_p =
-      soap_instantiate_ns1__parameterValueType_(soap, -1, NULL, NULL, NULL);
+  ns1__parameterValueType_ *_p = soap_instantiate_ns1__parameterValueType_(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__parameterValueType_::__item = __item;
@@ -1171,14 +1174,15 @@ soap_instantiate_ns1__sampleInclude_(struct soap *, int, const char *,
 
 inline ns1__sampleInclude_ *soap_new_ns1__sampleInclude_(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__sampleInclude_(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__sampleInclude_(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__sampleInclude_ *
 soap_new_req_ns1__sampleInclude_(struct soap *soap,
                                  enum ns1__sampleInclude __item) {
   ns1__sampleInclude_ *_p =
-      soap_instantiate_ns1__sampleInclude_(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__sampleInclude_(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__sampleInclude_::__item = __item;
@@ -1189,7 +1193,7 @@ soap_new_req_ns1__sampleInclude_(struct soap *soap,
 inline ns1__sampleInclude_ *soap_new_set_ns1__sampleInclude_(
     struct soap *soap, enum ns1__sampleInclude __item, char *__item1) {
   ns1__sampleInclude_ *_p =
-      soap_instantiate_ns1__sampleInclude_(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__sampleInclude_(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__sampleInclude_::__item = __item;
@@ -1248,14 +1252,15 @@ soap_instantiate_ns1__restrictionAttributes_(struct soap *, int, const char *,
 
 inline ns1__restrictionAttributes_ *
 soap_new_ns1__restrictionAttributes_(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__restrictionAttributes_(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__restrictionAttributes_(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__restrictionAttributes_ *soap_new_req_ns1__restrictionAttributes_(
     struct soap *soap, enum ns1__restrictionAttributes __item) {
   ns1__restrictionAttributes_ *_p =
-      soap_instantiate_ns1__restrictionAttributes_(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__restrictionAttributes_(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__restrictionAttributes_::__item = __item;
@@ -1266,7 +1271,8 @@ inline ns1__restrictionAttributes_ *soap_new_req_ns1__restrictionAttributes_(
 inline ns1__restrictionAttributes_ *soap_new_set_ns1__restrictionAttributes_(
     struct soap *soap, enum ns1__restrictionAttributes __item, char *__item1) {
   ns1__restrictionAttributes_ *_p =
-      soap_instantiate_ns1__restrictionAttributes_(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__restrictionAttributes_(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__restrictionAttributes_::__item = __item;
@@ -1324,14 +1330,15 @@ soap_instantiate_ns1__investigationInclude_(struct soap *, int, const char *,
 
 inline ns1__investigationInclude_ *
 soap_new_ns1__investigationInclude_(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__investigationInclude_(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__investigationInclude_(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline ns1__investigationInclude_ *
 soap_new_req_ns1__investigationInclude_(struct soap *soap,
                                         enum ns1__investigationInclude __item) {
-  ns1__investigationInclude_ *_p =
-      soap_instantiate_ns1__investigationInclude_(soap, -1, NULL, NULL, NULL);
+  ns1__investigationInclude_ *_p = soap_instantiate_ns1__investigationInclude_(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__investigationInclude_::__item = __item;
@@ -1341,8 +1348,8 @@ soap_new_req_ns1__investigationInclude_(struct soap *soap,
 
 inline ns1__investigationInclude_ *soap_new_set_ns1__investigationInclude_(
     struct soap *soap, enum ns1__investigationInclude __item, char *__item1) {
-  ns1__investigationInclude_ *_p =
-      soap_instantiate_ns1__investigationInclude_(soap, -1, NULL, NULL, NULL);
+  ns1__investigationInclude_ *_p = soap_instantiate_ns1__investigationInclude_(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__investigationInclude_::__item = __item;
@@ -1399,14 +1406,15 @@ soap_instantiate_ns1__datasetInclude_(struct soap *, int, const char *,
 
 inline ns1__datasetInclude_ *soap_new_ns1__datasetInclude_(struct soap *soap,
                                                            int n = -1) {
-  return soap_instantiate_ns1__datasetInclude_(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__datasetInclude_(soap, n, nullptr, nullptr,
+                                               nullptr);
 }
 
 inline ns1__datasetInclude_ *
 soap_new_req_ns1__datasetInclude_(struct soap *soap,
                                   enum ns1__datasetInclude __item) {
-  ns1__datasetInclude_ *_p =
-      soap_instantiate_ns1__datasetInclude_(soap, -1, NULL, NULL, NULL);
+  ns1__datasetInclude_ *_p = soap_instantiate_ns1__datasetInclude_(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__datasetInclude_::__item = __item;
@@ -1416,8 +1424,8 @@ soap_new_req_ns1__datasetInclude_(struct soap *soap,
 
 inline ns1__datasetInclude_ *soap_new_set_ns1__datasetInclude_(
     struct soap *soap, enum ns1__datasetInclude __item, char *__item1) {
-  ns1__datasetInclude_ *_p =
-      soap_instantiate_ns1__datasetInclude_(soap, -1, NULL, NULL, NULL);
+  ns1__datasetInclude_ *_p = soap_instantiate_ns1__datasetInclude_(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__datasetInclude_::__item = __item;
@@ -1473,14 +1481,15 @@ soap_instantiate_ns1__datafileInclude_(struct soap *, int, const char *,
 
 inline ns1__datafileInclude_ *soap_new_ns1__datafileInclude_(struct soap *soap,
                                                              int n = -1) {
-  return soap_instantiate_ns1__datafileInclude_(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__datafileInclude_(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline ns1__datafileInclude_ *
 soap_new_req_ns1__datafileInclude_(struct soap *soap,
                                    enum ns1__datafileInclude __item) {
-  ns1__datafileInclude_ *_p =
-      soap_instantiate_ns1__datafileInclude_(soap, -1, NULL, NULL, NULL);
+  ns1__datafileInclude_ *_p = soap_instantiate_ns1__datafileInclude_(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__datafileInclude_::__item = __item;
@@ -1490,8 +1499,8 @@ soap_new_req_ns1__datafileInclude_(struct soap *soap,
 
 inline ns1__datafileInclude_ *soap_new_set_ns1__datafileInclude_(
     struct soap *soap, enum ns1__datafileInclude __item, char *__item1) {
-  ns1__datafileInclude_ *_p =
-      soap_instantiate_ns1__datafileInclude_(soap, -1, NULL, NULL, NULL);
+  ns1__datafileInclude_ *_p = soap_instantiate_ns1__datafileInclude_(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__datafileInclude_::__item = __item;
@@ -1547,14 +1556,15 @@ soap_instantiate_ns1__logicalOperator_(struct soap *, int, const char *,
 
 inline ns1__logicalOperator_ *soap_new_ns1__logicalOperator_(struct soap *soap,
                                                              int n = -1) {
-  return soap_instantiate_ns1__logicalOperator_(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__logicalOperator_(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline ns1__logicalOperator_ *
 soap_new_req_ns1__logicalOperator_(struct soap *soap,
                                    enum ns1__logicalOperator __item) {
-  ns1__logicalOperator_ *_p =
-      soap_instantiate_ns1__logicalOperator_(soap, -1, NULL, NULL, NULL);
+  ns1__logicalOperator_ *_p = soap_instantiate_ns1__logicalOperator_(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__logicalOperator_::__item = __item;
@@ -1564,8 +1574,8 @@ soap_new_req_ns1__logicalOperator_(struct soap *soap,
 
 inline ns1__logicalOperator_ *soap_new_set_ns1__logicalOperator_(
     struct soap *soap, enum ns1__logicalOperator __item, char *__item1) {
-  ns1__logicalOperator_ *_p =
-      soap_instantiate_ns1__logicalOperator_(soap, -1, NULL, NULL, NULL);
+  ns1__logicalOperator_ *_p = soap_instantiate_ns1__logicalOperator_(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__logicalOperator_::__item = __item;
@@ -1622,13 +1632,14 @@ soap_instantiate_ns3__NoSuchUserException(struct soap *, int, const char *,
 
 inline ns3__NoSuchUserException *
 soap_new_ns3__NoSuchUserException(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns3__NoSuchUserException(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns3__NoSuchUserException(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns3__NoSuchUserException *
 soap_new_req_ns3__NoSuchUserException(struct soap *soap) {
-  ns3__NoSuchUserException *_p =
-      soap_instantiate_ns3__NoSuchUserException(soap, -1, NULL, NULL, NULL);
+  ns3__NoSuchUserException *_p = soap_instantiate_ns3__NoSuchUserException(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -1639,8 +1650,8 @@ inline ns3__NoSuchUserException *
 soap_new_set_ns3__NoSuchUserException(struct soap *soap, std::string *message,
                                       std::string *stackTraceAsString,
                                       std::string *uniqueId, char *__item1) {
-  ns3__NoSuchUserException *_p =
-      soap_instantiate_ns3__NoSuchUserException(soap, -1, NULL, NULL, NULL);
+  ns3__NoSuchUserException *_p = soap_instantiate_ns3__NoSuchUserException(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns3__NoSuchUserException::message = message;
@@ -1701,14 +1712,15 @@ soap_instantiate_ns3__getUserDetailsResponse(struct soap *, int, const char *,
 
 inline ns3__getUserDetailsResponse *
 soap_new_ns3__getUserDetailsResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns3__getUserDetailsResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns3__getUserDetailsResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns3__getUserDetailsResponse *
 soap_new_req_ns3__getUserDetailsResponse(struct soap *soap) {
   ns3__getUserDetailsResponse *_p =
-      soap_instantiate_ns3__getUserDetailsResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns3__getUserDetailsResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -1718,7 +1730,8 @@ soap_new_req_ns3__getUserDetailsResponse(struct soap *soap) {
 inline ns3__getUserDetailsResponse *soap_new_set_ns3__getUserDetailsResponse(
     struct soap *soap, ns1__userDetails *return_, char *__item1) {
   ns3__getUserDetailsResponse *_p =
-      soap_instantiate_ns3__getUserDetailsResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns3__getUserDetailsResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns3__getUserDetailsResponse::return_ = return_;
@@ -1775,13 +1788,14 @@ soap_instantiate_ns3__getUserDetails(struct soap *, int, const char *,
 
 inline ns3__getUserDetails *soap_new_ns3__getUserDetails(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns3__getUserDetails(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns3__getUserDetails(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns3__getUserDetails *
 soap_new_req_ns3__getUserDetails(struct soap *soap) {
   ns3__getUserDetails *_p =
-      soap_instantiate_ns3__getUserDetails(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns3__getUserDetails(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -1792,7 +1806,7 @@ inline ns3__getUserDetails *
 soap_new_set_ns3__getUserDetails(struct soap *soap, std::string *sessionId,
                                  std::string *usersName, char *__item1) {
   ns3__getUserDetails *_p =
-      soap_instantiate_ns3__getUserDetails(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns3__getUserDetails(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns3__getUserDetails::sessionId = sessionId;
@@ -1850,13 +1864,14 @@ soap_instantiate_ns3__ValidationException(struct soap *, int, const char *,
 
 inline ns3__ValidationException *
 soap_new_ns3__ValidationException(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns3__ValidationException(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns3__ValidationException(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns3__ValidationException *
 soap_new_req_ns3__ValidationException(struct soap *soap) {
-  ns3__ValidationException *_p =
-      soap_instantiate_ns3__ValidationException(soap, -1, NULL, NULL, NULL);
+  ns3__ValidationException *_p = soap_instantiate_ns3__ValidationException(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -1867,8 +1882,8 @@ inline ns3__ValidationException *
 soap_new_set_ns3__ValidationException(struct soap *soap, std::string *message,
                                       std::string *stackTraceAsString,
                                       std::string *uniqueId, char *__item1) {
-  ns3__ValidationException *_p =
-      soap_instantiate_ns3__ValidationException(soap, -1, NULL, NULL, NULL);
+  ns3__ValidationException *_p = soap_instantiate_ns3__ValidationException(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns3__ValidationException::message = message;
@@ -1930,15 +1945,15 @@ soap_instantiate_ns3__NoSuchObjectFoundException(struct soap *, int,
 
 inline ns3__NoSuchObjectFoundException *
 soap_new_ns3__NoSuchObjectFoundException(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns3__NoSuchObjectFoundException(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate_ns3__NoSuchObjectFoundException(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline ns3__NoSuchObjectFoundException *
 soap_new_req_ns3__NoSuchObjectFoundException(struct soap *soap) {
   ns3__NoSuchObjectFoundException *_p =
-      soap_instantiate_ns3__NoSuchObjectFoundException(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns3__NoSuchObjectFoundException(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -1952,8 +1967,8 @@ soap_new_set_ns3__NoSuchObjectFoundException(struct soap *soap,
                                              std::string *uniqueId,
                                              char *__item1) {
   ns3__NoSuchObjectFoundException *_p =
-      soap_instantiate_ns3__NoSuchObjectFoundException(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns3__NoSuchObjectFoundException(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns3__NoSuchObjectFoundException::message = message;
@@ -2012,13 +2027,14 @@ soap_instantiate_ns3__SessionException(struct soap *, int, const char *,
 
 inline ns3__SessionException *soap_new_ns3__SessionException(struct soap *soap,
                                                              int n = -1) {
-  return soap_instantiate_ns3__SessionException(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns3__SessionException(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline ns3__SessionException *
 soap_new_req_ns3__SessionException(struct soap *soap) {
-  ns3__SessionException *_p =
-      soap_instantiate_ns3__SessionException(soap, -1, NULL, NULL, NULL);
+  ns3__SessionException *_p = soap_instantiate_ns3__SessionException(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -2029,8 +2045,8 @@ inline ns3__SessionException *
 soap_new_set_ns3__SessionException(struct soap *soap, std::string *message,
                                    std::string *stackTraceAsString,
                                    std::string *uniqueId, char *__item1) {
-  ns3__SessionException *_p =
-      soap_instantiate_ns3__SessionException(soap, -1, NULL, NULL, NULL);
+  ns3__SessionException *_p = soap_instantiate_ns3__SessionException(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns3__SessionException::message = message;
@@ -2101,7 +2117,7 @@ inline ns1__searchInvestigationByRestrictionComparasionResponse *
 soap_new_ns1__searchInvestigationByRestrictionComparasionResponse(
     struct soap *soap, int n = -1) {
   return soap_instantiate_ns1__searchInvestigationByRestrictionComparasionResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByRestrictionComparasionResponse *
@@ -2109,7 +2125,7 @@ soap_new_req_ns1__searchInvestigationByRestrictionComparasionResponse(
     struct soap *soap) {
   ns1__searchInvestigationByRestrictionComparasionResponse *_p =
       soap_instantiate_ns1__searchInvestigationByRestrictionComparasionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -2121,7 +2137,7 @@ soap_new_set_ns1__searchInvestigationByRestrictionComparasionResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchInvestigationByRestrictionComparasionResponse *_p =
       soap_instantiate_ns1__searchInvestigationByRestrictionComparasionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByRestrictionComparasionResponse::return_ =
@@ -2188,7 +2204,7 @@ inline ns1__searchInvestigationByRestrictionComparasion *
 soap_new_ns1__searchInvestigationByRestrictionComparasion(struct soap *soap,
                                                           int n = -1) {
   return soap_instantiate_ns1__searchInvestigationByRestrictionComparasion(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByRestrictionComparasion *
@@ -2196,7 +2212,7 @@ soap_new_req_ns1__searchInvestigationByRestrictionComparasion(
     struct soap *soap) {
   ns1__searchInvestigationByRestrictionComparasion *_p =
       soap_instantiate_ns1__searchInvestigationByRestrictionComparasion(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -2210,7 +2226,7 @@ soap_new_set_ns1__searchInvestigationByRestrictionComparasion(
     char *__item1) {
   ns1__searchInvestigationByRestrictionComparasion *_p =
       soap_instantiate_ns1__searchInvestigationByRestrictionComparasion(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByRestrictionComparasion::sessionId = sessionId;
@@ -2271,13 +2287,14 @@ soap_instantiate_ns1__getDatasetsResponse(struct soap *, int, const char *,
 
 inline ns1__getDatasetsResponse *
 soap_new_ns1__getDatasetsResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getDatasetsResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getDatasetsResponse(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__getDatasetsResponse *
 soap_new_req_ns1__getDatasetsResponse(struct soap *soap) {
-  ns1__getDatasetsResponse *_p =
-      soap_instantiate_ns1__getDatasetsResponse(soap, -1, NULL, NULL, NULL);
+  ns1__getDatasetsResponse *_p = soap_instantiate_ns1__getDatasetsResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -2286,8 +2303,8 @@ soap_new_req_ns1__getDatasetsResponse(struct soap *soap) {
 
 inline ns1__getDatasetsResponse *soap_new_set_ns1__getDatasetsResponse(
     struct soap *soap, std::vector<ns1__dataset *> &return_, char *__item1) {
-  ns1__getDatasetsResponse *_p =
-      soap_instantiate_ns1__getDatasetsResponse(soap, -1, NULL, NULL, NULL);
+  ns1__getDatasetsResponse *_p = soap_instantiate_ns1__getDatasetsResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getDatasetsResponse::return_ = return_;
@@ -2342,12 +2359,12 @@ soap_instantiate_ns1__getDatasets(struct soap *, int, const char *,
 
 inline ns1__getDatasets *soap_new_ns1__getDatasets(struct soap *soap,
                                                    int n = -1) {
-  return soap_instantiate_ns1__getDatasets(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getDatasets(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getDatasets *soap_new_req_ns1__getDatasets(struct soap *soap) {
   ns1__getDatasets *_p =
-      soap_instantiate_ns1__getDatasets(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getDatasets(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -2358,7 +2375,7 @@ inline ns1__getDatasets *
 soap_new_set_ns1__getDatasets(struct soap *soap, std::string *sessionId,
                               std::vector<LONG64> &datasetIds, char *__item1) {
   ns1__getDatasets *_p =
-      soap_instantiate_ns1__getDatasets(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getDatasets(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getDatasets::sessionId = sessionId;
@@ -2419,15 +2436,15 @@ soap_instantiate_ns1__modifyDataFileParameterResponse(struct soap *, int,
 
 inline ns1__modifyDataFileParameterResponse *
 soap_new_ns1__modifyDataFileParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifyDataFileParameterResponse(soap, n, NULL,
-                                                               NULL, NULL);
+  return soap_instantiate_ns1__modifyDataFileParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__modifyDataFileParameterResponse *
 soap_new_req_ns1__modifyDataFileParameterResponse(struct soap *soap) {
   ns1__modifyDataFileParameterResponse *_p =
-      soap_instantiate_ns1__modifyDataFileParameterResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__modifyDataFileParameterResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -2438,8 +2455,8 @@ inline ns1__modifyDataFileParameterResponse *
 soap_new_set_ns1__modifyDataFileParameterResponse(struct soap *soap,
                                                   char *__item1) {
   ns1__modifyDataFileParameterResponse *_p =
-      soap_instantiate_ns1__modifyDataFileParameterResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__modifyDataFileParameterResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -2498,14 +2515,15 @@ soap_instantiate_ns1__modifyDataFileParameter(struct soap *, int, const char *,
 
 inline ns1__modifyDataFileParameter *
 soap_new_ns1__modifyDataFileParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifyDataFileParameter(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate_ns1__modifyDataFileParameter(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline ns1__modifyDataFileParameter *
 soap_new_req_ns1__modifyDataFileParameter(struct soap *soap) {
   ns1__modifyDataFileParameter *_p =
-      soap_instantiate_ns1__modifyDataFileParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__modifyDataFileParameter(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -2516,7 +2534,8 @@ inline ns1__modifyDataFileParameter *soap_new_set_ns1__modifyDataFileParameter(
     struct soap *soap, std::string *sessionId,
     ns1__datafileParameter *dataFileParameter, char *__item1) {
   ns1__modifyDataFileParameter *_p =
-      soap_instantiate_ns1__modifyDataFileParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__modifyDataFileParameter(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__modifyDataFileParameter::sessionId = sessionId;
@@ -2577,14 +2596,15 @@ soap_instantiate_ns1__listParametersResponse(struct soap *, int, const char *,
 
 inline ns1__listParametersResponse *
 soap_new_ns1__listParametersResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__listParametersResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__listParametersResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__listParametersResponse *
 soap_new_req_ns1__listParametersResponse(struct soap *soap) {
   ns1__listParametersResponse *_p =
-      soap_instantiate_ns1__listParametersResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__listParametersResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -2594,7 +2614,8 @@ soap_new_req_ns1__listParametersResponse(struct soap *soap) {
 inline ns1__listParametersResponse *soap_new_set_ns1__listParametersResponse(
     struct soap *soap, std::vector<ns1__parameter *> &return_, char *__item1) {
   ns1__listParametersResponse *_p =
-      soap_instantiate_ns1__listParametersResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__listParametersResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listParametersResponse::return_ = return_;
@@ -2651,13 +2672,14 @@ soap_instantiate_ns1__listParameters(struct soap *, int, const char *,
 
 inline ns1__listParameters *soap_new_ns1__listParameters(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__listParameters(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__listParameters(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__listParameters *
 soap_new_req_ns1__listParameters(struct soap *soap) {
   ns1__listParameters *_p =
-      soap_instantiate_ns1__listParameters(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__listParameters(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -2668,7 +2690,7 @@ inline ns1__listParameters *
 soap_new_set_ns1__listParameters(struct soap *soap, std::string *sessionId,
                                  char *__item1) {
   ns1__listParameters *_p =
-      soap_instantiate_ns1__listParameters(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__listParameters(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listParameters::sessionId = sessionId;
@@ -2731,14 +2753,14 @@ inline ns1__searchSampleByParameterComparisonResponse *
 soap_new_ns1__searchSampleByParameterComparisonResponse(struct soap *soap,
                                                         int n = -1) {
   return soap_instantiate_ns1__searchSampleByParameterComparisonResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchSampleByParameterComparisonResponse *
 soap_new_req_ns1__searchSampleByParameterComparisonResponse(struct soap *soap) {
   ns1__searchSampleByParameterComparisonResponse *_p =
       soap_instantiate_ns1__searchSampleByParameterComparisonResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -2750,7 +2772,7 @@ soap_new_set_ns1__searchSampleByParameterComparisonResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchSampleByParameterComparisonResponse *_p =
       soap_instantiate_ns1__searchSampleByParameterComparisonResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByParameterComparisonResponse::return_ = return_;
@@ -2812,15 +2834,15 @@ soap_instantiate_ns1__searchSampleByParameterComparison(struct soap *, int,
 
 inline ns1__searchSampleByParameterComparison *
 soap_new_ns1__searchSampleByParameterComparison(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchSampleByParameterComparison(soap, n, NULL,
-                                                                 NULL, NULL);
+  return soap_instantiate_ns1__searchSampleByParameterComparison(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchSampleByParameterComparison *
 soap_new_req_ns1__searchSampleByParameterComparison(struct soap *soap) {
   ns1__searchSampleByParameterComparison *_p =
-      soap_instantiate_ns1__searchSampleByParameterComparison(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__searchSampleByParameterComparison(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -2833,8 +2855,8 @@ soap_new_set_ns1__searchSampleByParameterComparison(
     std::vector<ns1__parameterComparisonCondition *> &comparison,
     char *__item1) {
   ns1__searchSampleByParameterComparison *_p =
-      soap_instantiate_ns1__searchSampleByParameterComparison(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__searchSampleByParameterComparison(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByParameterComparison::sessionId = sessionId;
@@ -2896,15 +2918,15 @@ soap_instantiate_ns1__deleteSampleParameterResponse(struct soap *, int,
 
 inline ns1__deleteSampleParameterResponse *
 soap_new_ns1__deleteSampleParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteSampleParameterResponse(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate_ns1__deleteSampleParameterResponse(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline ns1__deleteSampleParameterResponse *
 soap_new_req_ns1__deleteSampleParameterResponse(struct soap *soap) {
   ns1__deleteSampleParameterResponse *_p =
-      soap_instantiate_ns1__deleteSampleParameterResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate_ns1__deleteSampleParameterResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -2915,8 +2937,8 @@ inline ns1__deleteSampleParameterResponse *
 soap_new_set_ns1__deleteSampleParameterResponse(struct soap *soap,
                                                 char *__item1) {
   ns1__deleteSampleParameterResponse *_p =
-      soap_instantiate_ns1__deleteSampleParameterResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate_ns1__deleteSampleParameterResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -2972,13 +2994,14 @@ soap_instantiate_ns1__deleteSampleParameter(struct soap *, int, const char *,
 
 inline ns1__deleteSampleParameter *
 soap_new_ns1__deleteSampleParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteSampleParameter(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__deleteSampleParameter(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline ns1__deleteSampleParameter *
 soap_new_req_ns1__deleteSampleParameter(struct soap *soap) {
-  ns1__deleteSampleParameter *_p =
-      soap_instantiate_ns1__deleteSampleParameter(soap, -1, NULL, NULL, NULL);
+  ns1__deleteSampleParameter *_p = soap_instantiate_ns1__deleteSampleParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -2988,8 +3011,8 @@ soap_new_req_ns1__deleteSampleParameter(struct soap *soap) {
 inline ns1__deleteSampleParameter *soap_new_set_ns1__deleteSampleParameter(
     struct soap *soap, std::string *sessionId,
     ns1__sampleParameterPK *sampleParameterPK, char *__item1) {
-  ns1__deleteSampleParameter *_p =
-      soap_instantiate_ns1__deleteSampleParameter(soap, -1, NULL, NULL, NULL);
+  ns1__deleteSampleParameter *_p = soap_instantiate_ns1__deleteSampleParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__deleteSampleParameter::sessionId = sessionId;
@@ -3054,14 +3077,14 @@ inline ns1__searchSampleByRestrictionLogicalResponse *
 soap_new_ns1__searchSampleByRestrictionLogicalResponse(struct soap *soap,
                                                        int n = -1) {
   return soap_instantiate_ns1__searchSampleByRestrictionLogicalResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchSampleByRestrictionLogicalResponse *
 soap_new_req_ns1__searchSampleByRestrictionLogicalResponse(struct soap *soap) {
   ns1__searchSampleByRestrictionLogicalResponse *_p =
       soap_instantiate_ns1__searchSampleByRestrictionLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -3073,7 +3096,7 @@ soap_new_set_ns1__searchSampleByRestrictionLogicalResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchSampleByRestrictionLogicalResponse *_p =
       soap_instantiate_ns1__searchSampleByRestrictionLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByRestrictionLogicalResponse::return_ = return_;
@@ -3134,15 +3157,15 @@ soap_instantiate_ns1__searchSampleByRestrictionLogical(struct soap *, int,
 
 inline ns1__searchSampleByRestrictionLogical *
 soap_new_ns1__searchSampleByRestrictionLogical(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchSampleByRestrictionLogical(soap, n, NULL,
-                                                                NULL, NULL);
+  return soap_instantiate_ns1__searchSampleByRestrictionLogical(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchSampleByRestrictionLogical *
 soap_new_req_ns1__searchSampleByRestrictionLogical(struct soap *soap) {
   ns1__searchSampleByRestrictionLogical *_p =
-      soap_instantiate_ns1__searchSampleByRestrictionLogical(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate_ns1__searchSampleByRestrictionLogical(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -3154,8 +3177,8 @@ soap_new_set_ns1__searchSampleByRestrictionLogical(
     struct soap *soap, std::string *sessionId,
     ns1__restrictionLogicalCondition *restriction, char *__item1) {
   ns1__searchSampleByRestrictionLogical *_p =
-      soap_instantiate_ns1__searchSampleByRestrictionLogical(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate_ns1__searchSampleByRestrictionLogical(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByRestrictionLogical::sessionId = sessionId;
@@ -3216,15 +3239,15 @@ soap_instantiate_ns1__addDataFileParameterResponse(struct soap *, int,
 
 inline ns1__addDataFileParameterResponse *
 soap_new_ns1__addDataFileParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addDataFileParameterResponse(soap, n, NULL, NULL,
-                                                            NULL);
+  return soap_instantiate_ns1__addDataFileParameterResponse(soap, n, nullptr,
+                                                            nullptr, nullptr);
 }
 
 inline ns1__addDataFileParameterResponse *
 soap_new_req_ns1__addDataFileParameterResponse(struct soap *soap) {
   ns1__addDataFileParameterResponse *_p =
-      soap_instantiate_ns1__addDataFileParameterResponse(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate_ns1__addDataFileParameterResponse(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -3236,8 +3259,8 @@ soap_new_set_ns1__addDataFileParameterResponse(struct soap *soap,
                                                ns1__datafileParameter *return_,
                                                char *__item1) {
   ns1__addDataFileParameterResponse *_p =
-      soap_instantiate_ns1__addDataFileParameterResponse(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate_ns1__addDataFileParameterResponse(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addDataFileParameterResponse::return_ = return_;
@@ -3294,13 +3317,14 @@ soap_instantiate_ns1__addDataFileParameter(struct soap *, int, const char *,
 
 inline ns1__addDataFileParameter *
 soap_new_ns1__addDataFileParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addDataFileParameter(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__addDataFileParameter(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline ns1__addDataFileParameter *
 soap_new_req_ns1__addDataFileParameter(struct soap *soap) {
-  ns1__addDataFileParameter *_p =
-      soap_instantiate_ns1__addDataFileParameter(soap, -1, NULL, NULL, NULL);
+  ns1__addDataFileParameter *_p = soap_instantiate_ns1__addDataFileParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -3311,8 +3335,8 @@ inline ns1__addDataFileParameter *soap_new_set_ns1__addDataFileParameter(
     struct soap *soap, std::string *sessionId,
     ns1__datafileParameter *dataFileParameter, LONG64 *datafileId,
     char *__item1) {
-  ns1__addDataFileParameter *_p =
-      soap_instantiate_ns1__addDataFileParameter(soap, -1, NULL, NULL, NULL);
+  ns1__addDataFileParameter *_p = soap_instantiate_ns1__addDataFileParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addDataFileParameter::sessionId = sessionId;
@@ -3375,15 +3399,15 @@ soap_instantiate_ns1__searchDatasetsBySampleResponse(struct soap *, int,
 
 inline ns1__searchDatasetsBySampleResponse *
 soap_new_ns1__searchDatasetsBySampleResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchDatasetsBySampleResponse(soap, n, NULL,
-                                                              NULL, NULL);
+  return soap_instantiate_ns1__searchDatasetsBySampleResponse(soap, n, nullptr,
+                                                              nullptr, nullptr);
 }
 
 inline ns1__searchDatasetsBySampleResponse *
 soap_new_req_ns1__searchDatasetsBySampleResponse(struct soap *soap) {
   ns1__searchDatasetsBySampleResponse *_p =
-      soap_instantiate_ns1__searchDatasetsBySampleResponse(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__searchDatasetsBySampleResponse(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -3394,8 +3418,8 @@ inline ns1__searchDatasetsBySampleResponse *
 soap_new_set_ns1__searchDatasetsBySampleResponse(
     struct soap *soap, std::vector<ns1__dataset *> &return_, char *__item1) {
   ns1__searchDatasetsBySampleResponse *_p =
-      soap_instantiate_ns1__searchDatasetsBySampleResponse(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__searchDatasetsBySampleResponse(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetsBySampleResponse::return_ = return_;
@@ -3454,14 +3478,15 @@ soap_instantiate_ns1__searchDatasetsBySample(struct soap *, int, const char *,
 
 inline ns1__searchDatasetsBySample *
 soap_new_ns1__searchDatasetsBySample(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchDatasetsBySample(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__searchDatasetsBySample(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__searchDatasetsBySample *
 soap_new_req_ns1__searchDatasetsBySample(struct soap *soap) {
   ns1__searchDatasetsBySample *_p =
-      soap_instantiate_ns1__searchDatasetsBySample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__searchDatasetsBySample(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -3473,7 +3498,8 @@ soap_new_set_ns1__searchDatasetsBySample(struct soap *soap,
                                          std::string *sessionId,
                                          ns1__sample *sample, char *__item1) {
   ns1__searchDatasetsBySample *_p =
-      soap_instantiate_ns1__searchDatasetsBySample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__searchDatasetsBySample(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetsBySample::sessionId = sessionId;
@@ -3535,15 +3561,15 @@ soap_instantiate_ns1__createInvestigationResponse(struct soap *, int,
 
 inline ns1__createInvestigationResponse *
 soap_new_ns1__createInvestigationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__createInvestigationResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__createInvestigationResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__createInvestigationResponse *
 soap_new_req_ns1__createInvestigationResponse(struct soap *soap) {
   ns1__createInvestigationResponse *_p =
-      soap_instantiate_ns1__createInvestigationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__createInvestigationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -3555,8 +3581,8 @@ soap_new_set_ns1__createInvestigationResponse(struct soap *soap,
                                               ns1__investigation *return_,
                                               char *__item1) {
   ns1__createInvestigationResponse *_p =
-      soap_instantiate_ns1__createInvestigationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__createInvestigationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__createInvestigationResponse::return_ = return_;
@@ -3613,13 +3639,14 @@ soap_instantiate_ns1__createInvestigation(struct soap *, int, const char *,
 
 inline ns1__createInvestigation *
 soap_new_ns1__createInvestigation(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__createInvestigation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__createInvestigation(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__createInvestigation *
 soap_new_req_ns1__createInvestigation(struct soap *soap) {
-  ns1__createInvestigation *_p =
-      soap_instantiate_ns1__createInvestigation(soap, -1, NULL, NULL, NULL);
+  ns1__createInvestigation *_p = soap_instantiate_ns1__createInvestigation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -3630,8 +3657,8 @@ inline ns1__createInvestigation *
 soap_new_set_ns1__createInvestigation(struct soap *soap, std::string *sessionId,
                                       ns1__investigation *ns1__investigation_,
                                       char *__item1) {
-  ns1__createInvestigation *_p =
-      soap_instantiate_ns1__createInvestigation(soap, -1, NULL, NULL, NULL);
+  ns1__createInvestigation *_p = soap_instantiate_ns1__createInvestigation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__createInvestigation::sessionId = sessionId;
@@ -3691,14 +3718,15 @@ soap_instantiate_ns1__addPublicationResponse(struct soap *, int, const char *,
 
 inline ns1__addPublicationResponse *
 soap_new_ns1__addPublicationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addPublicationResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__addPublicationResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__addPublicationResponse *
 soap_new_req_ns1__addPublicationResponse(struct soap *soap) {
   ns1__addPublicationResponse *_p =
-      soap_instantiate_ns1__addPublicationResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__addPublicationResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -3708,7 +3736,8 @@ soap_new_req_ns1__addPublicationResponse(struct soap *soap) {
 inline ns1__addPublicationResponse *soap_new_set_ns1__addPublicationResponse(
     struct soap *soap, ns1__publication *return_, char *__item1) {
   ns1__addPublicationResponse *_p =
-      soap_instantiate_ns1__addPublicationResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__addPublicationResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addPublicationResponse::return_ = return_;
@@ -3765,13 +3794,14 @@ soap_instantiate_ns1__addPublication(struct soap *, int, const char *,
 
 inline ns1__addPublication *soap_new_ns1__addPublication(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__addPublication(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__addPublication(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__addPublication *
 soap_new_req_ns1__addPublication(struct soap *soap) {
   ns1__addPublication *_p =
-      soap_instantiate_ns1__addPublication(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__addPublication(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -3783,7 +3813,7 @@ soap_new_set_ns1__addPublication(struct soap *soap, std::string *sessionId,
                                  ns1__publication *publication,
                                  LONG64 *investigationId, char *__item1) {
   ns1__addPublication *_p =
-      soap_instantiate_ns1__addPublication(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__addPublication(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addPublication::sessionId = sessionId;
@@ -3845,15 +3875,15 @@ soap_instantiate_ns1__deleteDataFileParameterResponse(struct soap *, int,
 
 inline ns1__deleteDataFileParameterResponse *
 soap_new_ns1__deleteDataFileParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteDataFileParameterResponse(soap, n, NULL,
-                                                               NULL, NULL);
+  return soap_instantiate_ns1__deleteDataFileParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__deleteDataFileParameterResponse *
 soap_new_req_ns1__deleteDataFileParameterResponse(struct soap *soap) {
   ns1__deleteDataFileParameterResponse *_p =
-      soap_instantiate_ns1__deleteDataFileParameterResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__deleteDataFileParameterResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -3864,8 +3894,8 @@ inline ns1__deleteDataFileParameterResponse *
 soap_new_set_ns1__deleteDataFileParameterResponse(struct soap *soap,
                                                   char *__item1) {
   ns1__deleteDataFileParameterResponse *_p =
-      soap_instantiate_ns1__deleteDataFileParameterResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__deleteDataFileParameterResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -3924,14 +3954,15 @@ soap_instantiate_ns1__deleteDataFileParameter(struct soap *, int, const char *,
 
 inline ns1__deleteDataFileParameter *
 soap_new_ns1__deleteDataFileParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteDataFileParameter(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate_ns1__deleteDataFileParameter(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline ns1__deleteDataFileParameter *
 soap_new_req_ns1__deleteDataFileParameter(struct soap *soap) {
   ns1__deleteDataFileParameter *_p =
-      soap_instantiate_ns1__deleteDataFileParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__deleteDataFileParameter(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -3942,7 +3973,8 @@ inline ns1__deleteDataFileParameter *soap_new_set_ns1__deleteDataFileParameter(
     struct soap *soap, std::string *sessionId,
     ns1__datafileParameterPK *datafileParameterPK, char *__item1) {
   ns1__deleteDataFileParameter *_p =
-      soap_instantiate_ns1__deleteDataFileParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__deleteDataFileParameter(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__deleteDataFileParameter::sessionId = sessionId;
@@ -4004,15 +4036,15 @@ soap_instantiate_ns1__getInvestigationResponse(struct soap *, int, const char *,
 
 inline ns1__getInvestigationResponse *
 soap_new_ns1__getInvestigationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getInvestigationResponse(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate_ns1__getInvestigationResponse(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline ns1__getInvestigationResponse *
 soap_new_req_ns1__getInvestigationResponse(struct soap *soap) {
   ns1__getInvestigationResponse *_p =
-      soap_instantiate_ns1__getInvestigationResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__getInvestigationResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -4024,8 +4056,8 @@ soap_new_set_ns1__getInvestigationResponse(struct soap *soap,
                                            ns1__investigation *return_,
                                            char *__item1) {
   ns1__getInvestigationResponse *_p =
-      soap_instantiate_ns1__getInvestigationResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__getInvestigationResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getInvestigationResponse::return_ = return_;
@@ -4082,13 +4114,14 @@ soap_instantiate_ns1__getInvestigation(struct soap *, int, const char *,
 
 inline ns1__getInvestigation *soap_new_ns1__getInvestigation(struct soap *soap,
                                                              int n = -1) {
-  return soap_instantiate_ns1__getInvestigation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getInvestigation(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline ns1__getInvestigation *
 soap_new_req_ns1__getInvestigation(struct soap *soap) {
-  ns1__getInvestigation *_p =
-      soap_instantiate_ns1__getInvestigation(soap, -1, NULL, NULL, NULL);
+  ns1__getInvestigation *_p = soap_instantiate_ns1__getInvestigation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -4098,8 +4131,8 @@ soap_new_req_ns1__getInvestigation(struct soap *soap) {
 inline ns1__getInvestigation *
 soap_new_set_ns1__getInvestigation(struct soap *soap, std::string *sessionId,
                                    LONG64 *investigationId, char *__item1) {
-  ns1__getInvestigation *_p =
-      soap_instantiate_ns1__getInvestigation(soap, -1, NULL, NULL, NULL);
+  ns1__getInvestigation *_p = soap_instantiate_ns1__getInvestigation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getInvestigation::sessionId = sessionId;
@@ -4160,15 +4193,15 @@ soap_instantiate_ns1__getInvestigationIncludesResponse(struct soap *, int,
 
 inline ns1__getInvestigationIncludesResponse *
 soap_new_ns1__getInvestigationIncludesResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getInvestigationIncludesResponse(soap, n, NULL,
-                                                                NULL, NULL);
+  return soap_instantiate_ns1__getInvestigationIncludesResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getInvestigationIncludesResponse *
 soap_new_req_ns1__getInvestigationIncludesResponse(struct soap *soap) {
   ns1__getInvestigationIncludesResponse *_p =
-      soap_instantiate_ns1__getInvestigationIncludesResponse(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate_ns1__getInvestigationIncludesResponse(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -4180,8 +4213,8 @@ soap_new_set_ns1__getInvestigationIncludesResponse(struct soap *soap,
                                                    ns1__investigation *return_,
                                                    char *__item1) {
   ns1__getInvestigationIncludesResponse *_p =
-      soap_instantiate_ns1__getInvestigationIncludesResponse(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate_ns1__getInvestigationIncludesResponse(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getInvestigationIncludesResponse::return_ = return_;
@@ -4241,15 +4274,15 @@ soap_instantiate_ns1__getInvestigationIncludes(struct soap *, int, const char *,
 
 inline ns1__getInvestigationIncludes *
 soap_new_ns1__getInvestigationIncludes(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getInvestigationIncludes(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate_ns1__getInvestigationIncludes(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline ns1__getInvestigationIncludes *
 soap_new_req_ns1__getInvestigationIncludes(struct soap *soap) {
   ns1__getInvestigationIncludes *_p =
-      soap_instantiate_ns1__getInvestigationIncludes(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__getInvestigationIncludes(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -4261,8 +4294,8 @@ soap_new_set_ns1__getInvestigationIncludes(
     struct soap *soap, std::string *sessionId, LONG64 *investigationId,
     enum ns1__investigationInclude *investigationInclude, char *__item1) {
   ns1__getInvestigationIncludes *_p =
-      soap_instantiate_ns1__getInvestigationIncludes(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__getInvestigationIncludes(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getInvestigationIncludes::sessionId = sessionId;
@@ -4325,14 +4358,15 @@ soap_instantiate_ns1__modifyDataFileResponse(struct soap *, int, const char *,
 
 inline ns1__modifyDataFileResponse *
 soap_new_ns1__modifyDataFileResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifyDataFileResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__modifyDataFileResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__modifyDataFileResponse *
 soap_new_req_ns1__modifyDataFileResponse(struct soap *soap) {
   ns1__modifyDataFileResponse *_p =
-      soap_instantiate_ns1__modifyDataFileResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__modifyDataFileResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -4342,7 +4376,8 @@ soap_new_req_ns1__modifyDataFileResponse(struct soap *soap) {
 inline ns1__modifyDataFileResponse *
 soap_new_set_ns1__modifyDataFileResponse(struct soap *soap, char *__item1) {
   ns1__modifyDataFileResponse *_p =
-      soap_instantiate_ns1__modifyDataFileResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__modifyDataFileResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -4398,13 +4433,14 @@ soap_instantiate_ns1__modifyDataFile(struct soap *, int, const char *,
 
 inline ns1__modifyDataFile *soap_new_ns1__modifyDataFile(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__modifyDataFile(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__modifyDataFile(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__modifyDataFile *
 soap_new_req_ns1__modifyDataFile(struct soap *soap) {
   ns1__modifyDataFile *_p =
-      soap_instantiate_ns1__modifyDataFile(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__modifyDataFile(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -4415,7 +4451,7 @@ inline ns1__modifyDataFile *
 soap_new_set_ns1__modifyDataFile(struct soap *soap, std::string *sessionId,
                                  ns1__datafile *dataFile, char *__item1) {
   ns1__modifyDataFile *_p =
-      soap_instantiate_ns1__modifyDataFile(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__modifyDataFile(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__modifyDataFile::sessionId = sessionId;
@@ -4473,13 +4509,14 @@ soap_instantiate_ns1__getDatafileResponse(struct soap *, int, const char *,
 
 inline ns1__getDatafileResponse *
 soap_new_ns1__getDatafileResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getDatafileResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getDatafileResponse(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__getDatafileResponse *
 soap_new_req_ns1__getDatafileResponse(struct soap *soap) {
-  ns1__getDatafileResponse *_p =
-      soap_instantiate_ns1__getDatafileResponse(soap, -1, NULL, NULL, NULL);
+  ns1__getDatafileResponse *_p = soap_instantiate_ns1__getDatafileResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -4489,8 +4526,8 @@ soap_new_req_ns1__getDatafileResponse(struct soap *soap) {
 inline ns1__getDatafileResponse *
 soap_new_set_ns1__getDatafileResponse(struct soap *soap, ns1__datafile *return_,
                                       char *__item1) {
-  ns1__getDatafileResponse *_p =
-      soap_instantiate_ns1__getDatafileResponse(soap, -1, NULL, NULL, NULL);
+  ns1__getDatafileResponse *_p = soap_instantiate_ns1__getDatafileResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getDatafileResponse::return_ = return_;
@@ -4545,12 +4582,12 @@ soap_instantiate_ns1__getDatafile(struct soap *, int, const char *,
 
 inline ns1__getDatafile *soap_new_ns1__getDatafile(struct soap *soap,
                                                    int n = -1) {
-  return soap_instantiate_ns1__getDatafile(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getDatafile(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getDatafile *soap_new_req_ns1__getDatafile(struct soap *soap) {
   ns1__getDatafile *_p =
-      soap_instantiate_ns1__getDatafile(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getDatafile(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -4562,7 +4599,7 @@ inline ns1__getDatafile *soap_new_set_ns1__getDatafile(struct soap *soap,
                                                        LONG64 *datafileId,
                                                        char *__item1) {
   ns1__getDatafile *_p =
-      soap_instantiate_ns1__getDatafile(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getDatafile(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getDatafile::sessionId = sessionId;
@@ -4619,13 +4656,14 @@ soap_instantiate_ns1__ICATAPIException(struct soap *, int, const char *,
 
 inline ns1__ICATAPIException *soap_new_ns1__ICATAPIException(struct soap *soap,
                                                              int n = -1) {
-  return soap_instantiate_ns1__ICATAPIException(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__ICATAPIException(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline ns1__ICATAPIException *
 soap_new_req_ns1__ICATAPIException(struct soap *soap) {
-  ns1__ICATAPIException *_p =
-      soap_instantiate_ns1__ICATAPIException(soap, -1, NULL, NULL, NULL);
+  ns1__ICATAPIException *_p = soap_instantiate_ns1__ICATAPIException(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -4636,8 +4674,8 @@ inline ns1__ICATAPIException *
 soap_new_set_ns1__ICATAPIException(struct soap *soap, std::string *message,
                                    std::string *stackTraceAsString,
                                    std::string *uniqueId, char *__item1) {
-  ns1__ICATAPIException *_p =
-      soap_instantiate_ns1__ICATAPIException(soap, -1, NULL, NULL, NULL);
+  ns1__ICATAPIException *_p = soap_instantiate_ns1__ICATAPIException(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__ICATAPIException::message = message;
@@ -4698,14 +4736,15 @@ soap_instantiate_ns1__ingestMetadataResponse(struct soap *, int, const char *,
 
 inline ns1__ingestMetadataResponse *
 soap_new_ns1__ingestMetadataResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__ingestMetadataResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__ingestMetadataResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__ingestMetadataResponse *
 soap_new_req_ns1__ingestMetadataResponse(struct soap *soap) {
   ns1__ingestMetadataResponse *_p =
-      soap_instantiate_ns1__ingestMetadataResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__ingestMetadataResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -4715,7 +4754,8 @@ soap_new_req_ns1__ingestMetadataResponse(struct soap *soap) {
 inline ns1__ingestMetadataResponse *soap_new_set_ns1__ingestMetadataResponse(
     struct soap *soap, std::vector<LONG64> &return_, char *__item1) {
   ns1__ingestMetadataResponse *_p =
-      soap_instantiate_ns1__ingestMetadataResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__ingestMetadataResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__ingestMetadataResponse::return_ = return_;
@@ -4772,13 +4812,14 @@ soap_instantiate_ns1__ingestMetadata(struct soap *, int, const char *,
 
 inline ns1__ingestMetadata *soap_new_ns1__ingestMetadata(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__ingestMetadata(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__ingestMetadata(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__ingestMetadata *
 soap_new_req_ns1__ingestMetadata(struct soap *soap) {
   ns1__ingestMetadata *_p =
-      soap_instantiate_ns1__ingestMetadata(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__ingestMetadata(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -4789,7 +4830,7 @@ inline ns1__ingestMetadata *
 soap_new_set_ns1__ingestMetadata(struct soap *soap, std::string *sessionId,
                                  std::string *xml, char *__item1) {
   ns1__ingestMetadata *_p =
-      soap_instantiate_ns1__ingestMetadata(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__ingestMetadata(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__ingestMetadata::sessionId = sessionId;
@@ -4853,15 +4894,15 @@ soap_instantiate_ns1__searchDatasetByRestrictionResponse(struct soap *, int,
 inline ns1__searchDatasetByRestrictionResponse *
 soap_new_ns1__searchDatasetByRestrictionResponse(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate_ns1__searchDatasetByRestrictionResponse(soap, n, NULL,
-                                                                  NULL, NULL);
+  return soap_instantiate_ns1__searchDatasetByRestrictionResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByRestrictionResponse *
 soap_new_req_ns1__searchDatasetByRestrictionResponse(struct soap *soap) {
   ns1__searchDatasetByRestrictionResponse *_p =
-      soap_instantiate_ns1__searchDatasetByRestrictionResponse(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByRestrictionResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -4872,8 +4913,8 @@ inline ns1__searchDatasetByRestrictionResponse *
 soap_new_set_ns1__searchDatasetByRestrictionResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatasetByRestrictionResponse *_p =
-      soap_instantiate_ns1__searchDatasetByRestrictionResponse(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByRestrictionResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByRestrictionResponse::return_ = return_;
@@ -4934,15 +4975,15 @@ soap_instantiate_ns1__searchDatasetByRestriction(struct soap *, int,
 
 inline ns1__searchDatasetByRestriction *
 soap_new_ns1__searchDatasetByRestriction(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchDatasetByRestriction(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate_ns1__searchDatasetByRestriction(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByRestriction *
 soap_new_req_ns1__searchDatasetByRestriction(struct soap *soap) {
   ns1__searchDatasetByRestriction *_p =
-      soap_instantiate_ns1__searchDatasetByRestriction(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__searchDatasetByRestriction(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -4954,8 +4995,8 @@ soap_new_set_ns1__searchDatasetByRestriction(
     struct soap *soap, std::string *sessionId,
     ns1__restrictionCondition *restriction, char *__item1) {
   ns1__searchDatasetByRestriction *_p =
-      soap_instantiate_ns1__searchDatasetByRestriction(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__searchDatasetByRestriction(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByRestriction::sessionId = sessionId;
@@ -5012,13 +5053,14 @@ soap_instantiate_ns1__listRolesResponse(struct soap *, int, const char *,
 
 inline ns1__listRolesResponse *
 soap_new_ns1__listRolesResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__listRolesResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__listRolesResponse(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__listRolesResponse *
 soap_new_req_ns1__listRolesResponse(struct soap *soap) {
-  ns1__listRolesResponse *_p =
-      soap_instantiate_ns1__listRolesResponse(soap, -1, NULL, NULL, NULL);
+  ns1__listRolesResponse *_p = soap_instantiate_ns1__listRolesResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -5027,8 +5069,8 @@ soap_new_req_ns1__listRolesResponse(struct soap *soap) {
 
 inline ns1__listRolesResponse *soap_new_set_ns1__listRolesResponse(
     struct soap *soap, std::vector<ns1__icatRole *> &return_, char *__item1) {
-  ns1__listRolesResponse *_p =
-      soap_instantiate_ns1__listRolesResponse(soap, -1, NULL, NULL, NULL);
+  ns1__listRolesResponse *_p = soap_instantiate_ns1__listRolesResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listRolesResponse::return_ = return_;
@@ -5082,12 +5124,12 @@ soap_instantiate_ns1__listRoles(struct soap *, int, const char *, const char *,
                                 size_t *);
 
 inline ns1__listRoles *soap_new_ns1__listRoles(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__listRoles(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__listRoles(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__listRoles *soap_new_req_ns1__listRoles(struct soap *soap) {
   ns1__listRoles *_p =
-      soap_instantiate_ns1__listRoles(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__listRoles(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -5098,7 +5140,7 @@ inline ns1__listRoles *soap_new_set_ns1__listRoles(struct soap *soap,
                                                    std::string *sessionId,
                                                    char *__item1) {
   ns1__listRoles *_p =
-      soap_instantiate_ns1__listRoles(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__listRoles(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listRoles::sessionId = sessionId;
@@ -5157,15 +5199,15 @@ soap_instantiate_ns1__updateAuthorisationResponse(struct soap *, int,
 
 inline ns1__updateAuthorisationResponse *
 soap_new_ns1__updateAuthorisationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__updateAuthorisationResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__updateAuthorisationResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__updateAuthorisationResponse *
 soap_new_req_ns1__updateAuthorisationResponse(struct soap *soap) {
   ns1__updateAuthorisationResponse *_p =
-      soap_instantiate_ns1__updateAuthorisationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__updateAuthorisationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -5176,8 +5218,8 @@ inline ns1__updateAuthorisationResponse *
 soap_new_set_ns1__updateAuthorisationResponse(struct soap *soap,
                                               char *__item1) {
   ns1__updateAuthorisationResponse *_p =
-      soap_instantiate_ns1__updateAuthorisationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__updateAuthorisationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -5233,13 +5275,14 @@ soap_instantiate_ns1__updateAuthorisation(struct soap *, int, const char *,
 
 inline ns1__updateAuthorisation *
 soap_new_ns1__updateAuthorisation(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__updateAuthorisation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__updateAuthorisation(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__updateAuthorisation *
 soap_new_req_ns1__updateAuthorisation(struct soap *soap) {
-  ns1__updateAuthorisation *_p =
-      soap_instantiate_ns1__updateAuthorisation(soap, -1, NULL, NULL, NULL);
+  ns1__updateAuthorisation *_p = soap_instantiate_ns1__updateAuthorisation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -5250,8 +5293,8 @@ inline ns1__updateAuthorisation *
 soap_new_set_ns1__updateAuthorisation(struct soap *soap, std::string *sessionId,
                                       std::string *toChangetoRole,
                                       LONG64 *authorisationId, char *__item1) {
-  ns1__updateAuthorisation *_p =
-      soap_instantiate_ns1__updateAuthorisation(soap, -1, NULL, NULL, NULL);
+  ns1__updateAuthorisation *_p = soap_instantiate_ns1__updateAuthorisation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__updateAuthorisation::sessionId = sessionId;
@@ -5313,15 +5356,15 @@ soap_instantiate_ns1__getDatasetIncludesResponse(struct soap *, int,
 
 inline ns1__getDatasetIncludesResponse *
 soap_new_ns1__getDatasetIncludesResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getDatasetIncludesResponse(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate_ns1__getDatasetIncludesResponse(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline ns1__getDatasetIncludesResponse *
 soap_new_req_ns1__getDatasetIncludesResponse(struct soap *soap) {
   ns1__getDatasetIncludesResponse *_p =
-      soap_instantiate_ns1__getDatasetIncludesResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__getDatasetIncludesResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -5333,8 +5376,8 @@ soap_new_set_ns1__getDatasetIncludesResponse(struct soap *soap,
                                              ns1__dataset *return_,
                                              char *__item1) {
   ns1__getDatasetIncludesResponse *_p =
-      soap_instantiate_ns1__getDatasetIncludesResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__getDatasetIncludesResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getDatasetIncludesResponse::return_ = return_;
@@ -5390,13 +5433,14 @@ soap_instantiate_ns1__getDatasetIncludes(struct soap *, int, const char *,
 
 inline ns1__getDatasetIncludes *
 soap_new_ns1__getDatasetIncludes(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getDatasetIncludes(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getDatasetIncludes(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline ns1__getDatasetIncludes *
 soap_new_req_ns1__getDatasetIncludes(struct soap *soap) {
-  ns1__getDatasetIncludes *_p =
-      soap_instantiate_ns1__getDatasetIncludes(soap, -1, NULL, NULL, NULL);
+  ns1__getDatasetIncludes *_p = soap_instantiate_ns1__getDatasetIncludes(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -5406,8 +5450,8 @@ soap_new_req_ns1__getDatasetIncludes(struct soap *soap) {
 inline ns1__getDatasetIncludes *soap_new_set_ns1__getDatasetIncludes(
     struct soap *soap, std::string *sessionId, LONG64 *datasetId,
     enum ns1__datasetInclude *datasetInclude, char *__item1) {
-  ns1__getDatasetIncludes *_p =
-      soap_instantiate_ns1__getDatasetIncludes(soap, -1, NULL, NULL, NULL);
+  ns1__getDatasetIncludes *_p = soap_instantiate_ns1__getDatasetIncludes(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getDatasetIncludes::sessionId = sessionId;
@@ -5465,13 +5509,14 @@ soap_instantiate_ns1__getDatasetResponse(struct soap *, int, const char *,
 
 inline ns1__getDatasetResponse *
 soap_new_ns1__getDatasetResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getDatasetResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getDatasetResponse(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline ns1__getDatasetResponse *
 soap_new_req_ns1__getDatasetResponse(struct soap *soap) {
-  ns1__getDatasetResponse *_p =
-      soap_instantiate_ns1__getDatasetResponse(soap, -1, NULL, NULL, NULL);
+  ns1__getDatasetResponse *_p = soap_instantiate_ns1__getDatasetResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -5481,8 +5526,8 @@ soap_new_req_ns1__getDatasetResponse(struct soap *soap) {
 inline ns1__getDatasetResponse *
 soap_new_set_ns1__getDatasetResponse(struct soap *soap, ns1__dataset *return_,
                                      char *__item1) {
-  ns1__getDatasetResponse *_p =
-      soap_instantiate_ns1__getDatasetResponse(soap, -1, NULL, NULL, NULL);
+  ns1__getDatasetResponse *_p = soap_instantiate_ns1__getDatasetResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getDatasetResponse::return_ = return_;
@@ -5537,12 +5582,12 @@ soap_instantiate_ns1__getDataset(struct soap *, int, const char *, const char *,
 
 inline ns1__getDataset *soap_new_ns1__getDataset(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate_ns1__getDataset(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getDataset(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getDataset *soap_new_req_ns1__getDataset(struct soap *soap) {
   ns1__getDataset *_p =
-      soap_instantiate_ns1__getDataset(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getDataset(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -5554,7 +5599,7 @@ inline ns1__getDataset *soap_new_set_ns1__getDataset(struct soap *soap,
                                                      LONG64 *datasetId,
                                                      char *__item1) {
   ns1__getDataset *_p =
-      soap_instantiate_ns1__getDataset(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getDataset(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getDataset::sessionId = sessionId;
@@ -5614,15 +5659,15 @@ soap_instantiate_ns1__deleteAuthorisationResponse(struct soap *, int,
 
 inline ns1__deleteAuthorisationResponse *
 soap_new_ns1__deleteAuthorisationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteAuthorisationResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__deleteAuthorisationResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__deleteAuthorisationResponse *
 soap_new_req_ns1__deleteAuthorisationResponse(struct soap *soap) {
   ns1__deleteAuthorisationResponse *_p =
-      soap_instantiate_ns1__deleteAuthorisationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__deleteAuthorisationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -5633,8 +5678,8 @@ inline ns1__deleteAuthorisationResponse *
 soap_new_set_ns1__deleteAuthorisationResponse(struct soap *soap,
                                               char *__item1) {
   ns1__deleteAuthorisationResponse *_p =
-      soap_instantiate_ns1__deleteAuthorisationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__deleteAuthorisationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -5690,13 +5735,14 @@ soap_instantiate_ns1__deleteAuthorisation(struct soap *, int, const char *,
 
 inline ns1__deleteAuthorisation *
 soap_new_ns1__deleteAuthorisation(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteAuthorisation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__deleteAuthorisation(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__deleteAuthorisation *
 soap_new_req_ns1__deleteAuthorisation(struct soap *soap) {
-  ns1__deleteAuthorisation *_p =
-      soap_instantiate_ns1__deleteAuthorisation(soap, -1, NULL, NULL, NULL);
+  ns1__deleteAuthorisation *_p = soap_instantiate_ns1__deleteAuthorisation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -5706,8 +5752,8 @@ soap_new_req_ns1__deleteAuthorisation(struct soap *soap) {
 inline ns1__deleteAuthorisation *
 soap_new_set_ns1__deleteAuthorisation(struct soap *soap, std::string *sessionId,
                                       LONG64 *authorisationId, char *__item1) {
-  ns1__deleteAuthorisation *_p =
-      soap_instantiate_ns1__deleteAuthorisation(soap, -1, NULL, NULL, NULL);
+  ns1__deleteAuthorisation *_p = soap_instantiate_ns1__deleteAuthorisation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__deleteAuthorisation::sessionId = sessionId;
@@ -5769,15 +5815,15 @@ soap_instantiate_ns1__deletePublicationResponse(struct soap *, int,
 
 inline ns1__deletePublicationResponse *
 soap_new_ns1__deletePublicationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deletePublicationResponse(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__deletePublicationResponse(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__deletePublicationResponse *
 soap_new_req_ns1__deletePublicationResponse(struct soap *soap) {
   ns1__deletePublicationResponse *_p =
-      soap_instantiate_ns1__deletePublicationResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__deletePublicationResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -5787,8 +5833,8 @@ soap_new_req_ns1__deletePublicationResponse(struct soap *soap) {
 inline ns1__deletePublicationResponse *
 soap_new_set_ns1__deletePublicationResponse(struct soap *soap, char *__item1) {
   ns1__deletePublicationResponse *_p =
-      soap_instantiate_ns1__deletePublicationResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__deletePublicationResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -5844,13 +5890,14 @@ soap_instantiate_ns1__deletePublication(struct soap *, int, const char *,
 
 inline ns1__deletePublication *
 soap_new_ns1__deletePublication(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deletePublication(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__deletePublication(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__deletePublication *
 soap_new_req_ns1__deletePublication(struct soap *soap) {
-  ns1__deletePublication *_p =
-      soap_instantiate_ns1__deletePublication(soap, -1, NULL, NULL, NULL);
+  ns1__deletePublication *_p = soap_instantiate_ns1__deletePublication(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -5860,8 +5907,8 @@ soap_new_req_ns1__deletePublication(struct soap *soap) {
 inline ns1__deletePublication *
 soap_new_set_ns1__deletePublication(struct soap *soap, std::string *sessionId,
                                     LONG64 *publicationId, char *__item1) {
-  ns1__deletePublication *_p =
-      soap_instantiate_ns1__deletePublication(soap, -1, NULL, NULL, NULL);
+  ns1__deletePublication *_p = soap_instantiate_ns1__deletePublication(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__deletePublication::sessionId = sessionId;
@@ -5918,12 +5965,13 @@ soap_instantiate_ns1__loginResponse(struct soap *, int, const char *,
 
 inline ns1__loginResponse *soap_new_ns1__loginResponse(struct soap *soap,
                                                        int n = -1) {
-  return soap_instantiate_ns1__loginResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__loginResponse(soap, n, nullptr, nullptr,
+                                             nullptr);
 }
 
 inline ns1__loginResponse *soap_new_req_ns1__loginResponse(struct soap *soap) {
   ns1__loginResponse *_p =
-      soap_instantiate_ns1__loginResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__loginResponse(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -5934,7 +5982,7 @@ inline ns1__loginResponse *soap_new_set_ns1__loginResponse(struct soap *soap,
                                                            std::string *return_,
                                                            char *__item1) {
   ns1__loginResponse *_p =
-      soap_instantiate_ns1__loginResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__loginResponse(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__loginResponse::return_ = return_;
@@ -5985,11 +6033,12 @@ soap_instantiate_ns1__login(struct soap *, int, const char *, const char *,
                             size_t *);
 
 inline ns1__login *soap_new_ns1__login(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__login(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__login(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__login *soap_new_req_ns1__login(struct soap *soap) {
-  ns1__login *_p = soap_instantiate_ns1__login(soap, -1, NULL, NULL, NULL);
+  ns1__login *_p =
+      soap_instantiate_ns1__login(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -6000,7 +6049,8 @@ inline ns1__login *soap_new_set_ns1__login(struct soap *soap,
                                            std::string *username,
                                            std::string *password,
                                            char *__item1) {
-  ns1__login *_p = soap_instantiate_ns1__login(soap, -1, NULL, NULL, NULL);
+  ns1__login *_p =
+      soap_instantiate_ns1__login(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__login::username = username;
@@ -6056,13 +6106,14 @@ soap_instantiate_ns1__loginLifetimeResponse(struct soap *, int, const char *,
 
 inline ns1__loginLifetimeResponse *
 soap_new_ns1__loginLifetimeResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__loginLifetimeResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__loginLifetimeResponse(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline ns1__loginLifetimeResponse *
 soap_new_req_ns1__loginLifetimeResponse(struct soap *soap) {
-  ns1__loginLifetimeResponse *_p =
-      soap_instantiate_ns1__loginLifetimeResponse(soap, -1, NULL, NULL, NULL);
+  ns1__loginLifetimeResponse *_p = soap_instantiate_ns1__loginLifetimeResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -6072,8 +6123,8 @@ soap_new_req_ns1__loginLifetimeResponse(struct soap *soap) {
 inline ns1__loginLifetimeResponse *
 soap_new_set_ns1__loginLifetimeResponse(struct soap *soap, std::string *return_,
                                         char *__item1) {
-  ns1__loginLifetimeResponse *_p =
-      soap_instantiate_ns1__loginLifetimeResponse(soap, -1, NULL, NULL, NULL);
+  ns1__loginLifetimeResponse *_p = soap_instantiate_ns1__loginLifetimeResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__loginLifetimeResponse::return_ = return_;
@@ -6130,13 +6181,14 @@ soap_instantiate_ns1__loginLifetime(struct soap *, int, const char *,
 
 inline ns1__loginLifetime *soap_new_ns1__loginLifetime(struct soap *soap,
                                                        int n = -1) {
-  return soap_instantiate_ns1__loginLifetime(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__loginLifetime(soap, n, nullptr, nullptr,
+                                             nullptr);
 }
 
 inline ns1__loginLifetime *soap_new_req_ns1__loginLifetime(struct soap *soap,
                                                            int lifetime) {
   ns1__loginLifetime *_p =
-      soap_instantiate_ns1__loginLifetime(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__loginLifetime(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__loginLifetime::lifetime = lifetime;
@@ -6149,7 +6201,7 @@ soap_new_set_ns1__loginLifetime(struct soap *soap, std::string *username,
                                 std::string *password, int lifetime,
                                 char *__item1) {
   ns1__loginLifetime *_p =
-      soap_instantiate_ns1__loginLifetime(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__loginLifetime(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__loginLifetime::username = username;
@@ -6211,15 +6263,15 @@ soap_instantiate_ns1__getParameterByUnitsResponse(struct soap *, int,
 
 inline ns1__getParameterByUnitsResponse *
 soap_new_ns1__getParameterByUnitsResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getParameterByUnitsResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__getParameterByUnitsResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__getParameterByUnitsResponse *
 soap_new_req_ns1__getParameterByUnitsResponse(struct soap *soap) {
   ns1__getParameterByUnitsResponse *_p =
-      soap_instantiate_ns1__getParameterByUnitsResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__getParameterByUnitsResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -6230,8 +6282,8 @@ inline ns1__getParameterByUnitsResponse *
 soap_new_set_ns1__getParameterByUnitsResponse(
     struct soap *soap, std::vector<ns1__parameter *> &return_, char *__item1) {
   ns1__getParameterByUnitsResponse *_p =
-      soap_instantiate_ns1__getParameterByUnitsResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__getParameterByUnitsResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getParameterByUnitsResponse::return_ = return_;
@@ -6288,13 +6340,14 @@ soap_instantiate_ns1__getParameterByUnits(struct soap *, int, const char *,
 
 inline ns1__getParameterByUnits *
 soap_new_ns1__getParameterByUnits(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getParameterByUnits(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getParameterByUnits(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__getParameterByUnits *
 soap_new_req_ns1__getParameterByUnits(struct soap *soap) {
-  ns1__getParameterByUnits *_p =
-      soap_instantiate_ns1__getParameterByUnits(soap, -1, NULL, NULL, NULL);
+  ns1__getParameterByUnits *_p = soap_instantiate_ns1__getParameterByUnits(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -6304,8 +6357,8 @@ soap_new_req_ns1__getParameterByUnits(struct soap *soap) {
 inline ns1__getParameterByUnits *
 soap_new_set_ns1__getParameterByUnits(struct soap *soap, std::string *sessionId,
                                       std::string *units, char *__item1) {
-  ns1__getParameterByUnits *_p =
-      soap_instantiate_ns1__getParameterByUnits(soap, -1, NULL, NULL, NULL);
+  ns1__getParameterByUnits *_p = soap_instantiate_ns1__getParameterByUnits(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getParameterByUnits::sessionId = sessionId;
@@ -6362,13 +6415,14 @@ soap_instantiate_ns1__addSampleResponse(struct soap *, int, const char *,
 
 inline ns1__addSampleResponse *
 soap_new_ns1__addSampleResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addSampleResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__addSampleResponse(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__addSampleResponse *
 soap_new_req_ns1__addSampleResponse(struct soap *soap) {
-  ns1__addSampleResponse *_p =
-      soap_instantiate_ns1__addSampleResponse(soap, -1, NULL, NULL, NULL);
+  ns1__addSampleResponse *_p = soap_instantiate_ns1__addSampleResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -6378,8 +6432,8 @@ soap_new_req_ns1__addSampleResponse(struct soap *soap) {
 inline ns1__addSampleResponse *
 soap_new_set_ns1__addSampleResponse(struct soap *soap, ns1__sample *return_,
                                     char *__item1) {
-  ns1__addSampleResponse *_p =
-      soap_instantiate_ns1__addSampleResponse(soap, -1, NULL, NULL, NULL);
+  ns1__addSampleResponse *_p = soap_instantiate_ns1__addSampleResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addSampleResponse::return_ = return_;
@@ -6433,12 +6487,12 @@ soap_instantiate_ns1__addSample(struct soap *, int, const char *, const char *,
                                 size_t *);
 
 inline ns1__addSample *soap_new_ns1__addSample(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addSample(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__addSample(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__addSample *soap_new_req_ns1__addSample(struct soap *soap) {
   ns1__addSample *_p =
-      soap_instantiate_ns1__addSample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__addSample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -6451,7 +6505,7 @@ inline ns1__addSample *soap_new_set_ns1__addSample(struct soap *soap,
                                                    LONG64 *investigationId,
                                                    char *__item1) {
   ns1__addSample *_p =
-      soap_instantiate_ns1__addSample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__addSample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addSample::sessionId = sessionId;
@@ -6512,15 +6566,15 @@ soap_instantiate_ns1__addAuthorisationResponse(struct soap *, int, const char *,
 
 inline ns1__addAuthorisationResponse *
 soap_new_ns1__addAuthorisationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addAuthorisationResponse(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate_ns1__addAuthorisationResponse(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline ns1__addAuthorisationResponse *
 soap_new_req_ns1__addAuthorisationResponse(struct soap *soap) {
   ns1__addAuthorisationResponse *_p =
-      soap_instantiate_ns1__addAuthorisationResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__addAuthorisationResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -6532,8 +6586,8 @@ soap_new_set_ns1__addAuthorisationResponse(struct soap *soap,
                                            ns1__icatAuthorisation *return_,
                                            char *__item1) {
   ns1__addAuthorisationResponse *_p =
-      soap_instantiate_ns1__addAuthorisationResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__addAuthorisationResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addAuthorisationResponse::return_ = return_;
@@ -6590,13 +6644,14 @@ soap_instantiate_ns1__addAuthorisation(struct soap *, int, const char *,
 
 inline ns1__addAuthorisation *soap_new_ns1__addAuthorisation(struct soap *soap,
                                                              int n = -1) {
-  return soap_instantiate_ns1__addAuthorisation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__addAuthorisation(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline ns1__addAuthorisation *
 soap_new_req_ns1__addAuthorisation(struct soap *soap) {
-  ns1__addAuthorisation *_p =
-      soap_instantiate_ns1__addAuthorisation(soap, -1, NULL, NULL, NULL);
+  ns1__addAuthorisation *_p = soap_instantiate_ns1__addAuthorisation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -6607,8 +6662,8 @@ inline ns1__addAuthorisation *soap_new_set_ns1__addAuthorisation(
     struct soap *soap, std::string *sessionId, std::string *toAddFedId,
     std::string *toAddRole, LONG64 *elementId,
     enum ns1__elementType *elementType, char *__item1) {
-  ns1__addAuthorisation *_p =
-      soap_instantiate_ns1__addAuthorisation(soap, -1, NULL, NULL, NULL);
+  ns1__addAuthorisation *_p = soap_instantiate_ns1__addAuthorisation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addAuthorisation::sessionId = sessionId;
@@ -6672,14 +6727,15 @@ soap_instantiate_ns1__createDataFilesResponse(struct soap *, int, const char *,
 
 inline ns1__createDataFilesResponse *
 soap_new_ns1__createDataFilesResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__createDataFilesResponse(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate_ns1__createDataFilesResponse(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline ns1__createDataFilesResponse *
 soap_new_req_ns1__createDataFilesResponse(struct soap *soap) {
   ns1__createDataFilesResponse *_p =
-      soap_instantiate_ns1__createDataFilesResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__createDataFilesResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -6689,7 +6745,8 @@ soap_new_req_ns1__createDataFilesResponse(struct soap *soap) {
 inline ns1__createDataFilesResponse *soap_new_set_ns1__createDataFilesResponse(
     struct soap *soap, std::vector<ns1__datafile *> &return_, char *__item1) {
   ns1__createDataFilesResponse *_p =
-      soap_instantiate_ns1__createDataFilesResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__createDataFilesResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__createDataFilesResponse::return_ = return_;
@@ -6746,13 +6803,14 @@ soap_instantiate_ns1__createDataFiles(struct soap *, int, const char *,
 
 inline ns1__createDataFiles *soap_new_ns1__createDataFiles(struct soap *soap,
                                                            int n = -1) {
-  return soap_instantiate_ns1__createDataFiles(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__createDataFiles(soap, n, nullptr, nullptr,
+                                               nullptr);
 }
 
 inline ns1__createDataFiles *
 soap_new_req_ns1__createDataFiles(struct soap *soap) {
-  ns1__createDataFiles *_p =
-      soap_instantiate_ns1__createDataFiles(soap, -1, NULL, NULL, NULL);
+  ns1__createDataFiles *_p = soap_instantiate_ns1__createDataFiles(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -6763,8 +6821,8 @@ inline ns1__createDataFiles *
 soap_new_set_ns1__createDataFiles(struct soap *soap, std::string *sessionId,
                                   std::vector<ns1__datafile *> &dataFiles,
                                   LONG64 *datasetId, char *__item1) {
-  ns1__createDataFiles *_p =
-      soap_instantiate_ns1__createDataFiles(soap, -1, NULL, NULL, NULL);
+  ns1__createDataFiles *_p = soap_instantiate_ns1__createDataFiles(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__createDataFiles::sessionId = sessionId;
@@ -6826,15 +6884,15 @@ soap_instantiate_ns1__addDataSetParameterResponse(struct soap *, int,
 
 inline ns1__addDataSetParameterResponse *
 soap_new_ns1__addDataSetParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addDataSetParameterResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__addDataSetParameterResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__addDataSetParameterResponse *
 soap_new_req_ns1__addDataSetParameterResponse(struct soap *soap) {
   ns1__addDataSetParameterResponse *_p =
-      soap_instantiate_ns1__addDataSetParameterResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__addDataSetParameterResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -6846,8 +6904,8 @@ soap_new_set_ns1__addDataSetParameterResponse(struct soap *soap,
                                               ns1__datasetParameter *return_,
                                               char *__item1) {
   ns1__addDataSetParameterResponse *_p =
-      soap_instantiate_ns1__addDataSetParameterResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__addDataSetParameterResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addDataSetParameterResponse::return_ = return_;
@@ -6904,13 +6962,14 @@ soap_instantiate_ns1__addDataSetParameter(struct soap *, int, const char *,
 
 inline ns1__addDataSetParameter *
 soap_new_ns1__addDataSetParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addDataSetParameter(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__addDataSetParameter(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__addDataSetParameter *
 soap_new_req_ns1__addDataSetParameter(struct soap *soap) {
-  ns1__addDataSetParameter *_p =
-      soap_instantiate_ns1__addDataSetParameter(soap, -1, NULL, NULL, NULL);
+  ns1__addDataSetParameter *_p = soap_instantiate_ns1__addDataSetParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -6921,8 +6980,8 @@ inline ns1__addDataSetParameter *
 soap_new_set_ns1__addDataSetParameter(struct soap *soap, std::string *sessionId,
                                       ns1__datasetParameter *dataSetParameter,
                                       LONG64 *datasetId, char *__item1) {
-  ns1__addDataSetParameter *_p =
-      soap_instantiate_ns1__addDataSetParameter(soap, -1, NULL, NULL, NULL);
+  ns1__addDataSetParameter *_p = soap_instantiate_ns1__addDataSetParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addDataSetParameter::sessionId = sessionId;
@@ -6984,15 +7043,15 @@ soap_instantiate_ns1__modifyInvestigatorResponse(struct soap *, int,
 
 inline ns1__modifyInvestigatorResponse *
 soap_new_ns1__modifyInvestigatorResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifyInvestigatorResponse(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate_ns1__modifyInvestigatorResponse(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline ns1__modifyInvestigatorResponse *
 soap_new_req_ns1__modifyInvestigatorResponse(struct soap *soap) {
   ns1__modifyInvestigatorResponse *_p =
-      soap_instantiate_ns1__modifyInvestigatorResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__modifyInvestigatorResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -7002,8 +7061,8 @@ soap_new_req_ns1__modifyInvestigatorResponse(struct soap *soap) {
 inline ns1__modifyInvestigatorResponse *
 soap_new_set_ns1__modifyInvestigatorResponse(struct soap *soap, char *__item1) {
   ns1__modifyInvestigatorResponse *_p =
-      soap_instantiate_ns1__modifyInvestigatorResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__modifyInvestigatorResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -7058,13 +7117,14 @@ soap_instantiate_ns1__modifyInvestigator(struct soap *, int, const char *,
 
 inline ns1__modifyInvestigator *
 soap_new_ns1__modifyInvestigator(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifyInvestigator(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__modifyInvestigator(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline ns1__modifyInvestigator *
 soap_new_req_ns1__modifyInvestigator(struct soap *soap) {
-  ns1__modifyInvestigator *_p =
-      soap_instantiate_ns1__modifyInvestigator(soap, -1, NULL, NULL, NULL);
+  ns1__modifyInvestigator *_p = soap_instantiate_ns1__modifyInvestigator(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -7075,8 +7135,8 @@ inline ns1__modifyInvestigator *
 soap_new_set_ns1__modifyInvestigator(struct soap *soap, std::string *sessionId,
                                      ns1__investigator *ns1__investigator_,
                                      char *__item1) {
-  ns1__modifyInvestigator *_p =
-      soap_instantiate_ns1__modifyInvestigator(soap, -1, NULL, NULL, NULL);
+  ns1__modifyInvestigator *_p = soap_instantiate_ns1__modifyInvestigator(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__modifyInvestigator::sessionId = sessionId;
@@ -7137,15 +7197,15 @@ soap_instantiate_ns1__modifySampleParameterResponse(struct soap *, int,
 
 inline ns1__modifySampleParameterResponse *
 soap_new_ns1__modifySampleParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifySampleParameterResponse(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate_ns1__modifySampleParameterResponse(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline ns1__modifySampleParameterResponse *
 soap_new_req_ns1__modifySampleParameterResponse(struct soap *soap) {
   ns1__modifySampleParameterResponse *_p =
-      soap_instantiate_ns1__modifySampleParameterResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate_ns1__modifySampleParameterResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -7156,8 +7216,8 @@ inline ns1__modifySampleParameterResponse *
 soap_new_set_ns1__modifySampleParameterResponse(struct soap *soap,
                                                 char *__item1) {
   ns1__modifySampleParameterResponse *_p =
-      soap_instantiate_ns1__modifySampleParameterResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate_ns1__modifySampleParameterResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -7213,13 +7273,14 @@ soap_instantiate_ns1__modifySampleParameter(struct soap *, int, const char *,
 
 inline ns1__modifySampleParameter *
 soap_new_ns1__modifySampleParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifySampleParameter(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__modifySampleParameter(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline ns1__modifySampleParameter *
 soap_new_req_ns1__modifySampleParameter(struct soap *soap) {
-  ns1__modifySampleParameter *_p =
-      soap_instantiate_ns1__modifySampleParameter(soap, -1, NULL, NULL, NULL);
+  ns1__modifySampleParameter *_p = soap_instantiate_ns1__modifySampleParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -7229,8 +7290,8 @@ soap_new_req_ns1__modifySampleParameter(struct soap *soap) {
 inline ns1__modifySampleParameter *soap_new_set_ns1__modifySampleParameter(
     struct soap *soap, std::string *sessionId,
     ns1__sampleParameter *sampleParameter, char *__item1) {
-  ns1__modifySampleParameter *_p =
-      soap_instantiate_ns1__modifySampleParameter(soap, -1, NULL, NULL, NULL);
+  ns1__modifySampleParameter *_p = soap_instantiate_ns1__modifySampleParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__modifySampleParameter::sessionId = sessionId;
@@ -7292,15 +7353,15 @@ soap_instantiate_ns1__listDatafileFormatsResponse(struct soap *, int,
 
 inline ns1__listDatafileFormatsResponse *
 soap_new_ns1__listDatafileFormatsResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__listDatafileFormatsResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__listDatafileFormatsResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__listDatafileFormatsResponse *
 soap_new_req_ns1__listDatafileFormatsResponse(struct soap *soap) {
   ns1__listDatafileFormatsResponse *_p =
-      soap_instantiate_ns1__listDatafileFormatsResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__listDatafileFormatsResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -7312,8 +7373,8 @@ soap_new_set_ns1__listDatafileFormatsResponse(
     struct soap *soap, std::vector<ns1__datafileFormat *> &return_,
     char *__item1) {
   ns1__listDatafileFormatsResponse *_p =
-      soap_instantiate_ns1__listDatafileFormatsResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__listDatafileFormatsResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listDatafileFormatsResponse::return_ = return_;
@@ -7370,13 +7431,14 @@ soap_instantiate_ns1__listDatafileFormats(struct soap *, int, const char *,
 
 inline ns1__listDatafileFormats *
 soap_new_ns1__listDatafileFormats(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__listDatafileFormats(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__listDatafileFormats(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__listDatafileFormats *
 soap_new_req_ns1__listDatafileFormats(struct soap *soap) {
-  ns1__listDatafileFormats *_p =
-      soap_instantiate_ns1__listDatafileFormats(soap, -1, NULL, NULL, NULL);
+  ns1__listDatafileFormats *_p = soap_instantiate_ns1__listDatafileFormats(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -7386,8 +7448,8 @@ soap_new_req_ns1__listDatafileFormats(struct soap *soap) {
 inline ns1__listDatafileFormats *
 soap_new_set_ns1__listDatafileFormats(struct soap *soap, std::string *sessionId,
                                       char *__item1) {
-  ns1__listDatafileFormats *_p =
-      soap_instantiate_ns1__listDatafileFormats(soap, -1, NULL, NULL, NULL);
+  ns1__listDatafileFormats *_p = soap_instantiate_ns1__listDatafileFormats(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listDatafileFormats::sessionId = sessionId;
@@ -7451,14 +7513,14 @@ inline ns1__searchInvestigationByParameterResponse *
 soap_new_ns1__searchInvestigationByParameterResponse(struct soap *soap,
                                                      int n = -1) {
   return soap_instantiate_ns1__searchInvestigationByParameterResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByParameterResponse *
 soap_new_req_ns1__searchInvestigationByParameterResponse(struct soap *soap) {
   ns1__searchInvestigationByParameterResponse *_p =
       soap_instantiate_ns1__searchInvestigationByParameterResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -7470,7 +7532,7 @@ soap_new_set_ns1__searchInvestigationByParameterResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchInvestigationByParameterResponse *_p =
       soap_instantiate_ns1__searchInvestigationByParameterResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByParameterResponse::return_ = return_;
@@ -7531,15 +7593,15 @@ soap_instantiate_ns1__searchInvestigationByParameter(struct soap *, int,
 
 inline ns1__searchInvestigationByParameter *
 soap_new_ns1__searchInvestigationByParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchInvestigationByParameter(soap, n, NULL,
-                                                              NULL, NULL);
+  return soap_instantiate_ns1__searchInvestigationByParameter(soap, n, nullptr,
+                                                              nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByParameter *
 soap_new_req_ns1__searchInvestigationByParameter(struct soap *soap) {
   ns1__searchInvestigationByParameter *_p =
-      soap_instantiate_ns1__searchInvestigationByParameter(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__searchInvestigationByParameter(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -7551,8 +7613,8 @@ soap_new_set_ns1__searchInvestigationByParameter(
     struct soap *soap, std::string *sessionId,
     std::vector<ns1__parameterSearch *> &parameters, char *__item1) {
   ns1__searchInvestigationByParameter *_p =
-      soap_instantiate_ns1__searchInvestigationByParameter(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__searchInvestigationByParameter(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByParameter::sessionId = sessionId;
@@ -7613,15 +7675,15 @@ soap_instantiate_ns1__searchByAdvancedResponse(struct soap *, int, const char *,
 
 inline ns1__searchByAdvancedResponse *
 soap_new_ns1__searchByAdvancedResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchByAdvancedResponse(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate_ns1__searchByAdvancedResponse(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline ns1__searchByAdvancedResponse *
 soap_new_req_ns1__searchByAdvancedResponse(struct soap *soap) {
   ns1__searchByAdvancedResponse *_p =
-      soap_instantiate_ns1__searchByAdvancedResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__searchByAdvancedResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -7633,8 +7695,8 @@ soap_new_set_ns1__searchByAdvancedResponse(
     struct soap *soap, std::vector<ns1__investigation *> &return_,
     char *__item1) {
   ns1__searchByAdvancedResponse *_p =
-      soap_instantiate_ns1__searchByAdvancedResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__searchByAdvancedResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByAdvancedResponse::return_ = return_;
@@ -7691,13 +7753,14 @@ soap_instantiate_ns1__searchByAdvanced(struct soap *, int, const char *,
 
 inline ns1__searchByAdvanced *soap_new_ns1__searchByAdvanced(struct soap *soap,
                                                              int n = -1) {
-  return soap_instantiate_ns1__searchByAdvanced(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__searchByAdvanced(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline ns1__searchByAdvanced *
 soap_new_req_ns1__searchByAdvanced(struct soap *soap) {
-  ns1__searchByAdvanced *_p =
-      soap_instantiate_ns1__searchByAdvanced(soap, -1, NULL, NULL, NULL);
+  ns1__searchByAdvanced *_p = soap_instantiate_ns1__searchByAdvanced(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -7707,8 +7770,8 @@ soap_new_req_ns1__searchByAdvanced(struct soap *soap) {
 inline ns1__searchByAdvanced *soap_new_set_ns1__searchByAdvanced(
     struct soap *soap, std::string *sessionId,
     ns1__advancedSearchDetails *advancedSearchDetails, char *__item1) {
-  ns1__searchByAdvanced *_p =
-      soap_instantiate_ns1__searchByAdvanced(soap, -1, NULL, NULL, NULL);
+  ns1__searchByAdvanced *_p = soap_instantiate_ns1__searchByAdvanced(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByAdvanced::sessionId = sessionId;
@@ -7772,15 +7835,15 @@ soap_instantiate_ns1__searchByAdvancedPaginationResponse(struct soap *, int,
 inline ns1__searchByAdvancedPaginationResponse *
 soap_new_ns1__searchByAdvancedPaginationResponse(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate_ns1__searchByAdvancedPaginationResponse(soap, n, NULL,
-                                                                  NULL, NULL);
+  return soap_instantiate_ns1__searchByAdvancedPaginationResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchByAdvancedPaginationResponse *
 soap_new_req_ns1__searchByAdvancedPaginationResponse(struct soap *soap) {
   ns1__searchByAdvancedPaginationResponse *_p =
-      soap_instantiate_ns1__searchByAdvancedPaginationResponse(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__searchByAdvancedPaginationResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -7792,8 +7855,8 @@ soap_new_set_ns1__searchByAdvancedPaginationResponse(
     struct soap *soap, std::vector<ns1__investigation *> &return_,
     char *__item1) {
   ns1__searchByAdvancedPaginationResponse *_p =
-      soap_instantiate_ns1__searchByAdvancedPaginationResponse(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__searchByAdvancedPaginationResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByAdvancedPaginationResponse::return_ = return_;
@@ -7851,13 +7914,14 @@ soap_instantiate_ns1__advancedSearchDetails(struct soap *, int, const char *,
 
 inline ns1__advancedSearchDetails *
 soap_new_ns1__advancedSearchDetails(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__advancedSearchDetails(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__advancedSearchDetails(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline ns1__advancedSearchDetails *
 soap_new_req_ns1__advancedSearchDetails(struct soap *soap, bool caseSensitive) {
-  ns1__advancedSearchDetails *_p =
-      soap_instantiate_ns1__advancedSearchDetails(soap, -1, NULL, NULL, NULL);
+  ns1__advancedSearchDetails *_p = soap_instantiate_ns1__advancedSearchDetails(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__advancedSearchDetails::caseSensitive = caseSensitive;
@@ -7875,8 +7939,8 @@ inline ns1__advancedSearchDetails *soap_new_set_ns1__advancedSearchDetails(
     std::vector<std::string> &investigators, std::vector<std::string> &keywords,
     double *runEnd, double *runStart, std::string *sampleName,
     std::string *visitId, char *__item1) {
-  ns1__advancedSearchDetails *_p =
-      soap_instantiate_ns1__advancedSearchDetails(soap, -1, NULL, NULL, NULL);
+  ns1__advancedSearchDetails *_p = soap_instantiate_ns1__advancedSearchDetails(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__advancedSearchDetails::backCatalogueInvestigatorString =
@@ -7956,16 +8020,16 @@ soap_instantiate_ns1__searchByAdvancedPagination(struct soap *, int,
 
 inline ns1__searchByAdvancedPagination *
 soap_new_ns1__searchByAdvancedPagination(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchByAdvancedPagination(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate_ns1__searchByAdvancedPagination(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline ns1__searchByAdvancedPagination *
 soap_new_req_ns1__searchByAdvancedPagination(struct soap *soap, int startIndex,
                                              int numberOfResults) {
   ns1__searchByAdvancedPagination *_p =
-      soap_instantiate_ns1__searchByAdvancedPagination(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__searchByAdvancedPagination(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByAdvancedPagination::startIndex = startIndex;
@@ -7980,8 +8044,8 @@ soap_new_set_ns1__searchByAdvancedPagination(
     ns1__advancedSearchDetails *advancedSearchDetails, int startIndex,
     int numberOfResults, char *__item1) {
   ns1__searchByAdvancedPagination *_p =
-      soap_instantiate_ns1__searchByAdvancedPagination(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__searchByAdvancedPagination(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByAdvancedPagination::sessionId = sessionId;
@@ -8049,7 +8113,7 @@ inline ns1__searchDatafileByParameterComparisonResponse *
 soap_new_ns1__searchDatafileByParameterComparisonResponse(struct soap *soap,
                                                           int n = -1) {
   return soap_instantiate_ns1__searchDatafileByParameterComparisonResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByParameterComparisonResponse *
@@ -8057,7 +8121,7 @@ soap_new_req_ns1__searchDatafileByParameterComparisonResponse(
     struct soap *soap) {
   ns1__searchDatafileByParameterComparisonResponse *_p =
       soap_instantiate_ns1__searchDatafileByParameterComparisonResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -8069,7 +8133,7 @@ soap_new_set_ns1__searchDatafileByParameterComparisonResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatafileByParameterComparisonResponse *_p =
       soap_instantiate_ns1__searchDatafileByParameterComparisonResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByParameterComparisonResponse::return_ = return_;
@@ -8135,14 +8199,14 @@ inline ns1__searchDatafileByParameterComparison *
 soap_new_ns1__searchDatafileByParameterComparison(struct soap *soap,
                                                   int n = -1) {
   return soap_instantiate_ns1__searchDatafileByParameterComparison(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByParameterComparison *
 soap_new_req_ns1__searchDatafileByParameterComparison(struct soap *soap) {
   ns1__searchDatafileByParameterComparison *_p =
-      soap_instantiate_ns1__searchDatafileByParameterComparison(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate_ns1__searchDatafileByParameterComparison(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -8155,8 +8219,8 @@ soap_new_set_ns1__searchDatafileByParameterComparison(
     std::vector<ns1__parameterComparisonCondition *> &comparison,
     char *__item1) {
   ns1__searchDatafileByParameterComparison *_p =
-      soap_instantiate_ns1__searchDatafileByParameterComparison(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate_ns1__searchDatafileByParameterComparison(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByParameterComparison::sessionId = sessionId;
@@ -8219,15 +8283,15 @@ soap_instantiate_ns1__searchByRunNumberResponse(struct soap *, int,
 
 inline ns1__searchByRunNumberResponse *
 soap_new_ns1__searchByRunNumberResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchByRunNumberResponse(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__searchByRunNumberResponse(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__searchByRunNumberResponse *
 soap_new_req_ns1__searchByRunNumberResponse(struct soap *soap) {
   ns1__searchByRunNumberResponse *_p =
-      soap_instantiate_ns1__searchByRunNumberResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__searchByRunNumberResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -8238,8 +8302,8 @@ inline ns1__searchByRunNumberResponse *
 soap_new_set_ns1__searchByRunNumberResponse(
     struct soap *soap, std::vector<ns1__datafile *> &return_, char *__item1) {
   ns1__searchByRunNumberResponse *_p =
-      soap_instantiate_ns1__searchByRunNumberResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__searchByRunNumberResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByRunNumberResponse::return_ = return_;
@@ -8296,14 +8360,15 @@ soap_instantiate_ns1__searchByRunNumber(struct soap *, int, const char *,
 
 inline ns1__searchByRunNumber *
 soap_new_ns1__searchByRunNumber(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchByRunNumber(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__searchByRunNumber(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__searchByRunNumber *
 soap_new_req_ns1__searchByRunNumber(struct soap *soap, float startRun,
                                     float endRun) {
-  ns1__searchByRunNumber *_p =
-      soap_instantiate_ns1__searchByRunNumber(soap, -1, NULL, NULL, NULL);
+  ns1__searchByRunNumber *_p = soap_instantiate_ns1__searchByRunNumber(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByRunNumber::startRun = startRun;
@@ -8317,8 +8382,8 @@ soap_new_set_ns1__searchByRunNumber(struct soap *soap, std::string *sessionId,
                                     std::vector<std::string> &instruments,
                                     float startRun, float endRun,
                                     char *__item1) {
-  ns1__searchByRunNumber *_p =
-      soap_instantiate_ns1__searchByRunNumber(soap, -1, NULL, NULL, NULL);
+  ns1__searchByRunNumber *_p = soap_instantiate_ns1__searchByRunNumber(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByRunNumber::sessionId = sessionId;
@@ -8385,14 +8450,14 @@ inline ns1__searchByRunNumberPaginationResponse *
 soap_new_ns1__searchByRunNumberPaginationResponse(struct soap *soap,
                                                   int n = -1) {
   return soap_instantiate_ns1__searchByRunNumberPaginationResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchByRunNumberPaginationResponse *
 soap_new_req_ns1__searchByRunNumberPaginationResponse(struct soap *soap) {
   ns1__searchByRunNumberPaginationResponse *_p =
-      soap_instantiate_ns1__searchByRunNumberPaginationResponse(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate_ns1__searchByRunNumberPaginationResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -8403,8 +8468,8 @@ inline ns1__searchByRunNumberPaginationResponse *
 soap_new_set_ns1__searchByRunNumberPaginationResponse(
     struct soap *soap, std::vector<ns1__datafile *> &return_, char *__item1) {
   ns1__searchByRunNumberPaginationResponse *_p =
-      soap_instantiate_ns1__searchByRunNumberPaginationResponse(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate_ns1__searchByRunNumberPaginationResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByRunNumberPaginationResponse::return_ = return_;
@@ -8465,8 +8530,8 @@ soap_instantiate_ns1__searchByRunNumberPagination(struct soap *, int,
 
 inline ns1__searchByRunNumberPagination *
 soap_new_ns1__searchByRunNumberPagination(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchByRunNumberPagination(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__searchByRunNumberPagination(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__searchByRunNumberPagination *
@@ -8474,8 +8539,8 @@ soap_new_req_ns1__searchByRunNumberPagination(struct soap *soap, float startRun,
                                               float endRun, int startIndex,
                                               int numberOfResults) {
   ns1__searchByRunNumberPagination *_p =
-      soap_instantiate_ns1__searchByRunNumberPagination(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__searchByRunNumberPagination(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByRunNumberPagination::startRun = startRun;
@@ -8492,8 +8557,8 @@ soap_new_set_ns1__searchByRunNumberPagination(
     std::vector<std::string> &instruments, float startRun, float endRun,
     int startIndex, int numberOfResults, char *__item1) {
   ns1__searchByRunNumberPagination *_p =
-      soap_instantiate_ns1__searchByRunNumberPagination(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__searchByRunNumberPagination(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByRunNumberPagination::sessionId = sessionId;
@@ -8558,15 +8623,15 @@ soap_instantiate_ns1__addDataSetParametersResponse(struct soap *, int,
 
 inline ns1__addDataSetParametersResponse *
 soap_new_ns1__addDataSetParametersResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addDataSetParametersResponse(soap, n, NULL, NULL,
-                                                            NULL);
+  return soap_instantiate_ns1__addDataSetParametersResponse(soap, n, nullptr,
+                                                            nullptr, nullptr);
 }
 
 inline ns1__addDataSetParametersResponse *
 soap_new_req_ns1__addDataSetParametersResponse(struct soap *soap) {
   ns1__addDataSetParametersResponse *_p =
-      soap_instantiate_ns1__addDataSetParametersResponse(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate_ns1__addDataSetParametersResponse(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -8578,8 +8643,8 @@ soap_new_set_ns1__addDataSetParametersResponse(
     struct soap *soap, std::vector<ns1__datasetParameter *> &return_,
     char *__item1) {
   ns1__addDataSetParametersResponse *_p =
-      soap_instantiate_ns1__addDataSetParametersResponse(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate_ns1__addDataSetParametersResponse(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addDataSetParametersResponse::return_ = return_;
@@ -8636,13 +8701,14 @@ soap_instantiate_ns1__addDataSetParameters(struct soap *, int, const char *,
 
 inline ns1__addDataSetParameters *
 soap_new_ns1__addDataSetParameters(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addDataSetParameters(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__addDataSetParameters(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline ns1__addDataSetParameters *
 soap_new_req_ns1__addDataSetParameters(struct soap *soap) {
-  ns1__addDataSetParameters *_p =
-      soap_instantiate_ns1__addDataSetParameters(soap, -1, NULL, NULL, NULL);
+  ns1__addDataSetParameters *_p = soap_instantiate_ns1__addDataSetParameters(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -8653,8 +8719,8 @@ inline ns1__addDataSetParameters *soap_new_set_ns1__addDataSetParameters(
     struct soap *soap, std::string *sessionId,
     std::vector<ns1__datasetParameter *> &dataSetParameters, LONG64 *datasetId,
     char *__item1) {
-  ns1__addDataSetParameters *_p =
-      soap_instantiate_ns1__addDataSetParameters(soap, -1, NULL, NULL, NULL);
+  ns1__addDataSetParameters *_p = soap_instantiate_ns1__addDataSetParameters(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addDataSetParameters::sessionId = sessionId;
@@ -8714,13 +8780,14 @@ soap_instantiate_ns1__deleteKeywordResponse(struct soap *, int, const char *,
 
 inline ns1__deleteKeywordResponse *
 soap_new_ns1__deleteKeywordResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteKeywordResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__deleteKeywordResponse(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline ns1__deleteKeywordResponse *
 soap_new_req_ns1__deleteKeywordResponse(struct soap *soap) {
-  ns1__deleteKeywordResponse *_p =
-      soap_instantiate_ns1__deleteKeywordResponse(soap, -1, NULL, NULL, NULL);
+  ns1__deleteKeywordResponse *_p = soap_instantiate_ns1__deleteKeywordResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -8729,8 +8796,8 @@ soap_new_req_ns1__deleteKeywordResponse(struct soap *soap) {
 
 inline ns1__deleteKeywordResponse *
 soap_new_set_ns1__deleteKeywordResponse(struct soap *soap, char *__item1) {
-  ns1__deleteKeywordResponse *_p =
-      soap_instantiate_ns1__deleteKeywordResponse(soap, -1, NULL, NULL, NULL);
+  ns1__deleteKeywordResponse *_p = soap_instantiate_ns1__deleteKeywordResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -8786,12 +8853,13 @@ soap_instantiate_ns1__deleteKeyword(struct soap *, int, const char *,
 
 inline ns1__deleteKeyword *soap_new_ns1__deleteKeyword(struct soap *soap,
                                                        int n = -1) {
-  return soap_instantiate_ns1__deleteKeyword(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__deleteKeyword(soap, n, nullptr, nullptr,
+                                             nullptr);
 }
 
 inline ns1__deleteKeyword *soap_new_req_ns1__deleteKeyword(struct soap *soap) {
   ns1__deleteKeyword *_p =
-      soap_instantiate_ns1__deleteKeyword(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__deleteKeyword(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -8802,7 +8870,7 @@ inline ns1__deleteKeyword *
 soap_new_set_ns1__deleteKeyword(struct soap *soap, std::string *sessionId,
                                 ns1__keywordPK *keywordPK, char *__item1) {
   ns1__deleteKeyword *_p =
-      soap_instantiate_ns1__deleteKeyword(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__deleteKeyword(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__deleteKeyword::sessionId = sessionId;
@@ -8863,15 +8931,15 @@ soap_instantiate_ns1__searchDatasetByParameterResponse(struct soap *, int,
 
 inline ns1__searchDatasetByParameterResponse *
 soap_new_ns1__searchDatasetByParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchDatasetByParameterResponse(soap, n, NULL,
-                                                                NULL, NULL);
+  return soap_instantiate_ns1__searchDatasetByParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByParameterResponse *
 soap_new_req_ns1__searchDatasetByParameterResponse(struct soap *soap) {
   ns1__searchDatasetByParameterResponse *_p =
-      soap_instantiate_ns1__searchDatasetByParameterResponse(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByParameterResponse(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -8882,8 +8950,8 @@ inline ns1__searchDatasetByParameterResponse *
 soap_new_set_ns1__searchDatasetByParameterResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatasetByParameterResponse *_p =
-      soap_instantiate_ns1__searchDatasetByParameterResponse(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByParameterResponse(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByParameterResponse::return_ = return_;
@@ -8943,15 +9011,15 @@ soap_instantiate_ns1__searchDatasetByParameter(struct soap *, int, const char *,
 
 inline ns1__searchDatasetByParameter *
 soap_new_ns1__searchDatasetByParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchDatasetByParameter(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate_ns1__searchDatasetByParameter(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByParameter *
 soap_new_req_ns1__searchDatasetByParameter(struct soap *soap) {
   ns1__searchDatasetByParameter *_p =
-      soap_instantiate_ns1__searchDatasetByParameter(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__searchDatasetByParameter(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -8963,8 +9031,8 @@ soap_new_set_ns1__searchDatasetByParameter(
     struct soap *soap, std::string *sessionId,
     std::vector<ns1__parameterSearch *> &parameters, char *__item1) {
   ns1__searchDatasetByParameter *_p =
-      soap_instantiate_ns1__searchDatasetByParameter(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__searchDatasetByParameter(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByParameter::sessionId = sessionId;
@@ -9023,13 +9091,14 @@ soap_instantiate_ns1__deleteSampleResponse(struct soap *, int, const char *,
 
 inline ns1__deleteSampleResponse *
 soap_new_ns1__deleteSampleResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteSampleResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__deleteSampleResponse(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline ns1__deleteSampleResponse *
 soap_new_req_ns1__deleteSampleResponse(struct soap *soap) {
-  ns1__deleteSampleResponse *_p =
-      soap_instantiate_ns1__deleteSampleResponse(soap, -1, NULL, NULL, NULL);
+  ns1__deleteSampleResponse *_p = soap_instantiate_ns1__deleteSampleResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -9038,8 +9107,8 @@ soap_new_req_ns1__deleteSampleResponse(struct soap *soap) {
 
 inline ns1__deleteSampleResponse *
 soap_new_set_ns1__deleteSampleResponse(struct soap *soap, char *__item1) {
-  ns1__deleteSampleResponse *_p =
-      soap_instantiate_ns1__deleteSampleResponse(soap, -1, NULL, NULL, NULL);
+  ns1__deleteSampleResponse *_p = soap_instantiate_ns1__deleteSampleResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -9095,12 +9164,12 @@ soap_instantiate_ns1__deleteSample(struct soap *, int, const char *,
 
 inline ns1__deleteSample *soap_new_ns1__deleteSample(struct soap *soap,
                                                      int n = -1) {
-  return soap_instantiate_ns1__deleteSample(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__deleteSample(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__deleteSample *soap_new_req_ns1__deleteSample(struct soap *soap) {
   ns1__deleteSample *_p =
-      soap_instantiate_ns1__deleteSample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__deleteSample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -9112,7 +9181,7 @@ inline ns1__deleteSample *soap_new_set_ns1__deleteSample(struct soap *soap,
                                                          LONG64 *sampleId,
                                                          char *__item1) {
   ns1__deleteSample *_p =
-      soap_instantiate_ns1__deleteSample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__deleteSample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__deleteSample::sessionId = sessionId;
@@ -9174,15 +9243,15 @@ soap_instantiate_ns1__listDatasetStatusResponse(struct soap *, int,
 
 inline ns1__listDatasetStatusResponse *
 soap_new_ns1__listDatasetStatusResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__listDatasetStatusResponse(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__listDatasetStatusResponse(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__listDatasetStatusResponse *
 soap_new_req_ns1__listDatasetStatusResponse(struct soap *soap) {
   ns1__listDatasetStatusResponse *_p =
-      soap_instantiate_ns1__listDatasetStatusResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__listDatasetStatusResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -9194,8 +9263,8 @@ soap_new_set_ns1__listDatasetStatusResponse(struct soap *soap,
                                             std::vector<std::string> &return_,
                                             char *__item1) {
   ns1__listDatasetStatusResponse *_p =
-      soap_instantiate_ns1__listDatasetStatusResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__listDatasetStatusResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listDatasetStatusResponse::return_ = return_;
@@ -9252,13 +9321,14 @@ soap_instantiate_ns1__listDatasetStatus(struct soap *, int, const char *,
 
 inline ns1__listDatasetStatus *
 soap_new_ns1__listDatasetStatus(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__listDatasetStatus(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__listDatasetStatus(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__listDatasetStatus *
 soap_new_req_ns1__listDatasetStatus(struct soap *soap) {
-  ns1__listDatasetStatus *_p =
-      soap_instantiate_ns1__listDatasetStatus(soap, -1, NULL, NULL, NULL);
+  ns1__listDatasetStatus *_p = soap_instantiate_ns1__listDatasetStatus(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -9268,8 +9338,8 @@ soap_new_req_ns1__listDatasetStatus(struct soap *soap) {
 inline ns1__listDatasetStatus *
 soap_new_set_ns1__listDatasetStatus(struct soap *soap, std::string *sessionId,
                                     char *__item1) {
-  ns1__listDatasetStatus *_p =
-      soap_instantiate_ns1__listDatasetStatus(soap, -1, NULL, NULL, NULL);
+  ns1__listDatasetStatus *_p = soap_instantiate_ns1__listDatasetStatus(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listDatasetStatus::sessionId = sessionId;
@@ -9329,15 +9399,15 @@ soap_instantiate_ns1__modifyInvestigationResponse(struct soap *, int,
 
 inline ns1__modifyInvestigationResponse *
 soap_new_ns1__modifyInvestigationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifyInvestigationResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__modifyInvestigationResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__modifyInvestigationResponse *
 soap_new_req_ns1__modifyInvestigationResponse(struct soap *soap) {
   ns1__modifyInvestigationResponse *_p =
-      soap_instantiate_ns1__modifyInvestigationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__modifyInvestigationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -9348,8 +9418,8 @@ inline ns1__modifyInvestigationResponse *
 soap_new_set_ns1__modifyInvestigationResponse(struct soap *soap,
                                               char *__item1) {
   ns1__modifyInvestigationResponse *_p =
-      soap_instantiate_ns1__modifyInvestigationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__modifyInvestigationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -9405,13 +9475,14 @@ soap_instantiate_ns1__modifyInvestigation(struct soap *, int, const char *,
 
 inline ns1__modifyInvestigation *
 soap_new_ns1__modifyInvestigation(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifyInvestigation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__modifyInvestigation(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__modifyInvestigation *
 soap_new_req_ns1__modifyInvestigation(struct soap *soap) {
-  ns1__modifyInvestigation *_p =
-      soap_instantiate_ns1__modifyInvestigation(soap, -1, NULL, NULL, NULL);
+  ns1__modifyInvestigation *_p = soap_instantiate_ns1__modifyInvestigation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -9422,8 +9493,8 @@ inline ns1__modifyInvestigation *
 soap_new_set_ns1__modifyInvestigation(struct soap *soap, std::string *sessionId,
                                       ns1__investigation *investigaion,
                                       char *__item1) {
-  ns1__modifyInvestigation *_p =
-      soap_instantiate_ns1__modifyInvestigation(soap, -1, NULL, NULL, NULL);
+  ns1__modifyInvestigation *_p = soap_instantiate_ns1__modifyInvestigation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__modifyInvestigation::sessionId = sessionId;
@@ -9480,13 +9551,14 @@ soap_instantiate_ns1__icatAuthorisation(struct soap *, int, const char *,
 
 inline ns1__icatAuthorisation *
 soap_new_ns1__icatAuthorisation(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__icatAuthorisation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__icatAuthorisation(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__icatAuthorisation *soap_new_req_ns1__icatAuthorisation(
     struct soap *soap, bool facilityAcquiredData1, bool selected1) {
-  ns1__icatAuthorisation *_p =
-      soap_instantiate_ns1__icatAuthorisation(soap, -1, NULL, NULL, NULL);
+  ns1__icatAuthorisation *_p = soap_instantiate_ns1__icatAuthorisation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -9500,8 +9572,8 @@ inline ns1__icatAuthorisation *soap_new_set_ns1__icatAuthorisation(
     LONG64 *id, ns1__icatRole *role, LONG64 *userChildRecord,
     std::string *userId, bool facilityAcquiredData1, ns1__icatRole *icatRole1,
     bool selected1, std::string *uniqueId1, char *__item2) {
-  ns1__icatAuthorisation *_p =
-      soap_instantiate_ns1__icatAuthorisation(soap, -1, NULL, NULL, NULL);
+  ns1__icatAuthorisation *_p = soap_instantiate_ns1__icatAuthorisation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__icatAuthorisation::elementId = elementId;
@@ -9571,15 +9643,15 @@ soap_instantiate_ns1__getAuthorisationsResponse(struct soap *, int,
 
 inline ns1__getAuthorisationsResponse *
 soap_new_ns1__getAuthorisationsResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getAuthorisationsResponse(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__getAuthorisationsResponse(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__getAuthorisationsResponse *
 soap_new_req_ns1__getAuthorisationsResponse(struct soap *soap) {
   ns1__getAuthorisationsResponse *_p =
-      soap_instantiate_ns1__getAuthorisationsResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__getAuthorisationsResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -9591,8 +9663,8 @@ soap_new_set_ns1__getAuthorisationsResponse(
     struct soap *soap, std::vector<ns1__icatAuthorisation *> &return_,
     char *__item1) {
   ns1__getAuthorisationsResponse *_p =
-      soap_instantiate_ns1__getAuthorisationsResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__getAuthorisationsResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getAuthorisationsResponse::return_ = return_;
@@ -9649,13 +9721,14 @@ soap_instantiate_ns1__getAuthorisations(struct soap *, int, const char *,
 
 inline ns1__getAuthorisations *
 soap_new_ns1__getAuthorisations(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getAuthorisations(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getAuthorisations(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__getAuthorisations *
 soap_new_req_ns1__getAuthorisations(struct soap *soap) {
-  ns1__getAuthorisations *_p =
-      soap_instantiate_ns1__getAuthorisations(soap, -1, NULL, NULL, NULL);
+  ns1__getAuthorisations *_p = soap_instantiate_ns1__getAuthorisations(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -9665,8 +9738,8 @@ soap_new_req_ns1__getAuthorisations(struct soap *soap) {
 inline ns1__getAuthorisations *soap_new_set_ns1__getAuthorisations(
     struct soap *soap, std::string *sessionId, LONG64 *elementId,
     enum ns1__elementType *elementType, char *__item1) {
-  ns1__getAuthorisations *_p =
-      soap_instantiate_ns1__getAuthorisations(soap, -1, NULL, NULL, NULL);
+  ns1__getAuthorisations *_p = soap_instantiate_ns1__getAuthorisations(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getAuthorisations::sessionId = sessionId;
@@ -9724,13 +9797,14 @@ soap_instantiate_ns1__addKeywordResponse(struct soap *, int, const char *,
 
 inline ns1__addKeywordResponse *
 soap_new_ns1__addKeywordResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addKeywordResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__addKeywordResponse(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline ns1__addKeywordResponse *
 soap_new_req_ns1__addKeywordResponse(struct soap *soap) {
-  ns1__addKeywordResponse *_p =
-      soap_instantiate_ns1__addKeywordResponse(soap, -1, NULL, NULL, NULL);
+  ns1__addKeywordResponse *_p = soap_instantiate_ns1__addKeywordResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -9740,8 +9814,8 @@ soap_new_req_ns1__addKeywordResponse(struct soap *soap) {
 inline ns1__addKeywordResponse *
 soap_new_set_ns1__addKeywordResponse(struct soap *soap, ns1__keyword *return_,
                                      char *__item1) {
-  ns1__addKeywordResponse *_p =
-      soap_instantiate_ns1__addKeywordResponse(soap, -1, NULL, NULL, NULL);
+  ns1__addKeywordResponse *_p = soap_instantiate_ns1__addKeywordResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addKeywordResponse::return_ = return_;
@@ -9796,12 +9870,12 @@ soap_instantiate_ns1__addKeyword(struct soap *, int, const char *, const char *,
 
 inline ns1__addKeyword *soap_new_ns1__addKeyword(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate_ns1__addKeyword(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__addKeyword(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__addKeyword *soap_new_req_ns1__addKeyword(struct soap *soap) {
   ns1__addKeyword *_p =
-      soap_instantiate_ns1__addKeyword(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__addKeyword(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -9814,7 +9888,7 @@ inline ns1__addKeyword *soap_new_set_ns1__addKeyword(struct soap *soap,
                                                      LONG64 *investigationId,
                                                      char *__item1) {
   ns1__addKeyword *_p =
-      soap_instantiate_ns1__addKeyword(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__addKeyword(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addKeyword::sessionId = sessionId;
@@ -9880,7 +9954,7 @@ inline ns1__searchDatasetByRestrictionComparisonResponse *
 soap_new_ns1__searchDatasetByRestrictionComparisonResponse(struct soap *soap,
                                                            int n = -1) {
   return soap_instantiate_ns1__searchDatasetByRestrictionComparisonResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByRestrictionComparisonResponse *
@@ -9888,7 +9962,7 @@ soap_new_req_ns1__searchDatasetByRestrictionComparisonResponse(
     struct soap *soap) {
   ns1__searchDatasetByRestrictionComparisonResponse *_p =
       soap_instantiate_ns1__searchDatasetByRestrictionComparisonResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -9900,7 +9974,7 @@ soap_new_set_ns1__searchDatasetByRestrictionComparisonResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatasetByRestrictionComparisonResponse *_p =
       soap_instantiate_ns1__searchDatasetByRestrictionComparisonResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByRestrictionComparisonResponse::return_ = return_;
@@ -9966,14 +10040,14 @@ inline ns1__searchDatasetByRestrictionComparison *
 soap_new_ns1__searchDatasetByRestrictionComparison(struct soap *soap,
                                                    int n = -1) {
   return soap_instantiate_ns1__searchDatasetByRestrictionComparison(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByRestrictionComparison *
 soap_new_req_ns1__searchDatasetByRestrictionComparison(struct soap *soap) {
   ns1__searchDatasetByRestrictionComparison *_p =
-      soap_instantiate_ns1__searchDatasetByRestrictionComparison(soap, -1, NULL,
-                                                                 NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByRestrictionComparison(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -9986,8 +10060,8 @@ soap_new_set_ns1__searchDatasetByRestrictionComparison(
     std::vector<ns1__restrictionComparisonCondition *> &restriction,
     char *__item1) {
   ns1__searchDatasetByRestrictionComparison *_p =
-      soap_instantiate_ns1__searchDatasetByRestrictionComparison(soap, -1, NULL,
-                                                                 NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByRestrictionComparison(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByRestrictionComparison::sessionId = sessionId;
@@ -10053,14 +10127,14 @@ inline ns1__searchSampleByParameterLogicalResponse *
 soap_new_ns1__searchSampleByParameterLogicalResponse(struct soap *soap,
                                                      int n = -1) {
   return soap_instantiate_ns1__searchSampleByParameterLogicalResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchSampleByParameterLogicalResponse *
 soap_new_req_ns1__searchSampleByParameterLogicalResponse(struct soap *soap) {
   ns1__searchSampleByParameterLogicalResponse *_p =
       soap_instantiate_ns1__searchSampleByParameterLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -10072,7 +10146,7 @@ soap_new_set_ns1__searchSampleByParameterLogicalResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchSampleByParameterLogicalResponse *_p =
       soap_instantiate_ns1__searchSampleByParameterLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByParameterLogicalResponse::return_ = return_;
@@ -10133,15 +10207,15 @@ soap_instantiate_ns1__searchSampleByParameterLogical(struct soap *, int,
 
 inline ns1__searchSampleByParameterLogical *
 soap_new_ns1__searchSampleByParameterLogical(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchSampleByParameterLogical(soap, n, NULL,
-                                                              NULL, NULL);
+  return soap_instantiate_ns1__searchSampleByParameterLogical(soap, n, nullptr,
+                                                              nullptr, nullptr);
 }
 
 inline ns1__searchSampleByParameterLogical *
 soap_new_req_ns1__searchSampleByParameterLogical(struct soap *soap) {
   ns1__searchSampleByParameterLogical *_p =
-      soap_instantiate_ns1__searchSampleByParameterLogical(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__searchSampleByParameterLogical(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -10153,8 +10227,8 @@ soap_new_set_ns1__searchSampleByParameterLogical(
     struct soap *soap, std::string *sessionId,
     ns1__parameterLogicalCondition *logicalCondition, char *__item1) {
   ns1__searchSampleByParameterLogical *_p =
-      soap_instantiate_ns1__searchSampleByParameterLogical(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__searchSampleByParameterLogical(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByParameterLogical::sessionId = sessionId;
@@ -10213,13 +10287,14 @@ soap_instantiate_ns1__removeDataSetResponse(struct soap *, int, const char *,
 
 inline ns1__removeDataSetResponse *
 soap_new_ns1__removeDataSetResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeDataSetResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__removeDataSetResponse(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline ns1__removeDataSetResponse *
 soap_new_req_ns1__removeDataSetResponse(struct soap *soap) {
-  ns1__removeDataSetResponse *_p =
-      soap_instantiate_ns1__removeDataSetResponse(soap, -1, NULL, NULL, NULL);
+  ns1__removeDataSetResponse *_p = soap_instantiate_ns1__removeDataSetResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -10228,8 +10303,8 @@ soap_new_req_ns1__removeDataSetResponse(struct soap *soap) {
 
 inline ns1__removeDataSetResponse *
 soap_new_set_ns1__removeDataSetResponse(struct soap *soap, char *__item1) {
-  ns1__removeDataSetResponse *_p =
-      soap_instantiate_ns1__removeDataSetResponse(soap, -1, NULL, NULL, NULL);
+  ns1__removeDataSetResponse *_p = soap_instantiate_ns1__removeDataSetResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -10285,12 +10360,13 @@ soap_instantiate_ns1__removeDataSet(struct soap *, int, const char *,
 
 inline ns1__removeDataSet *soap_new_ns1__removeDataSet(struct soap *soap,
                                                        int n = -1) {
-  return soap_instantiate_ns1__removeDataSet(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__removeDataSet(soap, n, nullptr, nullptr,
+                                             nullptr);
 }
 
 inline ns1__removeDataSet *soap_new_req_ns1__removeDataSet(struct soap *soap) {
   ns1__removeDataSet *_p =
-      soap_instantiate_ns1__removeDataSet(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__removeDataSet(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -10301,7 +10377,7 @@ inline ns1__removeDataSet *
 soap_new_set_ns1__removeDataSet(struct soap *soap, std::string *sessionId,
                                 LONG64 *dataSetId, char *__item1) {
   ns1__removeDataSet *_p =
-      soap_instantiate_ns1__removeDataSet(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__removeDataSet(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__removeDataSet::sessionId = sessionId;
@@ -10362,15 +10438,15 @@ soap_instantiate_ns1__modifyDataSetParameterResponse(struct soap *, int,
 
 inline ns1__modifyDataSetParameterResponse *
 soap_new_ns1__modifyDataSetParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifyDataSetParameterResponse(soap, n, NULL,
-                                                              NULL, NULL);
+  return soap_instantiate_ns1__modifyDataSetParameterResponse(soap, n, nullptr,
+                                                              nullptr, nullptr);
 }
 
 inline ns1__modifyDataSetParameterResponse *
 soap_new_req_ns1__modifyDataSetParameterResponse(struct soap *soap) {
   ns1__modifyDataSetParameterResponse *_p =
-      soap_instantiate_ns1__modifyDataSetParameterResponse(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__modifyDataSetParameterResponse(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -10381,8 +10457,8 @@ inline ns1__modifyDataSetParameterResponse *
 soap_new_set_ns1__modifyDataSetParameterResponse(struct soap *soap,
                                                  char *__item1) {
   ns1__modifyDataSetParameterResponse *_p =
-      soap_instantiate_ns1__modifyDataSetParameterResponse(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__modifyDataSetParameterResponse(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -10440,14 +10516,15 @@ soap_instantiate_ns1__modifyDataSetParameter(struct soap *, int, const char *,
 
 inline ns1__modifyDataSetParameter *
 soap_new_ns1__modifyDataSetParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifyDataSetParameter(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__modifyDataSetParameter(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__modifyDataSetParameter *
 soap_new_req_ns1__modifyDataSetParameter(struct soap *soap) {
   ns1__modifyDataSetParameter *_p =
-      soap_instantiate_ns1__modifyDataSetParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__modifyDataSetParameter(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -10458,7 +10535,8 @@ inline ns1__modifyDataSetParameter *soap_new_set_ns1__modifyDataSetParameter(
     struct soap *soap, std::string *sessionId,
     ns1__datasetParameter *dataSetParameter, char *__item1) {
   ns1__modifyDataSetParameter *_p =
-      soap_instantiate_ns1__modifyDataSetParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__modifyDataSetParameter(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__modifyDataSetParameter::sessionId = sessionId;
@@ -10520,15 +10598,15 @@ soap_instantiate_ns1__listInvestigationTypesResponse(struct soap *, int,
 
 inline ns1__listInvestigationTypesResponse *
 soap_new_ns1__listInvestigationTypesResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__listInvestigationTypesResponse(soap, n, NULL,
-                                                              NULL, NULL);
+  return soap_instantiate_ns1__listInvestigationTypesResponse(soap, n, nullptr,
+                                                              nullptr, nullptr);
 }
 
 inline ns1__listInvestigationTypesResponse *
 soap_new_req_ns1__listInvestigationTypesResponse(struct soap *soap) {
   ns1__listInvestigationTypesResponse *_p =
-      soap_instantiate_ns1__listInvestigationTypesResponse(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__listInvestigationTypesResponse(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -10539,8 +10617,8 @@ inline ns1__listInvestigationTypesResponse *
 soap_new_set_ns1__listInvestigationTypesResponse(
     struct soap *soap, std::vector<std::string> &return_, char *__item1) {
   ns1__listInvestigationTypesResponse *_p =
-      soap_instantiate_ns1__listInvestigationTypesResponse(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__listInvestigationTypesResponse(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listInvestigationTypesResponse::return_ = return_;
@@ -10599,14 +10677,15 @@ soap_instantiate_ns1__listInvestigationTypes(struct soap *, int, const char *,
 
 inline ns1__listInvestigationTypes *
 soap_new_ns1__listInvestigationTypes(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__listInvestigationTypes(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__listInvestigationTypes(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__listInvestigationTypes *
 soap_new_req_ns1__listInvestigationTypes(struct soap *soap) {
   ns1__listInvestigationTypes *_p =
-      soap_instantiate_ns1__listInvestigationTypes(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__listInvestigationTypes(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -10616,7 +10695,8 @@ soap_new_req_ns1__listInvestigationTypes(struct soap *soap) {
 inline ns1__listInvestigationTypes *soap_new_set_ns1__listInvestigationTypes(
     struct soap *soap, std::string *sessionId, char *__item1) {
   ns1__listInvestigationTypes *_p =
-      soap_instantiate_ns1__listInvestigationTypes(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__listInvestigationTypes(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listInvestigationTypes::sessionId = sessionId;
@@ -10677,15 +10757,15 @@ soap_instantiate_ns1__getKeywordsForUserResponse(struct soap *, int,
 
 inline ns1__getKeywordsForUserResponse *
 soap_new_ns1__getKeywordsForUserResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getKeywordsForUserResponse(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate_ns1__getKeywordsForUserResponse(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline ns1__getKeywordsForUserResponse *
 soap_new_req_ns1__getKeywordsForUserResponse(struct soap *soap) {
   ns1__getKeywordsForUserResponse *_p =
-      soap_instantiate_ns1__getKeywordsForUserResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__getKeywordsForUserResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -10697,8 +10777,8 @@ soap_new_set_ns1__getKeywordsForUserResponse(struct soap *soap,
                                              std::vector<std::string> &return_,
                                              char *__item1) {
   ns1__getKeywordsForUserResponse *_p =
-      soap_instantiate_ns1__getKeywordsForUserResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__getKeywordsForUserResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getKeywordsForUserResponse::return_ = return_;
@@ -10754,13 +10834,14 @@ soap_instantiate_ns1__getKeywordsForUser(struct soap *, int, const char *,
 
 inline ns1__getKeywordsForUser *
 soap_new_ns1__getKeywordsForUser(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getKeywordsForUser(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getKeywordsForUser(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline ns1__getKeywordsForUser *
 soap_new_req_ns1__getKeywordsForUser(struct soap *soap) {
-  ns1__getKeywordsForUser *_p =
-      soap_instantiate_ns1__getKeywordsForUser(soap, -1, NULL, NULL, NULL);
+  ns1__getKeywordsForUser *_p = soap_instantiate_ns1__getKeywordsForUser(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -10770,8 +10851,8 @@ soap_new_req_ns1__getKeywordsForUser(struct soap *soap) {
 inline ns1__getKeywordsForUser *
 soap_new_set_ns1__getKeywordsForUser(struct soap *soap, std::string *sessionId,
                                      char *__item1) {
-  ns1__getKeywordsForUser *_p =
-      soap_instantiate_ns1__getKeywordsForUser(soap, -1, NULL, NULL, NULL);
+  ns1__getKeywordsForUser *_p = soap_instantiate_ns1__getKeywordsForUser(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getKeywordsForUser::sessionId = sessionId;
@@ -10835,14 +10916,14 @@ inline ns1__getKeywordsForUserStartWithMaxResponse *
 soap_new_ns1__getKeywordsForUserStartWithMaxResponse(struct soap *soap,
                                                      int n = -1) {
   return soap_instantiate_ns1__getKeywordsForUserStartWithMaxResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getKeywordsForUserStartWithMaxResponse *
 soap_new_req_ns1__getKeywordsForUserStartWithMaxResponse(struct soap *soap) {
   ns1__getKeywordsForUserStartWithMaxResponse *_p =
       soap_instantiate_ns1__getKeywordsForUserStartWithMaxResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -10854,7 +10935,7 @@ soap_new_set_ns1__getKeywordsForUserStartWithMaxResponse(
     struct soap *soap, std::vector<std::string> &return_, char *__item1) {
   ns1__getKeywordsForUserStartWithMaxResponse *_p =
       soap_instantiate_ns1__getKeywordsForUserStartWithMaxResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getKeywordsForUserStartWithMaxResponse::return_ = return_;
@@ -10915,16 +10996,16 @@ soap_instantiate_ns1__getKeywordsForUserStartWithMax(struct soap *, int,
 
 inline ns1__getKeywordsForUserStartWithMax *
 soap_new_ns1__getKeywordsForUserStartWithMax(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getKeywordsForUserStartWithMax(soap, n, NULL,
-                                                              NULL, NULL);
+  return soap_instantiate_ns1__getKeywordsForUserStartWithMax(soap, n, nullptr,
+                                                              nullptr, nullptr);
 }
 
 inline ns1__getKeywordsForUserStartWithMax *
 soap_new_req_ns1__getKeywordsForUserStartWithMax(struct soap *soap,
                                                  int numberReturned) {
   ns1__getKeywordsForUserStartWithMax *_p =
-      soap_instantiate_ns1__getKeywordsForUserStartWithMax(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__getKeywordsForUserStartWithMax(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getKeywordsForUserStartWithMax::numberReturned = numberReturned;
@@ -10939,8 +11020,8 @@ soap_new_set_ns1__getKeywordsForUserStartWithMax(struct soap *soap,
                                                  int numberReturned,
                                                  char *__item1) {
   ns1__getKeywordsForUserStartWithMax *_p =
-      soap_instantiate_ns1__getKeywordsForUserStartWithMax(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__getKeywordsForUserStartWithMax(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getKeywordsForUserStartWithMax::sessionId = sessionId;
@@ -11002,15 +11083,15 @@ soap_instantiate_ns1__getKeywordsForUserMaxResponse(struct soap *, int,
 
 inline ns1__getKeywordsForUserMaxResponse *
 soap_new_ns1__getKeywordsForUserMaxResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getKeywordsForUserMaxResponse(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate_ns1__getKeywordsForUserMaxResponse(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline ns1__getKeywordsForUserMaxResponse *
 soap_new_req_ns1__getKeywordsForUserMaxResponse(struct soap *soap) {
   ns1__getKeywordsForUserMaxResponse *_p =
-      soap_instantiate_ns1__getKeywordsForUserMaxResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate_ns1__getKeywordsForUserMaxResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -11021,8 +11102,8 @@ inline ns1__getKeywordsForUserMaxResponse *
 soap_new_set_ns1__getKeywordsForUserMaxResponse(
     struct soap *soap, std::vector<std::string> &return_, char *__item1) {
   ns1__getKeywordsForUserMaxResponse *_p =
-      soap_instantiate_ns1__getKeywordsForUserMaxResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate_ns1__getKeywordsForUserMaxResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getKeywordsForUserMaxResponse::return_ = return_;
@@ -11079,13 +11160,14 @@ soap_instantiate_ns1__getKeywordsForUserMax(struct soap *, int, const char *,
 
 inline ns1__getKeywordsForUserMax *
 soap_new_ns1__getKeywordsForUserMax(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getKeywordsForUserMax(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getKeywordsForUserMax(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline ns1__getKeywordsForUserMax *
 soap_new_req_ns1__getKeywordsForUserMax(struct soap *soap, int numberReturned) {
-  ns1__getKeywordsForUserMax *_p =
-      soap_instantiate_ns1__getKeywordsForUserMax(soap, -1, NULL, NULL, NULL);
+  ns1__getKeywordsForUserMax *_p = soap_instantiate_ns1__getKeywordsForUserMax(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getKeywordsForUserMax::numberReturned = numberReturned;
@@ -11097,8 +11179,8 @@ inline ns1__getKeywordsForUserMax *
 soap_new_set_ns1__getKeywordsForUserMax(struct soap *soap,
                                         std::string *sessionId,
                                         int numberReturned, char *__item1) {
-  ns1__getKeywordsForUserMax *_p =
-      soap_instantiate_ns1__getKeywordsForUserMax(soap, -1, NULL, NULL, NULL);
+  ns1__getKeywordsForUserMax *_p = soap_instantiate_ns1__getKeywordsForUserMax(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getKeywordsForUserMax::sessionId = sessionId;
@@ -11160,15 +11242,15 @@ soap_instantiate_ns1__getKeywordsForUserTypeResponse(struct soap *, int,
 
 inline ns1__getKeywordsForUserTypeResponse *
 soap_new_ns1__getKeywordsForUserTypeResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getKeywordsForUserTypeResponse(soap, n, NULL,
-                                                              NULL, NULL);
+  return soap_instantiate_ns1__getKeywordsForUserTypeResponse(soap, n, nullptr,
+                                                              nullptr, nullptr);
 }
 
 inline ns1__getKeywordsForUserTypeResponse *
 soap_new_req_ns1__getKeywordsForUserTypeResponse(struct soap *soap) {
   ns1__getKeywordsForUserTypeResponse *_p =
-      soap_instantiate_ns1__getKeywordsForUserTypeResponse(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__getKeywordsForUserTypeResponse(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -11179,8 +11261,8 @@ inline ns1__getKeywordsForUserTypeResponse *
 soap_new_set_ns1__getKeywordsForUserTypeResponse(
     struct soap *soap, std::vector<std::string> &return_, char *__item1) {
   ns1__getKeywordsForUserTypeResponse *_p =
-      soap_instantiate_ns1__getKeywordsForUserTypeResponse(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__getKeywordsForUserTypeResponse(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getKeywordsForUserTypeResponse::return_ = return_;
@@ -11239,14 +11321,15 @@ soap_instantiate_ns1__getKeywordsForUserType(struct soap *, int, const char *,
 
 inline ns1__getKeywordsForUserType *
 soap_new_ns1__getKeywordsForUserType(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getKeywordsForUserType(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__getKeywordsForUserType(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__getKeywordsForUserType *
 soap_new_req_ns1__getKeywordsForUserType(struct soap *soap) {
   ns1__getKeywordsForUserType *_p =
-      soap_instantiate_ns1__getKeywordsForUserType(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getKeywordsForUserType(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -11257,7 +11340,8 @@ inline ns1__getKeywordsForUserType *soap_new_set_ns1__getKeywordsForUserType(
     struct soap *soap, std::string *sessionId,
     enum ns1__keywordType *keywordType, char *__item1) {
   ns1__getKeywordsForUserType *_p =
-      soap_instantiate_ns1__getKeywordsForUserType(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getKeywordsForUserType(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getKeywordsForUserType::sessionId = sessionId;
@@ -11319,15 +11403,15 @@ soap_instantiate_ns1__getParameterByNameResponse(struct soap *, int,
 
 inline ns1__getParameterByNameResponse *
 soap_new_ns1__getParameterByNameResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getParameterByNameResponse(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate_ns1__getParameterByNameResponse(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline ns1__getParameterByNameResponse *
 soap_new_req_ns1__getParameterByNameResponse(struct soap *soap) {
   ns1__getParameterByNameResponse *_p =
-      soap_instantiate_ns1__getParameterByNameResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__getParameterByNameResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -11338,8 +11422,8 @@ inline ns1__getParameterByNameResponse *
 soap_new_set_ns1__getParameterByNameResponse(
     struct soap *soap, std::vector<ns1__parameter *> &return_, char *__item1) {
   ns1__getParameterByNameResponse *_p =
-      soap_instantiate_ns1__getParameterByNameResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__getParameterByNameResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getParameterByNameResponse::return_ = return_;
@@ -11395,13 +11479,14 @@ soap_instantiate_ns1__getParameterByName(struct soap *, int, const char *,
 
 inline ns1__getParameterByName *
 soap_new_ns1__getParameterByName(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getParameterByName(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getParameterByName(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline ns1__getParameterByName *
 soap_new_req_ns1__getParameterByName(struct soap *soap) {
-  ns1__getParameterByName *_p =
-      soap_instantiate_ns1__getParameterByName(soap, -1, NULL, NULL, NULL);
+  ns1__getParameterByName *_p = soap_instantiate_ns1__getParameterByName(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -11411,8 +11496,8 @@ soap_new_req_ns1__getParameterByName(struct soap *soap) {
 inline ns1__getParameterByName *
 soap_new_set_ns1__getParameterByName(struct soap *soap, std::string *sessionId,
                                      std::string *name, char *__item1) {
-  ns1__getParameterByName *_p =
-      soap_instantiate_ns1__getParameterByName(soap, -1, NULL, NULL, NULL);
+  ns1__getParameterByName *_p = soap_instantiate_ns1__getParameterByName(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getParameterByName::sessionId = sessionId;
@@ -11473,15 +11558,15 @@ soap_instantiate_ns1__downloadDatafileResponse(struct soap *, int, const char *,
 
 inline ns1__downloadDatafileResponse *
 soap_new_ns1__downloadDatafileResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__downloadDatafileResponse(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate_ns1__downloadDatafileResponse(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline ns1__downloadDatafileResponse *
 soap_new_req_ns1__downloadDatafileResponse(struct soap *soap) {
   ns1__downloadDatafileResponse *_p =
-      soap_instantiate_ns1__downloadDatafileResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__downloadDatafileResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -11492,8 +11577,8 @@ inline ns1__downloadDatafileResponse *
 soap_new_set_ns1__downloadDatafileResponse(struct soap *soap, std::string *URL,
                                            char *__item1) {
   ns1__downloadDatafileResponse *_p =
-      soap_instantiate_ns1__downloadDatafileResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__downloadDatafileResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__downloadDatafileResponse::URL = URL;
@@ -11550,13 +11635,14 @@ soap_instantiate_ns1__downloadDatafile(struct soap *, int, const char *,
 
 inline ns1__downloadDatafile *soap_new_ns1__downloadDatafile(struct soap *soap,
                                                              int n = -1) {
-  return soap_instantiate_ns1__downloadDatafile(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__downloadDatafile(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline ns1__downloadDatafile *
 soap_new_req_ns1__downloadDatafile(struct soap *soap) {
-  ns1__downloadDatafile *_p =
-      soap_instantiate_ns1__downloadDatafile(soap, -1, NULL, NULL, NULL);
+  ns1__downloadDatafile *_p = soap_instantiate_ns1__downloadDatafile(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -11566,8 +11652,8 @@ soap_new_req_ns1__downloadDatafile(struct soap *soap) {
 inline ns1__downloadDatafile *
 soap_new_set_ns1__downloadDatafile(struct soap *soap, std::string *sessionId,
                                    LONG64 *datafileId, char *__item1) {
-  ns1__downloadDatafile *_p =
-      soap_instantiate_ns1__downloadDatafile(soap, -1, NULL, NULL, NULL);
+  ns1__downloadDatafile *_p = soap_instantiate_ns1__downloadDatafile(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__downloadDatafile::sessionId = sessionId;
@@ -11628,15 +11714,15 @@ soap_instantiate_ns1__setDataSetSampleResponse(struct soap *, int, const char *,
 
 inline ns1__setDataSetSampleResponse *
 soap_new_ns1__setDataSetSampleResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__setDataSetSampleResponse(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate_ns1__setDataSetSampleResponse(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline ns1__setDataSetSampleResponse *
 soap_new_req_ns1__setDataSetSampleResponse(struct soap *soap) {
   ns1__setDataSetSampleResponse *_p =
-      soap_instantiate_ns1__setDataSetSampleResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__setDataSetSampleResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -11646,8 +11732,8 @@ soap_new_req_ns1__setDataSetSampleResponse(struct soap *soap) {
 inline ns1__setDataSetSampleResponse *
 soap_new_set_ns1__setDataSetSampleResponse(struct soap *soap, char *__item1) {
   ns1__setDataSetSampleResponse *_p =
-      soap_instantiate_ns1__setDataSetSampleResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__setDataSetSampleResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -11703,13 +11789,14 @@ soap_instantiate_ns1__setDataSetSample(struct soap *, int, const char *,
 
 inline ns1__setDataSetSample *soap_new_ns1__setDataSetSample(struct soap *soap,
                                                              int n = -1) {
-  return soap_instantiate_ns1__setDataSetSample(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__setDataSetSample(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline ns1__setDataSetSample *
 soap_new_req_ns1__setDataSetSample(struct soap *soap) {
-  ns1__setDataSetSample *_p =
-      soap_instantiate_ns1__setDataSetSample(soap, -1, NULL, NULL, NULL);
+  ns1__setDataSetSample *_p = soap_instantiate_ns1__setDataSetSample(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -11720,8 +11807,8 @@ inline ns1__setDataSetSample *
 soap_new_set_ns1__setDataSetSample(struct soap *soap, std::string *sessionId,
                                    LONG64 *sampleId, LONG64 *datafileId,
                                    char *__item1) {
-  ns1__setDataSetSample *_p =
-      soap_instantiate_ns1__setDataSetSample(soap, -1, NULL, NULL, NULL);
+  ns1__setDataSetSample *_p = soap_instantiate_ns1__setDataSetSample(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__setDataSetSample::sessionId = sessionId;
@@ -11783,15 +11870,15 @@ soap_instantiate_ns1__deleteDataSetParameterResponse(struct soap *, int,
 
 inline ns1__deleteDataSetParameterResponse *
 soap_new_ns1__deleteDataSetParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteDataSetParameterResponse(soap, n, NULL,
-                                                              NULL, NULL);
+  return soap_instantiate_ns1__deleteDataSetParameterResponse(soap, n, nullptr,
+                                                              nullptr, nullptr);
 }
 
 inline ns1__deleteDataSetParameterResponse *
 soap_new_req_ns1__deleteDataSetParameterResponse(struct soap *soap) {
   ns1__deleteDataSetParameterResponse *_p =
-      soap_instantiate_ns1__deleteDataSetParameterResponse(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__deleteDataSetParameterResponse(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -11802,8 +11889,8 @@ inline ns1__deleteDataSetParameterResponse *
 soap_new_set_ns1__deleteDataSetParameterResponse(struct soap *soap,
                                                  char *__item1) {
   ns1__deleteDataSetParameterResponse *_p =
-      soap_instantiate_ns1__deleteDataSetParameterResponse(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__deleteDataSetParameterResponse(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -11861,14 +11948,15 @@ soap_instantiate_ns1__deleteDataSetParameter(struct soap *, int, const char *,
 
 inline ns1__deleteDataSetParameter *
 soap_new_ns1__deleteDataSetParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteDataSetParameter(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__deleteDataSetParameter(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__deleteDataSetParameter *
 soap_new_req_ns1__deleteDataSetParameter(struct soap *soap) {
   ns1__deleteDataSetParameter *_p =
-      soap_instantiate_ns1__deleteDataSetParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__deleteDataSetParameter(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -11879,7 +11967,8 @@ inline ns1__deleteDataSetParameter *soap_new_set_ns1__deleteDataSetParameter(
     struct soap *soap, std::string *sessionId,
     ns1__datasetParameterPK *datasetParameterPK, char *__item1) {
   ns1__deleteDataSetParameter *_p =
-      soap_instantiate_ns1__deleteDataSetParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__deleteDataSetParameter(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__deleteDataSetParameter::sessionId = sessionId;
@@ -11941,15 +12030,15 @@ soap_instantiate_ns1__removeSampleParameterResponse(struct soap *, int,
 
 inline ns1__removeSampleParameterResponse *
 soap_new_ns1__removeSampleParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeSampleParameterResponse(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate_ns1__removeSampleParameterResponse(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline ns1__removeSampleParameterResponse *
 soap_new_req_ns1__removeSampleParameterResponse(struct soap *soap) {
   ns1__removeSampleParameterResponse *_p =
-      soap_instantiate_ns1__removeSampleParameterResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate_ns1__removeSampleParameterResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -11960,8 +12049,8 @@ inline ns1__removeSampleParameterResponse *
 soap_new_set_ns1__removeSampleParameterResponse(struct soap *soap,
                                                 char *__item1) {
   ns1__removeSampleParameterResponse *_p =
-      soap_instantiate_ns1__removeSampleParameterResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate_ns1__removeSampleParameterResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -12017,13 +12106,14 @@ soap_instantiate_ns1__removeSampleParameter(struct soap *, int, const char *,
 
 inline ns1__removeSampleParameter *
 soap_new_ns1__removeSampleParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeSampleParameter(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__removeSampleParameter(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline ns1__removeSampleParameter *
 soap_new_req_ns1__removeSampleParameter(struct soap *soap) {
-  ns1__removeSampleParameter *_p =
-      soap_instantiate_ns1__removeSampleParameter(soap, -1, NULL, NULL, NULL);
+  ns1__removeSampleParameter *_p = soap_instantiate_ns1__removeSampleParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -12033,8 +12123,8 @@ soap_new_req_ns1__removeSampleParameter(struct soap *soap) {
 inline ns1__removeSampleParameter *soap_new_set_ns1__removeSampleParameter(
     struct soap *soap, std::string *sessionId,
     ns1__sampleParameterPK *sampleParameterPK, char *__item1) {
-  ns1__removeSampleParameter *_p =
-      soap_instantiate_ns1__removeSampleParameter(soap, -1, NULL, NULL, NULL);
+  ns1__removeSampleParameter *_p = soap_instantiate_ns1__removeSampleParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__removeSampleParameter::sessionId = sessionId;
@@ -12103,7 +12193,7 @@ inline ns1__searchInvestigationByRestrictionLogicalResponse *
 soap_new_ns1__searchInvestigationByRestrictionLogicalResponse(struct soap *soap,
                                                               int n = -1) {
   return soap_instantiate_ns1__searchInvestigationByRestrictionLogicalResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByRestrictionLogicalResponse *
@@ -12111,7 +12201,7 @@ soap_new_req_ns1__searchInvestigationByRestrictionLogicalResponse(
     struct soap *soap) {
   ns1__searchInvestigationByRestrictionLogicalResponse *_p =
       soap_instantiate_ns1__searchInvestigationByRestrictionLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -12123,7 +12213,7 @@ soap_new_set_ns1__searchInvestigationByRestrictionLogicalResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchInvestigationByRestrictionLogicalResponse *_p =
       soap_instantiate_ns1__searchInvestigationByRestrictionLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByRestrictionLogicalResponse::return_ = return_;
@@ -12188,14 +12278,14 @@ inline ns1__searchInvestigationByRestrictionLogical *
 soap_new_ns1__searchInvestigationByRestrictionLogical(struct soap *soap,
                                                       int n = -1) {
   return soap_instantiate_ns1__searchInvestigationByRestrictionLogical(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByRestrictionLogical *
 soap_new_req_ns1__searchInvestigationByRestrictionLogical(struct soap *soap) {
   ns1__searchInvestigationByRestrictionLogical *_p =
       soap_instantiate_ns1__searchInvestigationByRestrictionLogical(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -12208,7 +12298,7 @@ soap_new_set_ns1__searchInvestigationByRestrictionLogical(
     ns1__restrictionLogicalCondition *restriction, char *__item1) {
   ns1__searchInvestigationByRestrictionLogical *_p =
       soap_instantiate_ns1__searchInvestigationByRestrictionLogical(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByRestrictionLogical::sessionId = sessionId;
@@ -12275,7 +12365,7 @@ inline ns1__searchDatafileByParameterRestrictionResponse *
 soap_new_ns1__searchDatafileByParameterRestrictionResponse(struct soap *soap,
                                                            int n = -1) {
   return soap_instantiate_ns1__searchDatafileByParameterRestrictionResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByParameterRestrictionResponse *
@@ -12283,7 +12373,7 @@ soap_new_req_ns1__searchDatafileByParameterRestrictionResponse(
     struct soap *soap) {
   ns1__searchDatafileByParameterRestrictionResponse *_p =
       soap_instantiate_ns1__searchDatafileByParameterRestrictionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -12295,7 +12385,7 @@ soap_new_set_ns1__searchDatafileByParameterRestrictionResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatafileByParameterRestrictionResponse *_p =
       soap_instantiate_ns1__searchDatafileByParameterRestrictionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByParameterRestrictionResponse::return_ = return_;
@@ -12361,14 +12451,14 @@ inline ns1__searchDatafileByParameterRestriction *
 soap_new_ns1__searchDatafileByParameterRestriction(struct soap *soap,
                                                    int n = -1) {
   return soap_instantiate_ns1__searchDatafileByParameterRestriction(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByParameterRestriction *
 soap_new_req_ns1__searchDatafileByParameterRestriction(struct soap *soap) {
   ns1__searchDatafileByParameterRestriction *_p =
-      soap_instantiate_ns1__searchDatafileByParameterRestriction(soap, -1, NULL,
-                                                                 NULL, NULL);
+      soap_instantiate_ns1__searchDatafileByParameterRestriction(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -12381,8 +12471,8 @@ soap_new_set_ns1__searchDatafileByParameterRestriction(
     ns1__parameterCondition *parameterCondition,
     ns1__restrictionCondition *restrictions, char *__item1) {
   ns1__searchDatafileByParameterRestriction *_p =
-      soap_instantiate_ns1__searchDatafileByParameterRestriction(soap, -1, NULL,
-                                                                 NULL, NULL);
+      soap_instantiate_ns1__searchDatafileByParameterRestriction(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByParameterRestriction::sessionId = sessionId;
@@ -12443,13 +12533,14 @@ soap_instantiate_ns1__createDataSetResponse(struct soap *, int, const char *,
 
 inline ns1__createDataSetResponse *
 soap_new_ns1__createDataSetResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__createDataSetResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__createDataSetResponse(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline ns1__createDataSetResponse *
 soap_new_req_ns1__createDataSetResponse(struct soap *soap) {
-  ns1__createDataSetResponse *_p =
-      soap_instantiate_ns1__createDataSetResponse(soap, -1, NULL, NULL, NULL);
+  ns1__createDataSetResponse *_p = soap_instantiate_ns1__createDataSetResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -12459,8 +12550,8 @@ soap_new_req_ns1__createDataSetResponse(struct soap *soap) {
 inline ns1__createDataSetResponse *
 soap_new_set_ns1__createDataSetResponse(struct soap *soap,
                                         ns1__dataset *return_, char *__item1) {
-  ns1__createDataSetResponse *_p =
-      soap_instantiate_ns1__createDataSetResponse(soap, -1, NULL, NULL, NULL);
+  ns1__createDataSetResponse *_p = soap_instantiate_ns1__createDataSetResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__createDataSetResponse::return_ = return_;
@@ -12517,12 +12608,13 @@ soap_instantiate_ns1__createDataSet(struct soap *, int, const char *,
 
 inline ns1__createDataSet *soap_new_ns1__createDataSet(struct soap *soap,
                                                        int n = -1) {
-  return soap_instantiate_ns1__createDataSet(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__createDataSet(soap, n, nullptr, nullptr,
+                                             nullptr);
 }
 
 inline ns1__createDataSet *soap_new_req_ns1__createDataSet(struct soap *soap) {
   ns1__createDataSet *_p =
-      soap_instantiate_ns1__createDataSet(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__createDataSet(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -12534,7 +12626,7 @@ soap_new_set_ns1__createDataSet(struct soap *soap, std::string *sessionId,
                                 ns1__dataset *dataSet, LONG64 *investigationId,
                                 char *__item1) {
   ns1__createDataSet *_p =
-      soap_instantiate_ns1__createDataSet(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__createDataSet(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__createDataSet::sessionId = sessionId;
@@ -12599,14 +12691,14 @@ inline ns1__searchDatafileByParameterLogicalResponse *
 soap_new_ns1__searchDatafileByParameterLogicalResponse(struct soap *soap,
                                                        int n = -1) {
   return soap_instantiate_ns1__searchDatafileByParameterLogicalResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByParameterLogicalResponse *
 soap_new_req_ns1__searchDatafileByParameterLogicalResponse(struct soap *soap) {
   ns1__searchDatafileByParameterLogicalResponse *_p =
       soap_instantiate_ns1__searchDatafileByParameterLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -12618,7 +12710,7 @@ soap_new_set_ns1__searchDatafileByParameterLogicalResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatafileByParameterLogicalResponse *_p =
       soap_instantiate_ns1__searchDatafileByParameterLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByParameterLogicalResponse::return_ = return_;
@@ -12679,15 +12771,15 @@ soap_instantiate_ns1__searchDatafileByParameterLogical(struct soap *, int,
 
 inline ns1__searchDatafileByParameterLogical *
 soap_new_ns1__searchDatafileByParameterLogical(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchDatafileByParameterLogical(soap, n, NULL,
-                                                                NULL, NULL);
+  return soap_instantiate_ns1__searchDatafileByParameterLogical(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByParameterLogical *
 soap_new_req_ns1__searchDatafileByParameterLogical(struct soap *soap) {
   ns1__searchDatafileByParameterLogical *_p =
-      soap_instantiate_ns1__searchDatafileByParameterLogical(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate_ns1__searchDatafileByParameterLogical(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -12699,8 +12791,8 @@ soap_new_set_ns1__searchDatafileByParameterLogical(
     struct soap *soap, std::string *sessionId,
     ns1__parameterLogicalCondition *logicalCondition, char *__item1) {
   ns1__searchDatafileByParameterLogical *_p =
-      soap_instantiate_ns1__searchDatafileByParameterLogical(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate_ns1__searchDatafileByParameterLogical(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByParameterLogical::sessionId = sessionId;
@@ -12762,14 +12854,15 @@ soap_instantiate_ns1__addInvestigatorResponse(struct soap *, int, const char *,
 
 inline ns1__addInvestigatorResponse *
 soap_new_ns1__addInvestigatorResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addInvestigatorResponse(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate_ns1__addInvestigatorResponse(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline ns1__addInvestigatorResponse *
 soap_new_req_ns1__addInvestigatorResponse(struct soap *soap) {
   ns1__addInvestigatorResponse *_p =
-      soap_instantiate_ns1__addInvestigatorResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__addInvestigatorResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -12779,7 +12872,8 @@ soap_new_req_ns1__addInvestigatorResponse(struct soap *soap) {
 inline ns1__addInvestigatorResponse *soap_new_set_ns1__addInvestigatorResponse(
     struct soap *soap, ns1__investigator *return_, char *__item1) {
   ns1__addInvestigatorResponse *_p =
-      soap_instantiate_ns1__addInvestigatorResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__addInvestigatorResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addInvestigatorResponse::return_ = return_;
@@ -12836,13 +12930,14 @@ soap_instantiate_ns1__addInvestigator(struct soap *, int, const char *,
 
 inline ns1__addInvestigator *soap_new_ns1__addInvestigator(struct soap *soap,
                                                            int n = -1) {
-  return soap_instantiate_ns1__addInvestigator(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__addInvestigator(soap, n, nullptr, nullptr,
+                                               nullptr);
 }
 
 inline ns1__addInvestigator *
 soap_new_req_ns1__addInvestigator(struct soap *soap) {
-  ns1__addInvestigator *_p =
-      soap_instantiate_ns1__addInvestigator(soap, -1, NULL, NULL, NULL);
+  ns1__addInvestigator *_p = soap_instantiate_ns1__addInvestigator(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -12853,8 +12948,8 @@ inline ns1__addInvestigator *
 soap_new_set_ns1__addInvestigator(struct soap *soap, std::string *sessionId,
                                   ns1__investigator *ns1__investigator_,
                                   LONG64 *investigationId, char *__item1) {
-  ns1__addInvestigator *_p =
-      soap_instantiate_ns1__addInvestigator(soap, -1, NULL, NULL, NULL);
+  ns1__addInvestigator *_p = soap_instantiate_ns1__addInvestigator(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addInvestigator::sessionId = sessionId;
@@ -12916,15 +13011,15 @@ soap_instantiate_ns1__deleteInvestigatorResponse(struct soap *, int,
 
 inline ns1__deleteInvestigatorResponse *
 soap_new_ns1__deleteInvestigatorResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteInvestigatorResponse(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate_ns1__deleteInvestigatorResponse(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline ns1__deleteInvestigatorResponse *
 soap_new_req_ns1__deleteInvestigatorResponse(struct soap *soap) {
   ns1__deleteInvestigatorResponse *_p =
-      soap_instantiate_ns1__deleteInvestigatorResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__deleteInvestigatorResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -12934,8 +13029,8 @@ soap_new_req_ns1__deleteInvestigatorResponse(struct soap *soap) {
 inline ns1__deleteInvestigatorResponse *
 soap_new_set_ns1__deleteInvestigatorResponse(struct soap *soap, char *__item1) {
   ns1__deleteInvestigatorResponse *_p =
-      soap_instantiate_ns1__deleteInvestigatorResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__deleteInvestigatorResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -12990,13 +13085,14 @@ soap_instantiate_ns1__deleteInvestigator(struct soap *, int, const char *,
 
 inline ns1__deleteInvestigator *
 soap_new_ns1__deleteInvestigator(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteInvestigator(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__deleteInvestigator(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline ns1__deleteInvestigator *
 soap_new_req_ns1__deleteInvestigator(struct soap *soap) {
-  ns1__deleteInvestigator *_p =
-      soap_instantiate_ns1__deleteInvestigator(soap, -1, NULL, NULL, NULL);
+  ns1__deleteInvestigator *_p = soap_instantiate_ns1__deleteInvestigator(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -13007,8 +13103,8 @@ inline ns1__deleteInvestigator *
 soap_new_set_ns1__deleteInvestigator(struct soap *soap, std::string *sessionId,
                                      ns1__investigatorPK *investigatorPK,
                                      char *__item1) {
-  ns1__deleteInvestigator *_p =
-      soap_instantiate_ns1__deleteInvestigator(soap, -1, NULL, NULL, NULL);
+  ns1__deleteInvestigator *_p = soap_instantiate_ns1__deleteInvestigator(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__deleteInvestigator::sessionId = sessionId;
@@ -13072,14 +13168,14 @@ inline ns1__searchInvestigationByRestrictionResponse *
 soap_new_ns1__searchInvestigationByRestrictionResponse(struct soap *soap,
                                                        int n = -1) {
   return soap_instantiate_ns1__searchInvestigationByRestrictionResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByRestrictionResponse *
 soap_new_req_ns1__searchInvestigationByRestrictionResponse(struct soap *soap) {
   ns1__searchInvestigationByRestrictionResponse *_p =
       soap_instantiate_ns1__searchInvestigationByRestrictionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -13091,7 +13187,7 @@ soap_new_set_ns1__searchInvestigationByRestrictionResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchInvestigationByRestrictionResponse *_p =
       soap_instantiate_ns1__searchInvestigationByRestrictionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByRestrictionResponse::return_ = return_;
@@ -13152,15 +13248,15 @@ soap_instantiate_ns1__searchInvestigationByRestriction(struct soap *, int,
 
 inline ns1__searchInvestigationByRestriction *
 soap_new_ns1__searchInvestigationByRestriction(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchInvestigationByRestriction(soap, n, NULL,
-                                                                NULL, NULL);
+  return soap_instantiate_ns1__searchInvestigationByRestriction(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByRestriction *
 soap_new_req_ns1__searchInvestigationByRestriction(struct soap *soap) {
   ns1__searchInvestigationByRestriction *_p =
-      soap_instantiate_ns1__searchInvestigationByRestriction(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate_ns1__searchInvestigationByRestriction(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -13172,8 +13268,8 @@ soap_new_set_ns1__searchInvestigationByRestriction(
     struct soap *soap, std::string *sessionId,
     ns1__restrictionCondition *restriction, char *__item1) {
   ns1__searchInvestigationByRestriction *_p =
-      soap_instantiate_ns1__searchInvestigationByRestriction(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate_ns1__searchInvestigationByRestriction(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByRestriction::sessionId = sessionId;
@@ -13235,15 +13331,15 @@ soap_instantiate_ns1__getICATAPIVersionResponse(struct soap *, int,
 
 inline ns1__getICATAPIVersionResponse *
 soap_new_ns1__getICATAPIVersionResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getICATAPIVersionResponse(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__getICATAPIVersionResponse(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__getICATAPIVersionResponse *
 soap_new_req_ns1__getICATAPIVersionResponse(struct soap *soap) {
   ns1__getICATAPIVersionResponse *_p =
-      soap_instantiate_ns1__getICATAPIVersionResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__getICATAPIVersionResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -13255,8 +13351,8 @@ soap_new_set_ns1__getICATAPIVersionResponse(struct soap *soap,
                                             std::string *return_,
                                             char *__item1) {
   ns1__getICATAPIVersionResponse *_p =
-      soap_instantiate_ns1__getICATAPIVersionResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__getICATAPIVersionResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getICATAPIVersionResponse::return_ = return_;
@@ -13313,13 +13409,14 @@ soap_instantiate_ns1__getICATAPIVersion(struct soap *, int, const char *,
 
 inline ns1__getICATAPIVersion *
 soap_new_ns1__getICATAPIVersion(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getICATAPIVersion(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getICATAPIVersion(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__getICATAPIVersion *
 soap_new_req_ns1__getICATAPIVersion(struct soap *soap) {
-  ns1__getICATAPIVersion *_p =
-      soap_instantiate_ns1__getICATAPIVersion(soap, -1, NULL, NULL, NULL);
+  ns1__getICATAPIVersion *_p = soap_instantiate_ns1__getICATAPIVersion(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -13329,8 +13426,8 @@ soap_new_req_ns1__getICATAPIVersion(struct soap *soap) {
 inline ns1__getICATAPIVersion *
 soap_new_set_ns1__getICATAPIVersion(struct soap *soap, std::string *sessionId,
                                     char *__item1) {
-  ns1__getICATAPIVersion *_p =
-      soap_instantiate_ns1__getICATAPIVersion(soap, -1, NULL, NULL, NULL);
+  ns1__getICATAPIVersion *_p = soap_instantiate_ns1__getICATAPIVersion(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getICATAPIVersion::sessionId = sessionId;
@@ -13387,13 +13484,14 @@ soap_instantiate_ns1__getDatafilesResponse(struct soap *, int, const char *,
 
 inline ns1__getDatafilesResponse *
 soap_new_ns1__getDatafilesResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getDatafilesResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getDatafilesResponse(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline ns1__getDatafilesResponse *
 soap_new_req_ns1__getDatafilesResponse(struct soap *soap) {
-  ns1__getDatafilesResponse *_p =
-      soap_instantiate_ns1__getDatafilesResponse(soap, -1, NULL, NULL, NULL);
+  ns1__getDatafilesResponse *_p = soap_instantiate_ns1__getDatafilesResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -13402,8 +13500,8 @@ soap_new_req_ns1__getDatafilesResponse(struct soap *soap) {
 
 inline ns1__getDatafilesResponse *soap_new_set_ns1__getDatafilesResponse(
     struct soap *soap, std::vector<ns1__datafile *> &return_, char *__item1) {
-  ns1__getDatafilesResponse *_p =
-      soap_instantiate_ns1__getDatafilesResponse(soap, -1, NULL, NULL, NULL);
+  ns1__getDatafilesResponse *_p = soap_instantiate_ns1__getDatafilesResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getDatafilesResponse::return_ = return_;
@@ -13460,12 +13558,12 @@ soap_instantiate_ns1__getDatafiles(struct soap *, int, const char *,
 
 inline ns1__getDatafiles *soap_new_ns1__getDatafiles(struct soap *soap,
                                                      int n = -1) {
-  return soap_instantiate_ns1__getDatafiles(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getDatafiles(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getDatafiles *soap_new_req_ns1__getDatafiles(struct soap *soap) {
   ns1__getDatafiles *_p =
-      soap_instantiate_ns1__getDatafiles(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getDatafiles(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -13477,7 +13575,7 @@ soap_new_set_ns1__getDatafiles(struct soap *soap, std::string *sessionId,
                                std::vector<LONG64> &datafileIds,
                                char *__item1) {
   ns1__getDatafiles *_p =
-      soap_instantiate_ns1__getDatafiles(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getDatafiles(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getDatafiles::sessionId = sessionId;
@@ -13537,14 +13635,15 @@ soap_instantiate_ns1__isSessionValidResponse(struct soap *, int, const char *,
 
 inline ns1__isSessionValidResponse *
 soap_new_ns1__isSessionValidResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__isSessionValidResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__isSessionValidResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__isSessionValidResponse *
 soap_new_req_ns1__isSessionValidResponse(struct soap *soap, bool return_) {
   ns1__isSessionValidResponse *_p =
-      soap_instantiate_ns1__isSessionValidResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__isSessionValidResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__isSessionValidResponse::return_ = return_;
@@ -13556,7 +13655,8 @@ inline ns1__isSessionValidResponse *
 soap_new_set_ns1__isSessionValidResponse(struct soap *soap, bool return_,
                                          char *__item1) {
   ns1__isSessionValidResponse *_p =
-      soap_instantiate_ns1__isSessionValidResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__isSessionValidResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__isSessionValidResponse::return_ = return_;
@@ -13613,13 +13713,14 @@ soap_instantiate_ns1__isSessionValid(struct soap *, int, const char *,
 
 inline ns1__isSessionValid *soap_new_ns1__isSessionValid(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__isSessionValid(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__isSessionValid(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__isSessionValid *
 soap_new_req_ns1__isSessionValid(struct soap *soap) {
   ns1__isSessionValid *_p =
-      soap_instantiate_ns1__isSessionValid(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__isSessionValid(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -13630,7 +13731,7 @@ inline ns1__isSessionValid *
 soap_new_set_ns1__isSessionValid(struct soap *soap, std::string *sessionId,
                                  char *__item1) {
   ns1__isSessionValid *_p =
-      soap_instantiate_ns1__isSessionValid(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__isSessionValid(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__isSessionValid::sessionId = sessionId;
@@ -13698,7 +13799,7 @@ inline ns1__searchInvestigationByParameterComparisonResponse *
 soap_new_ns1__searchInvestigationByParameterComparisonResponse(
     struct soap *soap, int n = -1) {
   return soap_instantiate_ns1__searchInvestigationByParameterComparisonResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByParameterComparisonResponse *
@@ -13706,7 +13807,7 @@ soap_new_req_ns1__searchInvestigationByParameterComparisonResponse(
     struct soap *soap) {
   ns1__searchInvestigationByParameterComparisonResponse *_p =
       soap_instantiate_ns1__searchInvestigationByParameterComparisonResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -13718,7 +13819,7 @@ soap_new_set_ns1__searchInvestigationByParameterComparisonResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchInvestigationByParameterComparisonResponse *_p =
       soap_instantiate_ns1__searchInvestigationByParameterComparisonResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByParameterComparisonResponse::return_ =
@@ -13783,14 +13884,14 @@ inline ns1__searchInvestigationByParameterComparison *
 soap_new_ns1__searchInvestigationByParameterComparison(struct soap *soap,
                                                        int n = -1) {
   return soap_instantiate_ns1__searchInvestigationByParameterComparison(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByParameterComparison *
 soap_new_req_ns1__searchInvestigationByParameterComparison(struct soap *soap) {
   ns1__searchInvestigationByParameterComparison *_p =
       soap_instantiate_ns1__searchInvestigationByParameterComparison(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -13804,7 +13905,7 @@ soap_new_set_ns1__searchInvestigationByParameterComparison(
     char *__item1) {
   ns1__searchInvestigationByParameterComparison *_p =
       soap_instantiate_ns1__searchInvestigationByParameterComparison(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByParameterComparison::sessionId = sessionId;
@@ -13864,13 +13965,14 @@ soap_instantiate_ns1__deleteDataSetResponse(struct soap *, int, const char *,
 
 inline ns1__deleteDataSetResponse *
 soap_new_ns1__deleteDataSetResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteDataSetResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__deleteDataSetResponse(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline ns1__deleteDataSetResponse *
 soap_new_req_ns1__deleteDataSetResponse(struct soap *soap) {
-  ns1__deleteDataSetResponse *_p =
-      soap_instantiate_ns1__deleteDataSetResponse(soap, -1, NULL, NULL, NULL);
+  ns1__deleteDataSetResponse *_p = soap_instantiate_ns1__deleteDataSetResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -13879,8 +13981,8 @@ soap_new_req_ns1__deleteDataSetResponse(struct soap *soap) {
 
 inline ns1__deleteDataSetResponse *
 soap_new_set_ns1__deleteDataSetResponse(struct soap *soap, char *__item1) {
-  ns1__deleteDataSetResponse *_p =
-      soap_instantiate_ns1__deleteDataSetResponse(soap, -1, NULL, NULL, NULL);
+  ns1__deleteDataSetResponse *_p = soap_instantiate_ns1__deleteDataSetResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -13936,12 +14038,13 @@ soap_instantiate_ns1__deleteDataSet(struct soap *, int, const char *,
 
 inline ns1__deleteDataSet *soap_new_ns1__deleteDataSet(struct soap *soap,
                                                        int n = -1) {
-  return soap_instantiate_ns1__deleteDataSet(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__deleteDataSet(soap, n, nullptr, nullptr,
+                                             nullptr);
 }
 
 inline ns1__deleteDataSet *soap_new_req_ns1__deleteDataSet(struct soap *soap) {
   ns1__deleteDataSet *_p =
-      soap_instantiate_ns1__deleteDataSet(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__deleteDataSet(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -13952,7 +14055,7 @@ inline ns1__deleteDataSet *
 soap_new_set_ns1__deleteDataSet(struct soap *soap, std::string *sessionId,
                                 LONG64 *dataSetId, char *__item1) {
   ns1__deleteDataSet *_p =
-      soap_instantiate_ns1__deleteDataSet(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__deleteDataSet(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__deleteDataSet::sessionId = sessionId;
@@ -14014,15 +14117,15 @@ soap_instantiate_ns1__getInvestigationsResponse(struct soap *, int,
 
 inline ns1__getInvestigationsResponse *
 soap_new_ns1__getInvestigationsResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getInvestigationsResponse(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__getInvestigationsResponse(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__getInvestigationsResponse *
 soap_new_req_ns1__getInvestigationsResponse(struct soap *soap) {
   ns1__getInvestigationsResponse *_p =
-      soap_instantiate_ns1__getInvestigationsResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__getInvestigationsResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -14034,8 +14137,8 @@ soap_new_set_ns1__getInvestigationsResponse(
     struct soap *soap, std::vector<ns1__investigation *> &return_,
     char *__item1) {
   ns1__getInvestigationsResponse *_p =
-      soap_instantiate_ns1__getInvestigationsResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__getInvestigationsResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getInvestigationsResponse::return_ = return_;
@@ -14092,13 +14195,14 @@ soap_instantiate_ns1__getInvestigations(struct soap *, int, const char *,
 
 inline ns1__getInvestigations *
 soap_new_ns1__getInvestigations(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getInvestigations(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getInvestigations(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__getInvestigations *
 soap_new_req_ns1__getInvestigations(struct soap *soap) {
-  ns1__getInvestigations *_p =
-      soap_instantiate_ns1__getInvestigations(soap, -1, NULL, NULL, NULL);
+  ns1__getInvestigations *_p = soap_instantiate_ns1__getInvestigations(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -14109,8 +14213,8 @@ inline ns1__getInvestigations *
 soap_new_set_ns1__getInvestigations(struct soap *soap, std::string *userId,
                                     std::vector<LONG64> &investigationIds,
                                     char *__item1) {
-  ns1__getInvestigations *_p =
-      soap_instantiate_ns1__getInvestigations(soap, -1, NULL, NULL, NULL);
+  ns1__getInvestigations *_p = soap_instantiate_ns1__getInvestigations(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getInvestigations::userId = userId;
@@ -14172,15 +14276,15 @@ soap_instantiate_ns1__getInvestigationsIncludesResponse(struct soap *, int,
 
 inline ns1__getInvestigationsIncludesResponse *
 soap_new_ns1__getInvestigationsIncludesResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getInvestigationsIncludesResponse(soap, n, NULL,
-                                                                 NULL, NULL);
+  return soap_instantiate_ns1__getInvestigationsIncludesResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getInvestigationsIncludesResponse *
 soap_new_req_ns1__getInvestigationsIncludesResponse(struct soap *soap) {
   ns1__getInvestigationsIncludesResponse *_p =
-      soap_instantiate_ns1__getInvestigationsIncludesResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__getInvestigationsIncludesResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -14192,8 +14296,8 @@ soap_new_set_ns1__getInvestigationsIncludesResponse(
     struct soap *soap, std::vector<ns1__investigation *> &return_,
     char *__item1) {
   ns1__getInvestigationsIncludesResponse *_p =
-      soap_instantiate_ns1__getInvestigationsIncludesResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__getInvestigationsIncludesResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getInvestigationsIncludesResponse::return_ = return_;
@@ -14255,15 +14359,15 @@ soap_instantiate_ns1__getInvestigationsIncludes(struct soap *, int,
 
 inline ns1__getInvestigationsIncludes *
 soap_new_ns1__getInvestigationsIncludes(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getInvestigationsIncludes(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__getInvestigationsIncludes(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__getInvestigationsIncludes *
 soap_new_req_ns1__getInvestigationsIncludes(struct soap *soap) {
   ns1__getInvestigationsIncludes *_p =
-      soap_instantiate_ns1__getInvestigationsIncludes(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__getInvestigationsIncludes(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -14276,8 +14380,8 @@ soap_new_set_ns1__getInvestigationsIncludes(
     std::vector<LONG64> &investigationIds,
     enum ns1__investigationInclude *investigationInclude, char *__item1) {
   ns1__getInvestigationsIncludes *_p =
-      soap_instantiate_ns1__getInvestigationsIncludes(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__getInvestigationsIncludes(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getInvestigationsIncludes::userId = userId;
@@ -14341,15 +14445,15 @@ soap_instantiate_ns1__searchSampleByParameterResponse(struct soap *, int,
 
 inline ns1__searchSampleByParameterResponse *
 soap_new_ns1__searchSampleByParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchSampleByParameterResponse(soap, n, NULL,
-                                                               NULL, NULL);
+  return soap_instantiate_ns1__searchSampleByParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchSampleByParameterResponse *
 soap_new_req_ns1__searchSampleByParameterResponse(struct soap *soap) {
   ns1__searchSampleByParameterResponse *_p =
-      soap_instantiate_ns1__searchSampleByParameterResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__searchSampleByParameterResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -14360,8 +14464,8 @@ inline ns1__searchSampleByParameterResponse *
 soap_new_set_ns1__searchSampleByParameterResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchSampleByParameterResponse *_p =
-      soap_instantiate_ns1__searchSampleByParameterResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__searchSampleByParameterResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByParameterResponse::return_ = return_;
@@ -14421,14 +14525,15 @@ soap_instantiate_ns1__searchSampleByParameter(struct soap *, int, const char *,
 
 inline ns1__searchSampleByParameter *
 soap_new_ns1__searchSampleByParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchSampleByParameter(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate_ns1__searchSampleByParameter(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline ns1__searchSampleByParameter *
 soap_new_req_ns1__searchSampleByParameter(struct soap *soap) {
   ns1__searchSampleByParameter *_p =
-      soap_instantiate_ns1__searchSampleByParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__searchSampleByParameter(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -14439,7 +14544,8 @@ inline ns1__searchSampleByParameter *soap_new_set_ns1__searchSampleByParameter(
     struct soap *soap, std::string *sessionId,
     std::vector<ns1__parameterSearch *> &parameters, char *__item1) {
   ns1__searchSampleByParameter *_p =
-      soap_instantiate_ns1__searchSampleByParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__searchSampleByParameter(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByParameter::sessionId = sessionId;
@@ -14504,14 +14610,14 @@ inline ns1__searchDatasetByParameterConditionResponse *
 soap_new_ns1__searchDatasetByParameterConditionResponse(struct soap *soap,
                                                         int n = -1) {
   return soap_instantiate_ns1__searchDatasetByParameterConditionResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByParameterConditionResponse *
 soap_new_req_ns1__searchDatasetByParameterConditionResponse(struct soap *soap) {
   ns1__searchDatasetByParameterConditionResponse *_p =
       soap_instantiate_ns1__searchDatasetByParameterConditionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -14523,7 +14629,7 @@ soap_new_set_ns1__searchDatasetByParameterConditionResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatasetByParameterConditionResponse *_p =
       soap_instantiate_ns1__searchDatasetByParameterConditionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByParameterConditionResponse::return_ = return_;
@@ -14585,15 +14691,15 @@ soap_instantiate_ns1__searchDatasetByParameterCondition(struct soap *, int,
 
 inline ns1__searchDatasetByParameterCondition *
 soap_new_ns1__searchDatasetByParameterCondition(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchDatasetByParameterCondition(soap, n, NULL,
-                                                                 NULL, NULL);
+  return soap_instantiate_ns1__searchDatasetByParameterCondition(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByParameterCondition *
 soap_new_req_ns1__searchDatasetByParameterCondition(struct soap *soap) {
   ns1__searchDatasetByParameterCondition *_p =
-      soap_instantiate_ns1__searchDatasetByParameterCondition(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByParameterCondition(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -14605,8 +14711,8 @@ soap_new_set_ns1__searchDatasetByParameterCondition(
     struct soap *soap, std::string *sessionId,
     ns1__parameterCondition *logicalCondition, char *__item1) {
   ns1__searchDatasetByParameterCondition *_p =
-      soap_instantiate_ns1__searchDatasetByParameterCondition(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByParameterCondition(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByParameterCondition::sessionId = sessionId;
@@ -14669,15 +14775,15 @@ soap_instantiate_ns1__removeDataFileParameterResponse(struct soap *, int,
 
 inline ns1__removeDataFileParameterResponse *
 soap_new_ns1__removeDataFileParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeDataFileParameterResponse(soap, n, NULL,
-                                                               NULL, NULL);
+  return soap_instantiate_ns1__removeDataFileParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__removeDataFileParameterResponse *
 soap_new_req_ns1__removeDataFileParameterResponse(struct soap *soap) {
   ns1__removeDataFileParameterResponse *_p =
-      soap_instantiate_ns1__removeDataFileParameterResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__removeDataFileParameterResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -14688,8 +14794,8 @@ inline ns1__removeDataFileParameterResponse *
 soap_new_set_ns1__removeDataFileParameterResponse(struct soap *soap,
                                                   char *__item1) {
   ns1__removeDataFileParameterResponse *_p =
-      soap_instantiate_ns1__removeDataFileParameterResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__removeDataFileParameterResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -14748,14 +14854,15 @@ soap_instantiate_ns1__removeDataFileParameter(struct soap *, int, const char *,
 
 inline ns1__removeDataFileParameter *
 soap_new_ns1__removeDataFileParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeDataFileParameter(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate_ns1__removeDataFileParameter(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline ns1__removeDataFileParameter *
 soap_new_req_ns1__removeDataFileParameter(struct soap *soap) {
   ns1__removeDataFileParameter *_p =
-      soap_instantiate_ns1__removeDataFileParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__removeDataFileParameter(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -14766,7 +14873,8 @@ inline ns1__removeDataFileParameter *soap_new_set_ns1__removeDataFileParameter(
     struct soap *soap, std::string *sessionId,
     ns1__datafileParameterPK *datafileParameterPK, char *__item1) {
   ns1__removeDataFileParameter *_p =
-      soap_instantiate_ns1__removeDataFileParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__removeDataFileParameter(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__removeDataFileParameter::sessionId = sessionId;
@@ -14832,14 +14940,14 @@ inline ns1__searchDatasetByParameterLogicalResponse *
 soap_new_ns1__searchDatasetByParameterLogicalResponse(struct soap *soap,
                                                       int n = -1) {
   return soap_instantiate_ns1__searchDatasetByParameterLogicalResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByParameterLogicalResponse *
 soap_new_req_ns1__searchDatasetByParameterLogicalResponse(struct soap *soap) {
   ns1__searchDatasetByParameterLogicalResponse *_p =
       soap_instantiate_ns1__searchDatasetByParameterLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -14851,7 +14959,7 @@ soap_new_set_ns1__searchDatasetByParameterLogicalResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatasetByParameterLogicalResponse *_p =
       soap_instantiate_ns1__searchDatasetByParameterLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByParameterLogicalResponse::return_ = return_;
@@ -14912,15 +15020,15 @@ soap_instantiate_ns1__searchDatasetByParameterLogical(struct soap *, int,
 
 inline ns1__searchDatasetByParameterLogical *
 soap_new_ns1__searchDatasetByParameterLogical(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchDatasetByParameterLogical(soap, n, NULL,
-                                                               NULL, NULL);
+  return soap_instantiate_ns1__searchDatasetByParameterLogical(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByParameterLogical *
 soap_new_req_ns1__searchDatasetByParameterLogical(struct soap *soap) {
   ns1__searchDatasetByParameterLogical *_p =
-      soap_instantiate_ns1__searchDatasetByParameterLogical(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByParameterLogical(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -14932,8 +15040,8 @@ soap_new_set_ns1__searchDatasetByParameterLogical(
     struct soap *soap, std::string *sessionId,
     ns1__parameterLogicalCondition *logicalCondition, char *__item1) {
   ns1__searchDatasetByParameterLogical *_p =
-      soap_instantiate_ns1__searchDatasetByParameterLogical(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByParameterLogical(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByParameterLogical::sessionId = sessionId;
@@ -14995,15 +15103,15 @@ soap_instantiate_ns1__searchByUserIDPaginationResponse(struct soap *, int,
 
 inline ns1__searchByUserIDPaginationResponse *
 soap_new_ns1__searchByUserIDPaginationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchByUserIDPaginationResponse(soap, n, NULL,
-                                                                NULL, NULL);
+  return soap_instantiate_ns1__searchByUserIDPaginationResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchByUserIDPaginationResponse *
 soap_new_req_ns1__searchByUserIDPaginationResponse(struct soap *soap) {
   ns1__searchByUserIDPaginationResponse *_p =
-      soap_instantiate_ns1__searchByUserIDPaginationResponse(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate_ns1__searchByUserIDPaginationResponse(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -15015,8 +15123,8 @@ soap_new_set_ns1__searchByUserIDPaginationResponse(
     struct soap *soap, std::vector<ns1__investigation *> &return_,
     char *__item1) {
   ns1__searchByUserIDPaginationResponse *_p =
-      soap_instantiate_ns1__searchByUserIDPaginationResponse(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate_ns1__searchByUserIDPaginationResponse(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByUserIDPaginationResponse::return_ = return_;
@@ -15076,16 +15184,16 @@ soap_instantiate_ns1__searchByUserIDPagination(struct soap *, int, const char *,
 
 inline ns1__searchByUserIDPagination *
 soap_new_ns1__searchByUserIDPagination(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchByUserIDPagination(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate_ns1__searchByUserIDPagination(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline ns1__searchByUserIDPagination *
 soap_new_req_ns1__searchByUserIDPagination(struct soap *soap, int startIndex,
                                            int numberOfResults) {
   ns1__searchByUserIDPagination *_p =
-      soap_instantiate_ns1__searchByUserIDPagination(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__searchByUserIDPagination(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByUserIDPagination::startIndex = startIndex;
@@ -15101,8 +15209,8 @@ soap_new_set_ns1__searchByUserIDPagination(struct soap *soap,
                                            int startIndex, int numberOfResults,
                                            char *__item1) {
   ns1__searchByUserIDPagination *_p =
-      soap_instantiate_ns1__searchByUserIDPagination(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__searchByUserIDPagination(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByUserIDPagination::sessionId = sessionId;
@@ -15165,14 +15273,15 @@ soap_instantiate_ns1__searchByUserIDResponse(struct soap *, int, const char *,
 
 inline ns1__searchByUserIDResponse *
 soap_new_ns1__searchByUserIDResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchByUserIDResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__searchByUserIDResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__searchByUserIDResponse *
 soap_new_req_ns1__searchByUserIDResponse(struct soap *soap) {
   ns1__searchByUserIDResponse *_p =
-      soap_instantiate_ns1__searchByUserIDResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__searchByUserIDResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -15183,7 +15292,8 @@ inline ns1__searchByUserIDResponse *soap_new_set_ns1__searchByUserIDResponse(
     struct soap *soap, std::vector<ns1__investigation *> &return_,
     char *__item1) {
   ns1__searchByUserIDResponse *_p =
-      soap_instantiate_ns1__searchByUserIDResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__searchByUserIDResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByUserIDResponse::return_ = return_;
@@ -15240,13 +15350,14 @@ soap_instantiate_ns1__searchByUserID(struct soap *, int, const char *,
 
 inline ns1__searchByUserID *soap_new_ns1__searchByUserID(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__searchByUserID(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__searchByUserID(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__searchByUserID *
 soap_new_req_ns1__searchByUserID(struct soap *soap) {
   ns1__searchByUserID *_p =
-      soap_instantiate_ns1__searchByUserID(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__searchByUserID(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -15257,7 +15368,7 @@ inline ns1__searchByUserID *
 soap_new_set_ns1__searchByUserID(struct soap *soap, std::string *sessionId,
                                  std::string *userSearch, char *__item1) {
   ns1__searchByUserID *_p =
-      soap_instantiate_ns1__searchByUserID(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__searchByUserID(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByUserID::sessionId = sessionId;
@@ -15319,15 +15430,15 @@ soap_instantiate_ns1__modifyPublicationResponse(struct soap *, int,
 
 inline ns1__modifyPublicationResponse *
 soap_new_ns1__modifyPublicationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifyPublicationResponse(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__modifyPublicationResponse(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__modifyPublicationResponse *
 soap_new_req_ns1__modifyPublicationResponse(struct soap *soap) {
   ns1__modifyPublicationResponse *_p =
-      soap_instantiate_ns1__modifyPublicationResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__modifyPublicationResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -15337,8 +15448,8 @@ soap_new_req_ns1__modifyPublicationResponse(struct soap *soap) {
 inline ns1__modifyPublicationResponse *
 soap_new_set_ns1__modifyPublicationResponse(struct soap *soap, char *__item1) {
   ns1__modifyPublicationResponse *_p =
-      soap_instantiate_ns1__modifyPublicationResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__modifyPublicationResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -15394,13 +15505,14 @@ soap_instantiate_ns1__modifyPublication(struct soap *, int, const char *,
 
 inline ns1__modifyPublication *
 soap_new_ns1__modifyPublication(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifyPublication(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__modifyPublication(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__modifyPublication *
 soap_new_req_ns1__modifyPublication(struct soap *soap) {
-  ns1__modifyPublication *_p =
-      soap_instantiate_ns1__modifyPublication(soap, -1, NULL, NULL, NULL);
+  ns1__modifyPublication *_p = soap_instantiate_ns1__modifyPublication(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -15411,8 +15523,8 @@ inline ns1__modifyPublication *
 soap_new_set_ns1__modifyPublication(struct soap *soap, std::string *sessionId,
                                     ns1__publication *publication,
                                     char *__item1) {
-  ns1__modifyPublication *_p =
-      soap_instantiate_ns1__modifyPublication(soap, -1, NULL, NULL, NULL);
+  ns1__modifyPublication *_p = soap_instantiate_ns1__modifyPublication(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__modifyPublication::sessionId = sessionId;
@@ -15482,7 +15594,7 @@ inline ns1__searchInvestigationByParameterRestrictionResponse *
 soap_new_ns1__searchInvestigationByParameterRestrictionResponse(
     struct soap *soap, int n = -1) {
   return soap_instantiate_ns1__searchInvestigationByParameterRestrictionResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByParameterRestrictionResponse *
@@ -15490,7 +15602,7 @@ soap_new_req_ns1__searchInvestigationByParameterRestrictionResponse(
     struct soap *soap) {
   ns1__searchInvestigationByParameterRestrictionResponse *_p =
       soap_instantiate_ns1__searchInvestigationByParameterRestrictionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -15502,7 +15614,7 @@ soap_new_set_ns1__searchInvestigationByParameterRestrictionResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchInvestigationByParameterRestrictionResponse *_p =
       soap_instantiate_ns1__searchInvestigationByParameterRestrictionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByParameterRestrictionResponse::return_ =
@@ -15567,14 +15679,14 @@ inline ns1__searchInvestigationByParameterRestriction *
 soap_new_ns1__searchInvestigationByParameterRestriction(struct soap *soap,
                                                         int n = -1) {
   return soap_instantiate_ns1__searchInvestigationByParameterRestriction(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByParameterRestriction *
 soap_new_req_ns1__searchInvestigationByParameterRestriction(struct soap *soap) {
   ns1__searchInvestigationByParameterRestriction *_p =
       soap_instantiate_ns1__searchInvestigationByParameterRestriction(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -15588,7 +15700,7 @@ soap_new_set_ns1__searchInvestigationByParameterRestriction(
     ns1__restrictionCondition *restriction, char *__item1) {
   ns1__searchInvestigationByParameterRestriction *_p =
       soap_instantiate_ns1__searchInvestigationByParameterRestriction(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByParameterRestriction::sessionId = sessionId;
@@ -15656,14 +15768,14 @@ inline ns1__searchSampleByParameterConditionResponse *
 soap_new_ns1__searchSampleByParameterConditionResponse(struct soap *soap,
                                                        int n = -1) {
   return soap_instantiate_ns1__searchSampleByParameterConditionResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchSampleByParameterConditionResponse *
 soap_new_req_ns1__searchSampleByParameterConditionResponse(struct soap *soap) {
   ns1__searchSampleByParameterConditionResponse *_p =
       soap_instantiate_ns1__searchSampleByParameterConditionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -15675,7 +15787,7 @@ soap_new_set_ns1__searchSampleByParameterConditionResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchSampleByParameterConditionResponse *_p =
       soap_instantiate_ns1__searchSampleByParameterConditionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByParameterConditionResponse::return_ = return_;
@@ -15736,15 +15848,15 @@ soap_instantiate_ns1__searchSampleByParameterCondition(struct soap *, int,
 
 inline ns1__searchSampleByParameterCondition *
 soap_new_ns1__searchSampleByParameterCondition(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchSampleByParameterCondition(soap, n, NULL,
-                                                                NULL, NULL);
+  return soap_instantiate_ns1__searchSampleByParameterCondition(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchSampleByParameterCondition *
 soap_new_req_ns1__searchSampleByParameterCondition(struct soap *soap) {
   ns1__searchSampleByParameterCondition *_p =
-      soap_instantiate_ns1__searchSampleByParameterCondition(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate_ns1__searchSampleByParameterCondition(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -15756,8 +15868,8 @@ soap_new_set_ns1__searchSampleByParameterCondition(
     struct soap *soap, std::string *sessionId,
     ns1__parameterCondition *logicalCondition, char *__item1) {
   ns1__searchSampleByParameterCondition *_p =
-      soap_instantiate_ns1__searchSampleByParameterCondition(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate_ns1__searchSampleByParameterCondition(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByParameterCondition::sessionId = sessionId;
@@ -15819,15 +15931,15 @@ soap_instantiate_ns1__removeDataSetParameterResponse(struct soap *, int,
 
 inline ns1__removeDataSetParameterResponse *
 soap_new_ns1__removeDataSetParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeDataSetParameterResponse(soap, n, NULL,
-                                                              NULL, NULL);
+  return soap_instantiate_ns1__removeDataSetParameterResponse(soap, n, nullptr,
+                                                              nullptr, nullptr);
 }
 
 inline ns1__removeDataSetParameterResponse *
 soap_new_req_ns1__removeDataSetParameterResponse(struct soap *soap) {
   ns1__removeDataSetParameterResponse *_p =
-      soap_instantiate_ns1__removeDataSetParameterResponse(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__removeDataSetParameterResponse(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -15838,8 +15950,8 @@ inline ns1__removeDataSetParameterResponse *
 soap_new_set_ns1__removeDataSetParameterResponse(struct soap *soap,
                                                  char *__item1) {
   ns1__removeDataSetParameterResponse *_p =
-      soap_instantiate_ns1__removeDataSetParameterResponse(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__removeDataSetParameterResponse(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -15897,14 +16009,15 @@ soap_instantiate_ns1__removeDataSetParameter(struct soap *, int, const char *,
 
 inline ns1__removeDataSetParameter *
 soap_new_ns1__removeDataSetParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeDataSetParameter(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__removeDataSetParameter(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__removeDataSetParameter *
 soap_new_req_ns1__removeDataSetParameter(struct soap *soap) {
   ns1__removeDataSetParameter *_p =
-      soap_instantiate_ns1__removeDataSetParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__removeDataSetParameter(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -15915,7 +16028,8 @@ inline ns1__removeDataSetParameter *soap_new_set_ns1__removeDataSetParameter(
     struct soap *soap, std::string *sessionId,
     ns1__datasetParameterPK *datasetParameterPK, char *__item1) {
   ns1__removeDataSetParameter *_p =
-      soap_instantiate_ns1__removeDataSetParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__removeDataSetParameter(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__removeDataSetParameter::sessionId = sessionId;
@@ -15980,7 +16094,7 @@ inline ns1__searchSampleByParameterRestrictionResponse *
 soap_new_ns1__searchSampleByParameterRestrictionResponse(struct soap *soap,
                                                          int n = -1) {
   return soap_instantiate_ns1__searchSampleByParameterRestrictionResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchSampleByParameterRestrictionResponse *
@@ -15988,7 +16102,7 @@ soap_new_req_ns1__searchSampleByParameterRestrictionResponse(
     struct soap *soap) {
   ns1__searchSampleByParameterRestrictionResponse *_p =
       soap_instantiate_ns1__searchSampleByParameterRestrictionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -16000,7 +16114,7 @@ soap_new_set_ns1__searchSampleByParameterRestrictionResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchSampleByParameterRestrictionResponse *_p =
       soap_instantiate_ns1__searchSampleByParameterRestrictionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByParameterRestrictionResponse::return_ = return_;
@@ -16064,15 +16178,15 @@ soap_instantiate_ns1__searchSampleByParameterRestriction(struct soap *, int,
 inline ns1__searchSampleByParameterRestriction *
 soap_new_ns1__searchSampleByParameterRestriction(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate_ns1__searchSampleByParameterRestriction(soap, n, NULL,
-                                                                  NULL, NULL);
+  return soap_instantiate_ns1__searchSampleByParameterRestriction(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchSampleByParameterRestriction *
 soap_new_req_ns1__searchSampleByParameterRestriction(struct soap *soap) {
   ns1__searchSampleByParameterRestriction *_p =
-      soap_instantiate_ns1__searchSampleByParameterRestriction(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__searchSampleByParameterRestriction(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -16085,8 +16199,8 @@ soap_new_set_ns1__searchSampleByParameterRestriction(
     ns1__parameterCondition *parameterCondition,
     ns1__restrictionCondition *restrictions, char *__item1) {
   ns1__searchSampleByParameterRestriction *_p =
-      soap_instantiate_ns1__searchSampleByParameterRestriction(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__searchSampleByParameterRestriction(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByParameterRestriction::sessionId = sessionId;
@@ -16155,7 +16269,7 @@ inline ns1__getMyInvestigationsIncludesPaginationResponse *
 soap_new_ns1__getMyInvestigationsIncludesPaginationResponse(struct soap *soap,
                                                             int n = -1) {
   return soap_instantiate_ns1__getMyInvestigationsIncludesPaginationResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getMyInvestigationsIncludesPaginationResponse *
@@ -16163,7 +16277,7 @@ soap_new_req_ns1__getMyInvestigationsIncludesPaginationResponse(
     struct soap *soap) {
   ns1__getMyInvestigationsIncludesPaginationResponse *_p =
       soap_instantiate_ns1__getMyInvestigationsIncludesPaginationResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -16176,7 +16290,7 @@ soap_new_set_ns1__getMyInvestigationsIncludesPaginationResponse(
     char *__item1) {
   ns1__getMyInvestigationsIncludesPaginationResponse *_p =
       soap_instantiate_ns1__getMyInvestigationsIncludesPaginationResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getMyInvestigationsIncludesPaginationResponse::return_ = return_;
@@ -16240,7 +16354,7 @@ inline ns1__getMyInvestigationsIncludesPagination *
 soap_new_ns1__getMyInvestigationsIncludesPagination(struct soap *soap,
                                                     int n = -1) {
   return soap_instantiate_ns1__getMyInvestigationsIncludesPagination(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getMyInvestigationsIncludesPagination *
@@ -16249,7 +16363,7 @@ soap_new_req_ns1__getMyInvestigationsIncludesPagination(struct soap *soap,
                                                         int numberOfResults) {
   ns1__getMyInvestigationsIncludesPagination *_p =
       soap_instantiate_ns1__getMyInvestigationsIncludesPagination(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getMyInvestigationsIncludesPagination::startIndex = startIndex;
@@ -16266,7 +16380,7 @@ soap_new_set_ns1__getMyInvestigationsIncludesPagination(
     int numberOfResults, char *__item1) {
   ns1__getMyInvestigationsIncludesPagination *_p =
       soap_instantiate_ns1__getMyInvestigationsIncludesPagination(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getMyInvestigationsIncludesPagination::sessionId = sessionId;
@@ -16336,14 +16450,14 @@ inline ns1__getMyInvestigationsIncludesResponse *
 soap_new_ns1__getMyInvestigationsIncludesResponse(struct soap *soap,
                                                   int n = -1) {
   return soap_instantiate_ns1__getMyInvestigationsIncludesResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getMyInvestigationsIncludesResponse *
 soap_new_req_ns1__getMyInvestigationsIncludesResponse(struct soap *soap) {
   ns1__getMyInvestigationsIncludesResponse *_p =
-      soap_instantiate_ns1__getMyInvestigationsIncludesResponse(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate_ns1__getMyInvestigationsIncludesResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -16355,8 +16469,8 @@ soap_new_set_ns1__getMyInvestigationsIncludesResponse(
     struct soap *soap, std::vector<ns1__investigation *> &return_,
     char *__item1) {
   ns1__getMyInvestigationsIncludesResponse *_p =
-      soap_instantiate_ns1__getMyInvestigationsIncludesResponse(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate_ns1__getMyInvestigationsIncludesResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getMyInvestigationsIncludesResponse::return_ = return_;
@@ -16417,15 +16531,15 @@ soap_instantiate_ns1__getMyInvestigationsIncludes(struct soap *, int,
 
 inline ns1__getMyInvestigationsIncludes *
 soap_new_ns1__getMyInvestigationsIncludes(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getMyInvestigationsIncludes(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__getMyInvestigationsIncludes(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__getMyInvestigationsIncludes *
 soap_new_req_ns1__getMyInvestigationsIncludes(struct soap *soap) {
   ns1__getMyInvestigationsIncludes *_p =
-      soap_instantiate_ns1__getMyInvestigationsIncludes(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__getMyInvestigationsIncludes(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -16437,8 +16551,8 @@ soap_new_set_ns1__getMyInvestigationsIncludes(
     struct soap *soap, std::string *sessionId,
     enum ns1__investigationInclude *investigationInclude, char *__item1) {
   ns1__getMyInvestigationsIncludes *_p =
-      soap_instantiate_ns1__getMyInvestigationsIncludes(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__getMyInvestigationsIncludes(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getMyInvestigationsIncludes::sessionId = sessionId;
@@ -16500,15 +16614,15 @@ soap_instantiate_ns1__getMyInvestigationsResponse(struct soap *, int,
 
 inline ns1__getMyInvestigationsResponse *
 soap_new_ns1__getMyInvestigationsResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getMyInvestigationsResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__getMyInvestigationsResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__getMyInvestigationsResponse *
 soap_new_req_ns1__getMyInvestigationsResponse(struct soap *soap) {
   ns1__getMyInvestigationsResponse *_p =
-      soap_instantiate_ns1__getMyInvestigationsResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__getMyInvestigationsResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -16520,8 +16634,8 @@ soap_new_set_ns1__getMyInvestigationsResponse(
     struct soap *soap, std::vector<ns1__investigation *> &return_,
     char *__item1) {
   ns1__getMyInvestigationsResponse *_p =
-      soap_instantiate_ns1__getMyInvestigationsResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__getMyInvestigationsResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getMyInvestigationsResponse::return_ = return_;
@@ -16578,13 +16692,14 @@ soap_instantiate_ns1__getMyInvestigations(struct soap *, int, const char *,
 
 inline ns1__getMyInvestigations *
 soap_new_ns1__getMyInvestigations(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getMyInvestigations(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getMyInvestigations(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__getMyInvestigations *
 soap_new_req_ns1__getMyInvestigations(struct soap *soap) {
-  ns1__getMyInvestigations *_p =
-      soap_instantiate_ns1__getMyInvestigations(soap, -1, NULL, NULL, NULL);
+  ns1__getMyInvestigations *_p = soap_instantiate_ns1__getMyInvestigations(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -16594,8 +16709,8 @@ soap_new_req_ns1__getMyInvestigations(struct soap *soap) {
 inline ns1__getMyInvestigations *
 soap_new_set_ns1__getMyInvestigations(struct soap *soap, std::string *sessionId,
                                       char *__item1) {
-  ns1__getMyInvestigations *_p =
-      soap_instantiate_ns1__getMyInvestigations(soap, -1, NULL, NULL, NULL);
+  ns1__getMyInvestigations *_p = soap_instantiate_ns1__getMyInvestigations(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getMyInvestigations::sessionId = sessionId;
@@ -16658,7 +16773,7 @@ inline ns1__searchDatafileByRestrictionLogicalResponse *
 soap_new_ns1__searchDatafileByRestrictionLogicalResponse(struct soap *soap,
                                                          int n = -1) {
   return soap_instantiate_ns1__searchDatafileByRestrictionLogicalResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByRestrictionLogicalResponse *
@@ -16666,7 +16781,7 @@ soap_new_req_ns1__searchDatafileByRestrictionLogicalResponse(
     struct soap *soap) {
   ns1__searchDatafileByRestrictionLogicalResponse *_p =
       soap_instantiate_ns1__searchDatafileByRestrictionLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -16678,7 +16793,7 @@ soap_new_set_ns1__searchDatafileByRestrictionLogicalResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatafileByRestrictionLogicalResponse *_p =
       soap_instantiate_ns1__searchDatafileByRestrictionLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByRestrictionLogicalResponse::return_ = return_;
@@ -16742,15 +16857,15 @@ soap_instantiate_ns1__searchDatafileByRestrictionLogical(struct soap *, int,
 inline ns1__searchDatafileByRestrictionLogical *
 soap_new_ns1__searchDatafileByRestrictionLogical(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate_ns1__searchDatafileByRestrictionLogical(soap, n, NULL,
-                                                                  NULL, NULL);
+  return soap_instantiate_ns1__searchDatafileByRestrictionLogical(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByRestrictionLogical *
 soap_new_req_ns1__searchDatafileByRestrictionLogical(struct soap *soap) {
   ns1__searchDatafileByRestrictionLogical *_p =
-      soap_instantiate_ns1__searchDatafileByRestrictionLogical(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__searchDatafileByRestrictionLogical(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -16762,8 +16877,8 @@ soap_new_set_ns1__searchDatafileByRestrictionLogical(
     struct soap *soap, std::string *sessionId,
     ns1__restrictionLogicalCondition *restriction, char *__item1) {
   ns1__searchDatafileByRestrictionLogical *_p =
-      soap_instantiate_ns1__searchDatafileByRestrictionLogical(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__searchDatafileByRestrictionLogical(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByRestrictionLogical::sessionId = sessionId;
@@ -16826,15 +16941,15 @@ soap_instantiate_ns1__getAllInstrumentsResponse(struct soap *, int,
 
 inline ns1__getAllInstrumentsResponse *
 soap_new_ns1__getAllInstrumentsResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getAllInstrumentsResponse(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__getAllInstrumentsResponse(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__getAllInstrumentsResponse *
 soap_new_req_ns1__getAllInstrumentsResponse(struct soap *soap) {
   ns1__getAllInstrumentsResponse *_p =
-      soap_instantiate_ns1__getAllInstrumentsResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__getAllInstrumentsResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -16845,8 +16960,8 @@ inline ns1__getAllInstrumentsResponse *
 soap_new_set_ns1__getAllInstrumentsResponse(
     struct soap *soap, std::vector<ns1__instrument *> &return_, char *__item1) {
   ns1__getAllInstrumentsResponse *_p =
-      soap_instantiate_ns1__getAllInstrumentsResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__getAllInstrumentsResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getAllInstrumentsResponse::return_ = return_;
@@ -16903,13 +17018,14 @@ soap_instantiate_ns1__getAllInstruments(struct soap *, int, const char *,
 
 inline ns1__getAllInstruments *
 soap_new_ns1__getAllInstruments(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getAllInstruments(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getAllInstruments(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__getAllInstruments *
 soap_new_req_ns1__getAllInstruments(struct soap *soap) {
-  ns1__getAllInstruments *_p =
-      soap_instantiate_ns1__getAllInstruments(soap, -1, NULL, NULL, NULL);
+  ns1__getAllInstruments *_p = soap_instantiate_ns1__getAllInstruments(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -16919,8 +17035,8 @@ soap_new_req_ns1__getAllInstruments(struct soap *soap) {
 inline ns1__getAllInstruments *
 soap_new_set_ns1__getAllInstruments(struct soap *soap, std::string *sessionId,
                                     char *__item1) {
-  ns1__getAllInstruments *_p =
-      soap_instantiate_ns1__getAllInstruments(soap, -1, NULL, NULL, NULL);
+  ns1__getAllInstruments *_p = soap_instantiate_ns1__getAllInstruments(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getAllInstruments::sessionId = sessionId;
@@ -16980,15 +17096,15 @@ soap_instantiate_ns1__searchByKeywordsAllResponse(struct soap *, int,
 
 inline ns1__searchByKeywordsAllResponse *
 soap_new_ns1__searchByKeywordsAllResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchByKeywordsAllResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__searchByKeywordsAllResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__searchByKeywordsAllResponse *
 soap_new_req_ns1__searchByKeywordsAllResponse(struct soap *soap) {
   ns1__searchByKeywordsAllResponse *_p =
-      soap_instantiate_ns1__searchByKeywordsAllResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__searchByKeywordsAllResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -17000,8 +17116,8 @@ soap_new_set_ns1__searchByKeywordsAllResponse(
     struct soap *soap, std::vector<ns1__investigation *> &return_,
     char *__item1) {
   ns1__searchByKeywordsAllResponse *_p =
-      soap_instantiate_ns1__searchByKeywordsAllResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__searchByKeywordsAllResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByKeywordsAllResponse::return_ = return_;
@@ -17057,13 +17173,14 @@ soap_instantiate_ns1__keywordDetails(struct soap *, int, const char *,
 
 inline ns1__keywordDetails *soap_new_ns1__keywordDetails(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__keywordDetails(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__keywordDetails(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__keywordDetails *
 soap_new_req_ns1__keywordDetails(struct soap *soap, bool caseSensitive) {
   ns1__keywordDetails *_p =
-      soap_instantiate_ns1__keywordDetails(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__keywordDetails(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__keywordDetails::caseSensitive = caseSensitive;
@@ -17076,7 +17193,7 @@ inline ns1__keywordDetails *soap_new_set_ns1__keywordDetails(
     enum ns1__investigationInclude *investigationInclude,
     std::vector<std::string> &keywords, char *__item1) {
   ns1__keywordDetails *_p =
-      soap_instantiate_ns1__keywordDetails(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__keywordDetails(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__keywordDetails::caseSensitive = caseSensitive;
@@ -17135,14 +17252,15 @@ soap_instantiate_ns1__searchByKeywordsAll(struct soap *, int, const char *,
 
 inline ns1__searchByKeywordsAll *
 soap_new_ns1__searchByKeywordsAll(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchByKeywordsAll(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__searchByKeywordsAll(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__searchByKeywordsAll *
 soap_new_req_ns1__searchByKeywordsAll(struct soap *soap, int startIndex,
                                       int numberOfResults) {
-  ns1__searchByKeywordsAll *_p =
-      soap_instantiate_ns1__searchByKeywordsAll(soap, -1, NULL, NULL, NULL);
+  ns1__searchByKeywordsAll *_p = soap_instantiate_ns1__searchByKeywordsAll(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByKeywordsAll::startIndex = startIndex;
@@ -17156,8 +17274,8 @@ soap_new_set_ns1__searchByKeywordsAll(struct soap *soap, std::string *sessionId,
                                       ns1__keywordDetails *keywordDetails,
                                       int startIndex, int numberOfResults,
                                       char *__item1) {
-  ns1__searchByKeywordsAll *_p =
-      soap_instantiate_ns1__searchByKeywordsAll(soap, -1, NULL, NULL, NULL);
+  ns1__searchByKeywordsAll *_p = soap_instantiate_ns1__searchByKeywordsAll(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByKeywordsAll::sessionId = sessionId;
@@ -17220,15 +17338,15 @@ soap_instantiate_ns1__searchByKeywordsResponse(struct soap *, int, const char *,
 
 inline ns1__searchByKeywordsResponse *
 soap_new_ns1__searchByKeywordsResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchByKeywordsResponse(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate_ns1__searchByKeywordsResponse(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline ns1__searchByKeywordsResponse *
 soap_new_req_ns1__searchByKeywordsResponse(struct soap *soap) {
   ns1__searchByKeywordsResponse *_p =
-      soap_instantiate_ns1__searchByKeywordsResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__searchByKeywordsResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -17240,8 +17358,8 @@ soap_new_set_ns1__searchByKeywordsResponse(
     struct soap *soap, std::vector<ns1__investigation *> &return_,
     char *__item1) {
   ns1__searchByKeywordsResponse *_p =
-      soap_instantiate_ns1__searchByKeywordsResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__searchByKeywordsResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByKeywordsResponse::return_ = return_;
@@ -17298,13 +17416,14 @@ soap_instantiate_ns1__searchByKeywords(struct soap *, int, const char *,
 
 inline ns1__searchByKeywords *soap_new_ns1__searchByKeywords(struct soap *soap,
                                                              int n = -1) {
-  return soap_instantiate_ns1__searchByKeywords(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__searchByKeywords(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline ns1__searchByKeywords *
 soap_new_req_ns1__searchByKeywords(struct soap *soap) {
-  ns1__searchByKeywords *_p =
-      soap_instantiate_ns1__searchByKeywords(soap, -1, NULL, NULL, NULL);
+  ns1__searchByKeywords *_p = soap_instantiate_ns1__searchByKeywords(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -17315,8 +17434,8 @@ inline ns1__searchByKeywords *
 soap_new_set_ns1__searchByKeywords(struct soap *soap, std::string *sessionId,
                                    std::vector<std::string> &keywords,
                                    char *__item1) {
-  ns1__searchByKeywords *_p =
-      soap_instantiate_ns1__searchByKeywords(soap, -1, NULL, NULL, NULL);
+  ns1__searchByKeywords *_p = soap_instantiate_ns1__searchByKeywords(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByKeywords::sessionId = sessionId;
@@ -17380,15 +17499,15 @@ soap_instantiate_ns1__checkDatasetDownloadAccessResponse(struct soap *, int,
 inline ns1__checkDatasetDownloadAccessResponse *
 soap_new_ns1__checkDatasetDownloadAccessResponse(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate_ns1__checkDatasetDownloadAccessResponse(soap, n, NULL,
-                                                                  NULL, NULL);
+  return soap_instantiate_ns1__checkDatasetDownloadAccessResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__checkDatasetDownloadAccessResponse *
 soap_new_req_ns1__checkDatasetDownloadAccessResponse(struct soap *soap) {
   ns1__checkDatasetDownloadAccessResponse *_p =
-      soap_instantiate_ns1__checkDatasetDownloadAccessResponse(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__checkDatasetDownloadAccessResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -17399,8 +17518,8 @@ inline ns1__checkDatasetDownloadAccessResponse *
 soap_new_set_ns1__checkDatasetDownloadAccessResponse(
     struct soap *soap, ns1__downloadInfo *downloadInfo, char *__item1) {
   ns1__checkDatasetDownloadAccessResponse *_p =
-      soap_instantiate_ns1__checkDatasetDownloadAccessResponse(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__checkDatasetDownloadAccessResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__checkDatasetDownloadAccessResponse::downloadInfo = downloadInfo;
@@ -17461,15 +17580,15 @@ soap_instantiate_ns1__checkDatasetDownloadAccess(struct soap *, int,
 
 inline ns1__checkDatasetDownloadAccess *
 soap_new_ns1__checkDatasetDownloadAccess(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__checkDatasetDownloadAccess(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate_ns1__checkDatasetDownloadAccess(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline ns1__checkDatasetDownloadAccess *
 soap_new_req_ns1__checkDatasetDownloadAccess(struct soap *soap) {
   ns1__checkDatasetDownloadAccess *_p =
-      soap_instantiate_ns1__checkDatasetDownloadAccess(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__checkDatasetDownloadAccess(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -17481,8 +17600,8 @@ soap_new_set_ns1__checkDatasetDownloadAccess(struct soap *soap,
                                              std::string *sessionId,
                                              LONG64 *datasetId, char *__item1) {
   ns1__checkDatasetDownloadAccess *_p =
-      soap_instantiate_ns1__checkDatasetDownloadAccess(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__checkDatasetDownloadAccess(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__checkDatasetDownloadAccess::sessionId = sessionId;
@@ -17546,7 +17665,7 @@ inline ns1__searchDatafileByParameterConditionResponse *
 soap_new_ns1__searchDatafileByParameterConditionResponse(struct soap *soap,
                                                          int n = -1) {
   return soap_instantiate_ns1__searchDatafileByParameterConditionResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByParameterConditionResponse *
@@ -17554,7 +17673,7 @@ soap_new_req_ns1__searchDatafileByParameterConditionResponse(
     struct soap *soap) {
   ns1__searchDatafileByParameterConditionResponse *_p =
       soap_instantiate_ns1__searchDatafileByParameterConditionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -17566,7 +17685,7 @@ soap_new_set_ns1__searchDatafileByParameterConditionResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatafileByParameterConditionResponse *_p =
       soap_instantiate_ns1__searchDatafileByParameterConditionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByParameterConditionResponse::return_ = return_;
@@ -17630,15 +17749,15 @@ soap_instantiate_ns1__searchDatafileByParameterCondition(struct soap *, int,
 inline ns1__searchDatafileByParameterCondition *
 soap_new_ns1__searchDatafileByParameterCondition(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate_ns1__searchDatafileByParameterCondition(soap, n, NULL,
-                                                                  NULL, NULL);
+  return soap_instantiate_ns1__searchDatafileByParameterCondition(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByParameterCondition *
 soap_new_req_ns1__searchDatafileByParameterCondition(struct soap *soap) {
   ns1__searchDatafileByParameterCondition *_p =
-      soap_instantiate_ns1__searchDatafileByParameterCondition(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__searchDatafileByParameterCondition(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -17650,8 +17769,8 @@ soap_new_set_ns1__searchDatafileByParameterCondition(
     struct soap *soap, std::string *sessionId,
     ns1__parameterCondition *logicalCondition, char *__item1) {
   ns1__searchDatafileByParameterCondition *_p =
-      soap_instantiate_ns1__searchDatafileByParameterCondition(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__searchDatafileByParameterCondition(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByParameterCondition::sessionId = sessionId;
@@ -17718,14 +17837,14 @@ inline ns1__searchByUserSurnamePaginationResponse *
 soap_new_ns1__searchByUserSurnamePaginationResponse(struct soap *soap,
                                                     int n = -1) {
   return soap_instantiate_ns1__searchByUserSurnamePaginationResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchByUserSurnamePaginationResponse *
 soap_new_req_ns1__searchByUserSurnamePaginationResponse(struct soap *soap) {
   ns1__searchByUserSurnamePaginationResponse *_p =
       soap_instantiate_ns1__searchByUserSurnamePaginationResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -17738,7 +17857,7 @@ soap_new_set_ns1__searchByUserSurnamePaginationResponse(
     char *__item1) {
   ns1__searchByUserSurnamePaginationResponse *_p =
       soap_instantiate_ns1__searchByUserSurnamePaginationResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByUserSurnamePaginationResponse::return_ = return_;
@@ -17799,8 +17918,8 @@ soap_instantiate_ns1__searchByUserSurnamePagination(struct soap *, int,
 
 inline ns1__searchByUserSurnamePagination *
 soap_new_ns1__searchByUserSurnamePagination(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchByUserSurnamePagination(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate_ns1__searchByUserSurnamePagination(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline ns1__searchByUserSurnamePagination *
@@ -17808,8 +17927,8 @@ soap_new_req_ns1__searchByUserSurnamePagination(struct soap *soap,
                                                 int startIndex,
                                                 int numberOfResults) {
   ns1__searchByUserSurnamePagination *_p =
-      soap_instantiate_ns1__searchByUserSurnamePagination(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate_ns1__searchByUserSurnamePagination(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByUserSurnamePagination::startIndex = startIndex;
@@ -17823,8 +17942,8 @@ soap_new_set_ns1__searchByUserSurnamePagination(
     struct soap *soap, std::string *sessionId, std::string *surname,
     int startIndex, int numberOfResults, char *__item1) {
   ns1__searchByUserSurnamePagination *_p =
-      soap_instantiate_ns1__searchByUserSurnamePagination(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate_ns1__searchByUserSurnamePagination(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByUserSurnamePagination::sessionId = sessionId;
@@ -17880,11 +17999,12 @@ soap_instantiate_ns1__shiftPK(struct soap *, int, const char *, const char *,
                               size_t *);
 
 inline ns1__shiftPK *soap_new_ns1__shiftPK(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__shiftPK(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__shiftPK(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__shiftPK *soap_new_req_ns1__shiftPK(struct soap *soap) {
-  ns1__shiftPK *_p = soap_instantiate_ns1__shiftPK(soap, -1, NULL, NULL, NULL);
+  ns1__shiftPK *_p =
+      soap_instantiate_ns1__shiftPK(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -17896,7 +18016,8 @@ inline ns1__shiftPK *soap_new_set_ns1__shiftPK(struct soap *soap,
                                                LONG64 *investigationId,
                                                time_t *startDate,
                                                char *__item2) {
-  ns1__shiftPK *_p = soap_instantiate_ns1__shiftPK(soap, -1, NULL, NULL, NULL);
+  ns1__shiftPK *_p =
+      soap_instantiate_ns1__shiftPK(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__shiftPK::endDate = endDate;
@@ -17948,13 +18069,14 @@ soap_instantiate_ns1__shift(struct soap *, int, const char *, const char *,
                             size_t *);
 
 inline ns1__shift *soap_new_ns1__shift(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__shift(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__shift(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__shift *soap_new_req_ns1__shift(struct soap *soap,
                                            bool facilityAcquiredData1,
                                            bool selected1) {
-  ns1__shift *_p = soap_instantiate_ns1__shift(soap, -1, NULL, NULL, NULL);
+  ns1__shift *_p =
+      soap_instantiate_ns1__shift(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -17968,7 +18090,8 @@ soap_new_set_ns1__shift(struct soap *soap, std::string *shiftComment,
                         ns1__shiftPK *shiftPK, bool facilityAcquiredData1,
                         ns1__icatRole *icatRole1, bool selected1,
                         std::string *uniqueId1, char *__item2) {
-  ns1__shift *_p = soap_instantiate_ns1__shift(soap, -1, NULL, NULL, NULL);
+  ns1__shift *_p =
+      soap_instantiate_ns1__shift(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__shift::shiftComment = shiftComment;
@@ -18026,14 +18149,14 @@ soap_instantiate_ns1__publication(struct soap *, int, const char *,
 
 inline ns1__publication *soap_new_ns1__publication(struct soap *soap,
                                                    int n = -1) {
-  return soap_instantiate_ns1__publication(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__publication(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__publication *
 soap_new_req_ns1__publication(struct soap *soap, bool facilityAcquiredData1,
                               bool selected1) {
   ns1__publication *_p =
-      soap_instantiate_ns1__publication(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__publication(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -18048,7 +18171,7 @@ inline ns1__publication *soap_new_set_ns1__publication(
     bool facilityAcquiredData1, ns1__icatRole *icatRole1, bool selected1,
     std::string *uniqueId1, char *__item2) {
   ns1__publication *_p =
-      soap_instantiate_ns1__publication(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__publication(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__publication::fullReference = fullReference;
@@ -18109,13 +18232,14 @@ soap_instantiate_ns1__keyword(struct soap *, int, const char *, const char *,
                               size_t *);
 
 inline ns1__keyword *soap_new_ns1__keyword(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__keyword(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__keyword(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__keyword *soap_new_req_ns1__keyword(struct soap *soap,
                                                bool facilityAcquiredData1,
                                                bool selected1) {
-  ns1__keyword *_p = soap_instantiate_ns1__keyword(soap, -1, NULL, NULL, NULL);
+  ns1__keyword *_p =
+      soap_instantiate_ns1__keyword(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -18129,7 +18253,8 @@ soap_new_set_ns1__keyword(struct soap *soap, ns1__keywordPK *keywordPK,
                           bool facilityAcquiredData1, ns1__icatRole *icatRole1,
                           bool selected1, std::string *uniqueId1,
                           char *__item2) {
-  ns1__keyword *_p = soap_instantiate_ns1__keyword(soap, -1, NULL, NULL, NULL);
+  ns1__keyword *_p =
+      soap_instantiate_ns1__keyword(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__keyword::keywordPK = keywordPK;
@@ -18188,14 +18313,14 @@ soap_instantiate_ns1__investigator(struct soap *, int, const char *,
 
 inline ns1__investigator *soap_new_ns1__investigator(struct soap *soap,
                                                      int n = -1) {
-  return soap_instantiate_ns1__investigator(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__investigator(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__investigator *
 soap_new_req_ns1__investigator(struct soap *soap, bool facilityAcquiredData1,
                                bool selected1) {
   ns1__investigator *_p =
-      soap_instantiate_ns1__investigator(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__investigator(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -18210,7 +18335,7 @@ inline ns1__investigator *soap_new_set_ns1__investigator(
     bool facilityAcquiredData1, ns1__icatRole *icatRole1, bool selected1,
     std::string *uniqueId1, char *__item2) {
   ns1__investigator *_p =
-      soap_instantiate_ns1__investigator(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__investigator(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__investigator::ns1__facilityUser_ = ns1__facilityUser_;
@@ -18272,14 +18397,15 @@ soap_instantiate_ns1__investigation(struct soap *, int, const char *,
 
 inline ns1__investigation *soap_new_ns1__investigation(struct soap *soap,
                                                        int n = -1) {
-  return soap_instantiate_ns1__investigation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__investigation(soap, n, nullptr, nullptr,
+                                             nullptr);
 }
 
 inline ns1__investigation *
 soap_new_req_ns1__investigation(struct soap *soap, bool facilityAcquiredData1,
                                 bool selected1) {
   ns1__investigation *_p =
-      soap_instantiate_ns1__investigation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__investigation(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -18303,7 +18429,7 @@ inline ns1__investigation *soap_new_set_ns1__investigation(
     std::string *visitId, bool facilityAcquiredData1, ns1__icatRole *icatRole1,
     bool selected1, std::string *uniqueId1, char *__item2) {
   ns1__investigation *_p =
-      soap_instantiate_ns1__investigation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__investigation(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__investigation::bcatInvStr = bcatInvStr;
@@ -18389,15 +18515,15 @@ soap_instantiate_ns1__searchByUserSurnameResponse(struct soap *, int,
 
 inline ns1__searchByUserSurnameResponse *
 soap_new_ns1__searchByUserSurnameResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchByUserSurnameResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__searchByUserSurnameResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__searchByUserSurnameResponse *
 soap_new_req_ns1__searchByUserSurnameResponse(struct soap *soap) {
   ns1__searchByUserSurnameResponse *_p =
-      soap_instantiate_ns1__searchByUserSurnameResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__searchByUserSurnameResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -18409,8 +18535,8 @@ soap_new_set_ns1__searchByUserSurnameResponse(
     struct soap *soap, std::vector<ns1__investigation *> &return_,
     char *__item1) {
   ns1__searchByUserSurnameResponse *_p =
-      soap_instantiate_ns1__searchByUserSurnameResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__searchByUserSurnameResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByUserSurnameResponse::return_ = return_;
@@ -18467,13 +18593,14 @@ soap_instantiate_ns1__searchByUserSurname(struct soap *, int, const char *,
 
 inline ns1__searchByUserSurname *
 soap_new_ns1__searchByUserSurname(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchByUserSurname(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__searchByUserSurname(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__searchByUserSurname *
 soap_new_req_ns1__searchByUserSurname(struct soap *soap) {
-  ns1__searchByUserSurname *_p =
-      soap_instantiate_ns1__searchByUserSurname(soap, -1, NULL, NULL, NULL);
+  ns1__searchByUserSurname *_p = soap_instantiate_ns1__searchByUserSurname(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -18483,8 +18610,8 @@ soap_new_req_ns1__searchByUserSurname(struct soap *soap) {
 inline ns1__searchByUserSurname *
 soap_new_set_ns1__searchByUserSurname(struct soap *soap, std::string *sessionId,
                                       std::string *surname, char *__item1) {
-  ns1__searchByUserSurname *_p =
-      soap_instantiate_ns1__searchByUserSurname(soap, -1, NULL, NULL, NULL);
+  ns1__searchByUserSurname *_p = soap_instantiate_ns1__searchByUserSurname(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchByUserSurname::sessionId = sessionId;
@@ -18544,14 +18671,15 @@ soap_instantiate_ns1__deleteDataFileResponse(struct soap *, int, const char *,
 
 inline ns1__deleteDataFileResponse *
 soap_new_ns1__deleteDataFileResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteDataFileResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__deleteDataFileResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__deleteDataFileResponse *
 soap_new_req_ns1__deleteDataFileResponse(struct soap *soap) {
   ns1__deleteDataFileResponse *_p =
-      soap_instantiate_ns1__deleteDataFileResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__deleteDataFileResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -18561,7 +18689,8 @@ soap_new_req_ns1__deleteDataFileResponse(struct soap *soap) {
 inline ns1__deleteDataFileResponse *
 soap_new_set_ns1__deleteDataFileResponse(struct soap *soap, char *__item1) {
   ns1__deleteDataFileResponse *_p =
-      soap_instantiate_ns1__deleteDataFileResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__deleteDataFileResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -18617,13 +18746,14 @@ soap_instantiate_ns1__deleteDataFile(struct soap *, int, const char *,
 
 inline ns1__deleteDataFile *soap_new_ns1__deleteDataFile(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__deleteDataFile(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__deleteDataFile(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__deleteDataFile *
 soap_new_req_ns1__deleteDataFile(struct soap *soap) {
   ns1__deleteDataFile *_p =
-      soap_instantiate_ns1__deleteDataFile(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__deleteDataFile(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -18634,7 +18764,7 @@ inline ns1__deleteDataFile *
 soap_new_set_ns1__deleteDataFile(struct soap *soap, std::string *sessionId,
                                  LONG64 *datafileId, char *__item1) {
   ns1__deleteDataFile *_p =
-      soap_instantiate_ns1__deleteDataFile(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__deleteDataFile(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__deleteDataFile::sessionId = sessionId;
@@ -18691,12 +18821,12 @@ soap_instantiate_ns1__downloadInfo(struct soap *, int, const char *,
 
 inline ns1__downloadInfo *soap_new_ns1__downloadInfo(struct soap *soap,
                                                      int n = -1) {
-  return soap_instantiate_ns1__downloadInfo(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__downloadInfo(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__downloadInfo *soap_new_req_ns1__downloadInfo(struct soap *soap) {
   ns1__downloadInfo *_p =
-      soap_instantiate_ns1__downloadInfo(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__downloadInfo(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -18709,7 +18839,7 @@ soap_new_set_ns1__downloadInfo(struct soap *soap, std::string *credential,
                                std::vector<xsd__anyType *> &datafileNames,
                                std::string *userId, char *__item1) {
   ns1__downloadInfo *_p =
-      soap_instantiate_ns1__downloadInfo(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__downloadInfo(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__downloadInfo::credential = credential;
@@ -18776,14 +18906,14 @@ inline ns1__checkDatafileDownloadAccessResponse *
 soap_new_ns1__checkDatafileDownloadAccessResponse(struct soap *soap,
                                                   int n = -1) {
   return soap_instantiate_ns1__checkDatafileDownloadAccessResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__checkDatafileDownloadAccessResponse *
 soap_new_req_ns1__checkDatafileDownloadAccessResponse(struct soap *soap) {
   ns1__checkDatafileDownloadAccessResponse *_p =
-      soap_instantiate_ns1__checkDatafileDownloadAccessResponse(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate_ns1__checkDatafileDownloadAccessResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -18794,8 +18924,8 @@ inline ns1__checkDatafileDownloadAccessResponse *
 soap_new_set_ns1__checkDatafileDownloadAccessResponse(
     struct soap *soap, ns1__downloadInfo *downloadInfo, char *__item1) {
   ns1__checkDatafileDownloadAccessResponse *_p =
-      soap_instantiate_ns1__checkDatafileDownloadAccessResponse(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate_ns1__checkDatafileDownloadAccessResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__checkDatafileDownloadAccessResponse::downloadInfo = downloadInfo;
@@ -18856,15 +18986,15 @@ soap_instantiate_ns1__checkDatafileDownloadAccess(struct soap *, int,
 
 inline ns1__checkDatafileDownloadAccess *
 soap_new_ns1__checkDatafileDownloadAccess(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__checkDatafileDownloadAccess(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__checkDatafileDownloadAccess(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__checkDatafileDownloadAccess *
 soap_new_req_ns1__checkDatafileDownloadAccess(struct soap *soap) {
   ns1__checkDatafileDownloadAccess *_p =
-      soap_instantiate_ns1__checkDatafileDownloadAccess(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__checkDatafileDownloadAccess(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -18877,8 +19007,8 @@ soap_new_set_ns1__checkDatafileDownloadAccess(struct soap *soap,
                                               std::vector<LONG64> &datafileIds,
                                               char *__item1) {
   ns1__checkDatafileDownloadAccess *_p =
-      soap_instantiate_ns1__checkDatafileDownloadAccess(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__checkDatafileDownloadAccess(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__checkDatafileDownloadAccess::sessionId = sessionId;
@@ -18943,14 +19073,14 @@ inline ns1__getFacilityUserByFacilityUserIdResponse *
 soap_new_ns1__getFacilityUserByFacilityUserIdResponse(struct soap *soap,
                                                       int n = -1) {
   return soap_instantiate_ns1__getFacilityUserByFacilityUserIdResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getFacilityUserByFacilityUserIdResponse *
 soap_new_req_ns1__getFacilityUserByFacilityUserIdResponse(struct soap *soap) {
   ns1__getFacilityUserByFacilityUserIdResponse *_p =
       soap_instantiate_ns1__getFacilityUserByFacilityUserIdResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -18962,7 +19092,7 @@ soap_new_set_ns1__getFacilityUserByFacilityUserIdResponse(
     struct soap *soap, ns1__facilityUser *return_, char *__item1) {
   ns1__getFacilityUserByFacilityUserIdResponse *_p =
       soap_instantiate_ns1__getFacilityUserByFacilityUserIdResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getFacilityUserByFacilityUserIdResponse::return_ = return_;
@@ -19023,15 +19153,15 @@ soap_instantiate_ns1__getFacilityUserByFacilityUserId(struct soap *, int,
 
 inline ns1__getFacilityUserByFacilityUserId *
 soap_new_ns1__getFacilityUserByFacilityUserId(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getFacilityUserByFacilityUserId(soap, n, NULL,
-                                                               NULL, NULL);
+  return soap_instantiate_ns1__getFacilityUserByFacilityUserId(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getFacilityUserByFacilityUserId *
 soap_new_req_ns1__getFacilityUserByFacilityUserId(struct soap *soap) {
   ns1__getFacilityUserByFacilityUserId *_p =
-      soap_instantiate_ns1__getFacilityUserByFacilityUserId(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__getFacilityUserByFacilityUserId(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -19044,8 +19174,8 @@ soap_new_set_ns1__getFacilityUserByFacilityUserId(struct soap *soap,
                                                   std::string *facilityUserId,
                                                   char *__item1) {
   ns1__getFacilityUserByFacilityUserId *_p =
-      soap_instantiate_ns1__getFacilityUserByFacilityUserId(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__getFacilityUserByFacilityUserId(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getFacilityUserByFacilityUserId::sessionId = sessionId;
@@ -19113,7 +19243,7 @@ inline ns1__getFacilityCyclesWithDataForInstrumentResponse *
 soap_new_ns1__getFacilityCyclesWithDataForInstrumentResponse(struct soap *soap,
                                                              int n = -1) {
   return soap_instantiate_ns1__getFacilityCyclesWithDataForInstrumentResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getFacilityCyclesWithDataForInstrumentResponse *
@@ -19121,7 +19251,7 @@ soap_new_req_ns1__getFacilityCyclesWithDataForInstrumentResponse(
     struct soap *soap) {
   ns1__getFacilityCyclesWithDataForInstrumentResponse *_p =
       soap_instantiate_ns1__getFacilityCyclesWithDataForInstrumentResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -19134,7 +19264,7 @@ soap_new_set_ns1__getFacilityCyclesWithDataForInstrumentResponse(
     char *__item1) {
   ns1__getFacilityCyclesWithDataForInstrumentResponse *_p =
       soap_instantiate_ns1__getFacilityCyclesWithDataForInstrumentResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getFacilityCyclesWithDataForInstrumentResponse::return_ = return_;
@@ -19198,14 +19328,14 @@ inline ns1__getFacilityCyclesWithDataForInstrument *
 soap_new_ns1__getFacilityCyclesWithDataForInstrument(struct soap *soap,
                                                      int n = -1) {
   return soap_instantiate_ns1__getFacilityCyclesWithDataForInstrument(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getFacilityCyclesWithDataForInstrument *
 soap_new_req_ns1__getFacilityCyclesWithDataForInstrument(struct soap *soap) {
   ns1__getFacilityCyclesWithDataForInstrument *_p =
       soap_instantiate_ns1__getFacilityCyclesWithDataForInstrument(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -19218,7 +19348,7 @@ soap_new_set_ns1__getFacilityCyclesWithDataForInstrument(
     char *__item1) {
   ns1__getFacilityCyclesWithDataForInstrument *_p =
       soap_instantiate_ns1__getFacilityCyclesWithDataForInstrument(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getFacilityCyclesWithDataForInstrument::sessionId = sessionId;
@@ -19280,15 +19410,15 @@ soap_instantiate_ns1__addSampleParameterResponse(struct soap *, int,
 
 inline ns1__addSampleParameterResponse *
 soap_new_ns1__addSampleParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addSampleParameterResponse(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate_ns1__addSampleParameterResponse(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline ns1__addSampleParameterResponse *
 soap_new_req_ns1__addSampleParameterResponse(struct soap *soap) {
   ns1__addSampleParameterResponse *_p =
-      soap_instantiate_ns1__addSampleParameterResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__addSampleParameterResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -19300,8 +19430,8 @@ soap_new_set_ns1__addSampleParameterResponse(struct soap *soap,
                                              ns1__sampleParameter *return_,
                                              char *__item1) {
   ns1__addSampleParameterResponse *_p =
-      soap_instantiate_ns1__addSampleParameterResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__addSampleParameterResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addSampleParameterResponse::return_ = return_;
@@ -19357,13 +19487,14 @@ soap_instantiate_ns1__addSampleParameter(struct soap *, int, const char *,
 
 inline ns1__addSampleParameter *
 soap_new_ns1__addSampleParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addSampleParameter(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__addSampleParameter(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline ns1__addSampleParameter *
 soap_new_req_ns1__addSampleParameter(struct soap *soap) {
-  ns1__addSampleParameter *_p =
-      soap_instantiate_ns1__addSampleParameter(soap, -1, NULL, NULL, NULL);
+  ns1__addSampleParameter *_p = soap_instantiate_ns1__addSampleParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -19374,8 +19505,8 @@ inline ns1__addSampleParameter *
 soap_new_set_ns1__addSampleParameter(struct soap *soap, std::string *sessionId,
                                      ns1__sampleParameter *sampleParameter,
                                      LONG64 *investigationId, char *__item1) {
-  ns1__addSampleParameter *_p =
-      soap_instantiate_ns1__addSampleParameter(soap, -1, NULL, NULL, NULL);
+  ns1__addSampleParameter *_p = soap_instantiate_ns1__addSampleParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addSampleParameter::sessionId = sessionId;
@@ -19434,13 +19565,14 @@ soap_instantiate_ns1__modifyDataSetResponse(struct soap *, int, const char *,
 
 inline ns1__modifyDataSetResponse *
 soap_new_ns1__modifyDataSetResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifyDataSetResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__modifyDataSetResponse(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline ns1__modifyDataSetResponse *
 soap_new_req_ns1__modifyDataSetResponse(struct soap *soap) {
-  ns1__modifyDataSetResponse *_p =
-      soap_instantiate_ns1__modifyDataSetResponse(soap, -1, NULL, NULL, NULL);
+  ns1__modifyDataSetResponse *_p = soap_instantiate_ns1__modifyDataSetResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -19449,8 +19581,8 @@ soap_new_req_ns1__modifyDataSetResponse(struct soap *soap) {
 
 inline ns1__modifyDataSetResponse *
 soap_new_set_ns1__modifyDataSetResponse(struct soap *soap, char *__item1) {
-  ns1__modifyDataSetResponse *_p =
-      soap_instantiate_ns1__modifyDataSetResponse(soap, -1, NULL, NULL, NULL);
+  ns1__modifyDataSetResponse *_p = soap_instantiate_ns1__modifyDataSetResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -19506,12 +19638,13 @@ soap_instantiate_ns1__modifyDataSet(struct soap *, int, const char *,
 
 inline ns1__modifyDataSet *soap_new_ns1__modifyDataSet(struct soap *soap,
                                                        int n = -1) {
-  return soap_instantiate_ns1__modifyDataSet(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__modifyDataSet(soap, n, nullptr, nullptr,
+                                             nullptr);
 }
 
 inline ns1__modifyDataSet *soap_new_req_ns1__modifyDataSet(struct soap *soap) {
   ns1__modifyDataSet *_p =
-      soap_instantiate_ns1__modifyDataSet(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__modifyDataSet(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -19522,7 +19655,7 @@ inline ns1__modifyDataSet *
 soap_new_set_ns1__modifyDataSet(struct soap *soap, std::string *sessionId,
                                 ns1__dataset *dataSet, char *__item1) {
   ns1__modifyDataSet *_p =
-      soap_instantiate_ns1__modifyDataSet(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__modifyDataSet(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__modifyDataSet::sessionId = sessionId;
@@ -19586,7 +19719,7 @@ inline ns1__searchDatasetByParameterComparisonResponse *
 soap_new_ns1__searchDatasetByParameterComparisonResponse(struct soap *soap,
                                                          int n = -1) {
   return soap_instantiate_ns1__searchDatasetByParameterComparisonResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByParameterComparisonResponse *
@@ -19594,7 +19727,7 @@ soap_new_req_ns1__searchDatasetByParameterComparisonResponse(
     struct soap *soap) {
   ns1__searchDatasetByParameterComparisonResponse *_p =
       soap_instantiate_ns1__searchDatasetByParameterComparisonResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -19606,7 +19739,7 @@ soap_new_set_ns1__searchDatasetByParameterComparisonResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatasetByParameterComparisonResponse *_p =
       soap_instantiate_ns1__searchDatasetByParameterComparisonResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByParameterComparisonResponse::return_ = return_;
@@ -19667,16 +19800,16 @@ soap_instantiate_ns1__parameterComparisonCondition(struct soap *, int,
 
 inline ns1__parameterComparisonCondition *
 soap_new_ns1__parameterComparisonCondition(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__parameterComparisonCondition(soap, n, NULL, NULL,
-                                                            NULL);
+  return soap_instantiate_ns1__parameterComparisonCondition(soap, n, nullptr,
+                                                            nullptr, nullptr);
 }
 
 inline ns1__parameterComparisonCondition *
 soap_new_req_ns1__parameterComparisonCondition(struct soap *soap, bool negate2,
                                                bool sensitive2) {
   ns1__parameterComparisonCondition *_p =
-      soap_instantiate_ns1__parameterComparisonCondition(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate_ns1__parameterComparisonCondition(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__condition::negate = negate2;
@@ -19691,8 +19824,8 @@ soap_new_set_ns1__parameterComparisonCondition(
     ns1__parameterSearch *parameterSearch, xsd__anyType *value,
     xsd__anyType *valueRight, bool negate2, bool sensitive2, char *__item3) {
   ns1__parameterComparisonCondition *_p =
-      soap_instantiate_ns1__parameterComparisonCondition(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate_ns1__parameterComparisonCondition(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__parameterComparisonCondition::comparator = comparator;
@@ -19760,15 +19893,15 @@ soap_instantiate_ns1__searchDatasetByParameterComparison(struct soap *, int,
 inline ns1__searchDatasetByParameterComparison *
 soap_new_ns1__searchDatasetByParameterComparison(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate_ns1__searchDatasetByParameterComparison(soap, n, NULL,
-                                                                  NULL, NULL);
+  return soap_instantiate_ns1__searchDatasetByParameterComparison(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByParameterComparison *
 soap_new_req_ns1__searchDatasetByParameterComparison(struct soap *soap) {
   ns1__searchDatasetByParameterComparison *_p =
-      soap_instantiate_ns1__searchDatasetByParameterComparison(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByParameterComparison(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -19781,8 +19914,8 @@ soap_new_set_ns1__searchDatasetByParameterComparison(
     std::vector<ns1__parameterComparisonCondition *> &comparison,
     char *__item1) {
   ns1__searchDatasetByParameterComparison *_p =
-      soap_instantiate_ns1__searchDatasetByParameterComparison(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByParameterComparison(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByParameterComparison::sessionId = sessionId;
@@ -19845,15 +19978,15 @@ soap_instantiate_ns1__searchSampleByRestrictionResponse(struct soap *, int,
 
 inline ns1__searchSampleByRestrictionResponse *
 soap_new_ns1__searchSampleByRestrictionResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchSampleByRestrictionResponse(soap, n, NULL,
-                                                                 NULL, NULL);
+  return soap_instantiate_ns1__searchSampleByRestrictionResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchSampleByRestrictionResponse *
 soap_new_req_ns1__searchSampleByRestrictionResponse(struct soap *soap) {
   ns1__searchSampleByRestrictionResponse *_p =
-      soap_instantiate_ns1__searchSampleByRestrictionResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__searchSampleByRestrictionResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -19864,8 +19997,8 @@ inline ns1__searchSampleByRestrictionResponse *
 soap_new_set_ns1__searchSampleByRestrictionResponse(
     struct soap *soap, std::vector<ns1__sample *> &return_, char *__item1) {
   ns1__searchSampleByRestrictionResponse *_p =
-      soap_instantiate_ns1__searchSampleByRestrictionResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__searchSampleByRestrictionResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByRestrictionResponse::return_ = return_;
@@ -19927,15 +20060,15 @@ soap_instantiate_ns1__searchSampleByRestriction(struct soap *, int,
 
 inline ns1__searchSampleByRestriction *
 soap_new_ns1__searchSampleByRestriction(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchSampleByRestriction(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__searchSampleByRestriction(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__searchSampleByRestriction *
 soap_new_req_ns1__searchSampleByRestriction(struct soap *soap) {
   ns1__searchSampleByRestriction *_p =
-      soap_instantiate_ns1__searchSampleByRestriction(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__searchSampleByRestriction(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -19947,8 +20080,8 @@ soap_new_set_ns1__searchSampleByRestriction(
     struct soap *soap, std::string *sessionId,
     ns1__restrictionCondition *restriction, char *__item1) {
   ns1__searchSampleByRestriction *_p =
-      soap_instantiate_ns1__searchSampleByRestriction(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__searchSampleByRestriction(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByRestriction::sessionId = sessionId;
@@ -20011,15 +20144,15 @@ soap_instantiate_ns1__downloadDatafilesResponse(struct soap *, int,
 
 inline ns1__downloadDatafilesResponse *
 soap_new_ns1__downloadDatafilesResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__downloadDatafilesResponse(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__downloadDatafilesResponse(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__downloadDatafilesResponse *
 soap_new_req_ns1__downloadDatafilesResponse(struct soap *soap) {
   ns1__downloadDatafilesResponse *_p =
-      soap_instantiate_ns1__downloadDatafilesResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__downloadDatafilesResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -20030,8 +20163,8 @@ inline ns1__downloadDatafilesResponse *
 soap_new_set_ns1__downloadDatafilesResponse(struct soap *soap, std::string *URL,
                                             char *__item1) {
   ns1__downloadDatafilesResponse *_p =
-      soap_instantiate_ns1__downloadDatafilesResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__downloadDatafilesResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__downloadDatafilesResponse::URL = URL;
@@ -20088,13 +20221,14 @@ soap_instantiate_ns1__downloadDatafiles(struct soap *, int, const char *,
 
 inline ns1__downloadDatafiles *
 soap_new_ns1__downloadDatafiles(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__downloadDatafiles(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__downloadDatafiles(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__downloadDatafiles *
 soap_new_req_ns1__downloadDatafiles(struct soap *soap) {
-  ns1__downloadDatafiles *_p =
-      soap_instantiate_ns1__downloadDatafiles(soap, -1, NULL, NULL, NULL);
+  ns1__downloadDatafiles *_p = soap_instantiate_ns1__downloadDatafiles(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -20105,8 +20239,8 @@ inline ns1__downloadDatafiles *
 soap_new_set_ns1__downloadDatafiles(struct soap *soap, std::string *sessionId,
                                     std::vector<LONG64> &datafileIds,
                                     char *__item1) {
-  ns1__downloadDatafiles *_p =
-      soap_instantiate_ns1__downloadDatafiles(soap, -1, NULL, NULL, NULL);
+  ns1__downloadDatafiles *_p = soap_instantiate_ns1__downloadDatafiles(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__downloadDatafiles::sessionId = sessionId;
@@ -20174,7 +20308,7 @@ inline ns1__searchInvestigationByParameterConditionResponse *
 soap_new_ns1__searchInvestigationByParameterConditionResponse(struct soap *soap,
                                                               int n = -1) {
   return soap_instantiate_ns1__searchInvestigationByParameterConditionResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByParameterConditionResponse *
@@ -20182,7 +20316,7 @@ soap_new_req_ns1__searchInvestigationByParameterConditionResponse(
     struct soap *soap) {
   ns1__searchInvestigationByParameterConditionResponse *_p =
       soap_instantiate_ns1__searchInvestigationByParameterConditionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -20194,7 +20328,7 @@ soap_new_set_ns1__searchInvestigationByParameterConditionResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchInvestigationByParameterConditionResponse *_p =
       soap_instantiate_ns1__searchInvestigationByParameterConditionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByParameterConditionResponse::return_ = return_;
@@ -20259,14 +20393,14 @@ inline ns1__searchInvestigationByParameterCondition *
 soap_new_ns1__searchInvestigationByParameterCondition(struct soap *soap,
                                                       int n = -1) {
   return soap_instantiate_ns1__searchInvestigationByParameterCondition(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByParameterCondition *
 soap_new_req_ns1__searchInvestigationByParameterCondition(struct soap *soap) {
   ns1__searchInvestigationByParameterCondition *_p =
       soap_instantiate_ns1__searchInvestigationByParameterCondition(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -20279,7 +20413,7 @@ soap_new_set_ns1__searchInvestigationByParameterCondition(
     ns1__parameterCondition *logicalCondition, char *__item1) {
   ns1__searchInvestigationByParameterCondition *_p =
       soap_instantiate_ns1__searchInvestigationByParameterCondition(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByParameterCondition::sessionId = sessionId;
@@ -20343,15 +20477,15 @@ soap_instantiate_ns1__searchDatafileByParameterResponse(struct soap *, int,
 
 inline ns1__searchDatafileByParameterResponse *
 soap_new_ns1__searchDatafileByParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchDatafileByParameterResponse(soap, n, NULL,
-                                                                 NULL, NULL);
+  return soap_instantiate_ns1__searchDatafileByParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByParameterResponse *
 soap_new_req_ns1__searchDatafileByParameterResponse(struct soap *soap) {
   ns1__searchDatafileByParameterResponse *_p =
-      soap_instantiate_ns1__searchDatafileByParameterResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__searchDatafileByParameterResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -20362,8 +20496,8 @@ inline ns1__searchDatafileByParameterResponse *
 soap_new_set_ns1__searchDatafileByParameterResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatafileByParameterResponse *_p =
-      soap_instantiate_ns1__searchDatafileByParameterResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__searchDatafileByParameterResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByParameterResponse::return_ = return_;
@@ -20420,14 +20554,15 @@ soap_instantiate_ns1__parameterSearch(struct soap *, int, const char *,
 
 inline ns1__parameterSearch *soap_new_ns1__parameterSearch(struct soap *soap,
                                                            int n = -1) {
-  return soap_instantiate_ns1__parameterSearch(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__parameterSearch(soap, n, nullptr, nullptr,
+                                               nullptr);
 }
 
 inline ns1__parameterSearch *
 soap_new_req_ns1__parameterSearch(struct soap *soap, bool negate2,
                                   bool sensitive2) {
-  ns1__parameterSearch *_p =
-      soap_instantiate_ns1__parameterSearch(soap, -1, NULL, NULL, NULL);
+  ns1__parameterSearch *_p = soap_instantiate_ns1__parameterSearch(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__condition::negate = negate2;
@@ -20440,8 +20575,8 @@ inline ns1__parameterSearch *
 soap_new_set_ns1__parameterSearch(struct soap *soap, ns1__parameter *param,
                                   enum ns1__parameterType *type, bool negate2,
                                   bool sensitive2, char *__item3) {
-  ns1__parameterSearch *_p =
-      soap_instantiate_ns1__parameterSearch(soap, -1, NULL, NULL, NULL);
+  ns1__parameterSearch *_p = soap_instantiate_ns1__parameterSearch(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__parameterSearch::param = param;
@@ -20505,15 +20640,15 @@ soap_instantiate_ns1__searchDatafileByParameter(struct soap *, int,
 
 inline ns1__searchDatafileByParameter *
 soap_new_ns1__searchDatafileByParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchDatafileByParameter(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__searchDatafileByParameter(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByParameter *
 soap_new_req_ns1__searchDatafileByParameter(struct soap *soap) {
   ns1__searchDatafileByParameter *_p =
-      soap_instantiate_ns1__searchDatafileByParameter(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__searchDatafileByParameter(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -20525,8 +20660,8 @@ soap_new_set_ns1__searchDatafileByParameter(
     struct soap *soap, std::string *sessionId,
     std::vector<ns1__parameterSearch *> &parameters, char *__item1) {
   ns1__searchDatafileByParameter *_p =
-      soap_instantiate_ns1__searchDatafileByParameter(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__searchDatafileByParameter(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByParameter::sessionId = sessionId;
@@ -20583,12 +20718,12 @@ soap_instantiate_ns1__userDetails(struct soap *, int, const char *,
 
 inline ns1__userDetails *soap_new_ns1__userDetails(struct soap *soap,
                                                    int n = -1) {
-  return soap_instantiate_ns1__userDetails(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__userDetails(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__userDetails *soap_new_req_ns1__userDetails(struct soap *soap) {
   ns1__userDetails *_p =
-      soap_instantiate_ns1__userDetails(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__userDetails(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -20601,7 +20736,7 @@ inline ns1__userDetails *soap_new_set_ns1__userDetails(
     std::string *initial, std::string *institution, std::string *lastName,
     std::string *title, char *__item1) {
   ns1__userDetails *_p =
-      soap_instantiate_ns1__userDetails(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__userDetails(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__userDetails::credential = credential;
@@ -20674,7 +20809,7 @@ inline ns1__searchDatafileByRestrictionComparisonResponse *
 soap_new_ns1__searchDatafileByRestrictionComparisonResponse(struct soap *soap,
                                                             int n = -1) {
   return soap_instantiate_ns1__searchDatafileByRestrictionComparisonResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByRestrictionComparisonResponse *
@@ -20682,7 +20817,7 @@ soap_new_req_ns1__searchDatafileByRestrictionComparisonResponse(
     struct soap *soap) {
   ns1__searchDatafileByRestrictionComparisonResponse *_p =
       soap_instantiate_ns1__searchDatafileByRestrictionComparisonResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -20694,7 +20829,7 @@ soap_new_set_ns1__searchDatafileByRestrictionComparisonResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatafileByRestrictionComparisonResponse *_p =
       soap_instantiate_ns1__searchDatafileByRestrictionComparisonResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByRestrictionComparisonResponse::return_ = return_;
@@ -20758,14 +20893,14 @@ inline ns1__searchDatafileByRestrictionComparison *
 soap_new_ns1__searchDatafileByRestrictionComparison(struct soap *soap,
                                                     int n = -1) {
   return soap_instantiate_ns1__searchDatafileByRestrictionComparison(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByRestrictionComparison *
 soap_new_req_ns1__searchDatafileByRestrictionComparison(struct soap *soap) {
   ns1__searchDatafileByRestrictionComparison *_p =
       soap_instantiate_ns1__searchDatafileByRestrictionComparison(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -20779,7 +20914,7 @@ soap_new_set_ns1__searchDatafileByRestrictionComparison(
     char *__item1) {
   ns1__searchDatafileByRestrictionComparison *_p =
       soap_instantiate_ns1__searchDatafileByRestrictionComparison(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByRestrictionComparison::sessionId = sessionId;
@@ -20840,14 +20975,15 @@ soap_instantiate_ns1__getAllKeywordsResponse(struct soap *, int, const char *,
 
 inline ns1__getAllKeywordsResponse *
 soap_new_ns1__getAllKeywordsResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getAllKeywordsResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__getAllKeywordsResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__getAllKeywordsResponse *
 soap_new_req_ns1__getAllKeywordsResponse(struct soap *soap) {
   ns1__getAllKeywordsResponse *_p =
-      soap_instantiate_ns1__getAllKeywordsResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getAllKeywordsResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -20857,7 +20993,8 @@ soap_new_req_ns1__getAllKeywordsResponse(struct soap *soap) {
 inline ns1__getAllKeywordsResponse *soap_new_set_ns1__getAllKeywordsResponse(
     struct soap *soap, std::vector<std::string> &return_, char *__item1) {
   ns1__getAllKeywordsResponse *_p =
-      soap_instantiate_ns1__getAllKeywordsResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getAllKeywordsResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getAllKeywordsResponse::return_ = return_;
@@ -20914,13 +21051,14 @@ soap_instantiate_ns1__getAllKeywords(struct soap *, int, const char *,
 
 inline ns1__getAllKeywords *soap_new_ns1__getAllKeywords(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__getAllKeywords(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__getAllKeywords(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__getAllKeywords *
 soap_new_req_ns1__getAllKeywords(struct soap *soap) {
   ns1__getAllKeywords *_p =
-      soap_instantiate_ns1__getAllKeywords(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getAllKeywords(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -20931,7 +21069,7 @@ inline ns1__getAllKeywords *
 soap_new_set_ns1__getAllKeywords(struct soap *soap, std::string *sessionId,
                                  enum ns1__keywordType *type, char *__item1) {
   ns1__getAllKeywords *_p =
-      soap_instantiate_ns1__getAllKeywords(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getAllKeywords(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getAllKeywords::sessionId = sessionId;
@@ -20993,15 +21131,15 @@ soap_instantiate_ns1__removePublicationResponse(struct soap *, int,
 
 inline ns1__removePublicationResponse *
 soap_new_ns1__removePublicationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removePublicationResponse(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__removePublicationResponse(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__removePublicationResponse *
 soap_new_req_ns1__removePublicationResponse(struct soap *soap) {
   ns1__removePublicationResponse *_p =
-      soap_instantiate_ns1__removePublicationResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__removePublicationResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -21011,8 +21149,8 @@ soap_new_req_ns1__removePublicationResponse(struct soap *soap) {
 inline ns1__removePublicationResponse *
 soap_new_set_ns1__removePublicationResponse(struct soap *soap, char *__item1) {
   ns1__removePublicationResponse *_p =
-      soap_instantiate_ns1__removePublicationResponse(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__removePublicationResponse(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -21068,13 +21206,14 @@ soap_instantiate_ns1__removePublication(struct soap *, int, const char *,
 
 inline ns1__removePublication *
 soap_new_ns1__removePublication(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removePublication(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__removePublication(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__removePublication *
 soap_new_req_ns1__removePublication(struct soap *soap) {
-  ns1__removePublication *_p =
-      soap_instantiate_ns1__removePublication(soap, -1, NULL, NULL, NULL);
+  ns1__removePublication *_p = soap_instantiate_ns1__removePublication(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -21084,8 +21223,8 @@ soap_new_req_ns1__removePublication(struct soap *soap) {
 inline ns1__removePublication *
 soap_new_set_ns1__removePublication(struct soap *soap, std::string *sessionId,
                                     LONG64 *publicationId, char *__item1) {
-  ns1__removePublication *_p =
-      soap_instantiate_ns1__removePublication(soap, -1, NULL, NULL, NULL);
+  ns1__removePublication *_p = soap_instantiate_ns1__removePublication(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__removePublication::sessionId = sessionId;
@@ -21145,14 +21284,15 @@ soap_instantiate_ns1__createDataSetsResponse(struct soap *, int, const char *,
 
 inline ns1__createDataSetsResponse *
 soap_new_ns1__createDataSetsResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__createDataSetsResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__createDataSetsResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__createDataSetsResponse *
 soap_new_req_ns1__createDataSetsResponse(struct soap *soap) {
   ns1__createDataSetsResponse *_p =
-      soap_instantiate_ns1__createDataSetsResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__createDataSetsResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -21162,7 +21302,8 @@ soap_new_req_ns1__createDataSetsResponse(struct soap *soap) {
 inline ns1__createDataSetsResponse *soap_new_set_ns1__createDataSetsResponse(
     struct soap *soap, std::vector<ns1__dataset *> &return_, char *__item1) {
   ns1__createDataSetsResponse *_p =
-      soap_instantiate_ns1__createDataSetsResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__createDataSetsResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__createDataSetsResponse::return_ = return_;
@@ -21219,13 +21360,14 @@ soap_instantiate_ns1__datasetParameterPK(struct soap *, int, const char *,
 
 inline ns1__datasetParameterPK *
 soap_new_ns1__datasetParameterPK(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__datasetParameterPK(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__datasetParameterPK(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline ns1__datasetParameterPK *
 soap_new_req_ns1__datasetParameterPK(struct soap *soap) {
-  ns1__datasetParameterPK *_p =
-      soap_instantiate_ns1__datasetParameterPK(soap, -1, NULL, NULL, NULL);
+  ns1__datasetParameterPK *_p = soap_instantiate_ns1__datasetParameterPK(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -21236,8 +21378,8 @@ inline ns1__datasetParameterPK *
 soap_new_set_ns1__datasetParameterPK(struct soap *soap, LONG64 *datasetId,
                                      std::string *name, std::string *units,
                                      char *__item2) {
-  ns1__datasetParameterPK *_p =
-      soap_instantiate_ns1__datasetParameterPK(soap, -1, NULL, NULL, NULL);
+  ns1__datasetParameterPK *_p = soap_instantiate_ns1__datasetParameterPK(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__datasetParameterPK::datasetId = datasetId;
@@ -21295,14 +21437,15 @@ soap_instantiate_ns1__datasetParameter(struct soap *, int, const char *,
 
 inline ns1__datasetParameter *soap_new_ns1__datasetParameter(struct soap *soap,
                                                              int n = -1) {
-  return soap_instantiate_ns1__datasetParameter(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__datasetParameter(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline ns1__datasetParameter *
 soap_new_req_ns1__datasetParameter(struct soap *soap,
                                    bool facilityAcquiredData1, bool selected1) {
-  ns1__datasetParameter *_p =
-      soap_instantiate_ns1__datasetParameter(soap, -1, NULL, NULL, NULL);
+  ns1__datasetParameter *_p = soap_instantiate_ns1__datasetParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -21319,8 +21462,8 @@ inline ns1__datasetParameter *soap_new_set_ns1__datasetParameter(
     enum ns1__parameterValueType *valueType, bool facilityAcquiredData1,
     ns1__icatRole *icatRole1, bool selected1, std::string *uniqueId1,
     char *__item2) {
-  ns1__datasetParameter *_p =
-      soap_instantiate_ns1__datasetParameter(soap, -1, NULL, NULL, NULL);
+  ns1__datasetParameter *_p = soap_instantiate_ns1__datasetParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__datasetParameter::datasetParameterPK = datasetParameterPK;
@@ -21386,13 +21529,14 @@ soap_instantiate_ns1__dataset(struct soap *, int, const char *, const char *,
                               size_t *);
 
 inline ns1__dataset *soap_new_ns1__dataset(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__dataset(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__dataset(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__dataset *soap_new_req_ns1__dataset(struct soap *soap,
                                                bool facilityAcquiredData1,
                                                bool selected1) {
-  ns1__dataset *_p = soap_instantiate_ns1__dataset(soap, -1, NULL, NULL, NULL);
+  ns1__dataset *_p =
+      soap_instantiate_ns1__dataset(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -21409,7 +21553,8 @@ inline ns1__dataset *soap_new_set_ns1__dataset(
     std::string *location, std::string *name, LONG64 *sampleId,
     bool facilityAcquiredData1, ns1__icatRole *icatRole1, bool selected1,
     std::string *uniqueId1, char *__item2) {
-  ns1__dataset *_p = soap_instantiate_ns1__dataset(soap, -1, NULL, NULL, NULL);
+  ns1__dataset *_p =
+      soap_instantiate_ns1__dataset(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__dataset::datafileCollection = datafileCollection;
@@ -21477,13 +21622,14 @@ soap_instantiate_ns1__createDataSets(struct soap *, int, const char *,
 
 inline ns1__createDataSets *soap_new_ns1__createDataSets(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__createDataSets(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__createDataSets(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__createDataSets *
 soap_new_req_ns1__createDataSets(struct soap *soap) {
   ns1__createDataSets *_p =
-      soap_instantiate_ns1__createDataSets(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__createDataSets(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -21495,7 +21641,7 @@ soap_new_set_ns1__createDataSets(struct soap *soap, std::string *sessionId,
                                  std::vector<ns1__dataset *> &dataSets,
                                  LONG64 *investigationId, char *__item1) {
   ns1__createDataSets *_p =
-      soap_instantiate_ns1__createDataSets(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__createDataSets(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__createDataSets::sessionId = sessionId;
@@ -21557,15 +21703,15 @@ soap_instantiate_ns1__deleteInvestigationResponse(struct soap *, int,
 
 inline ns1__deleteInvestigationResponse *
 soap_new_ns1__deleteInvestigationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteInvestigationResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__deleteInvestigationResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__deleteInvestigationResponse *
 soap_new_req_ns1__deleteInvestigationResponse(struct soap *soap) {
   ns1__deleteInvestigationResponse *_p =
-      soap_instantiate_ns1__deleteInvestigationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__deleteInvestigationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -21576,8 +21722,8 @@ inline ns1__deleteInvestigationResponse *
 soap_new_set_ns1__deleteInvestigationResponse(struct soap *soap,
                                               char *__item1) {
   ns1__deleteInvestigationResponse *_p =
-      soap_instantiate_ns1__deleteInvestigationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__deleteInvestigationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -21633,13 +21779,14 @@ soap_instantiate_ns1__deleteInvestigation(struct soap *, int, const char *,
 
 inline ns1__deleteInvestigation *
 soap_new_ns1__deleteInvestigation(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__deleteInvestigation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__deleteInvestigation(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__deleteInvestigation *
 soap_new_req_ns1__deleteInvestigation(struct soap *soap) {
-  ns1__deleteInvestigation *_p =
-      soap_instantiate_ns1__deleteInvestigation(soap, -1, NULL, NULL, NULL);
+  ns1__deleteInvestigation *_p = soap_instantiate_ns1__deleteInvestigation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -21649,8 +21796,8 @@ soap_new_req_ns1__deleteInvestigation(struct soap *soap) {
 inline ns1__deleteInvestigation *
 soap_new_set_ns1__deleteInvestigation(struct soap *soap, std::string *sessionId,
                                       LONG64 *investigationId, char *__item1) {
-  ns1__deleteInvestigation *_p =
-      soap_instantiate_ns1__deleteInvestigation(soap, -1, NULL, NULL, NULL);
+  ns1__deleteInvestigation *_p = soap_instantiate_ns1__deleteInvestigation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__deleteInvestigation::sessionId = sessionId;
@@ -21708,13 +21855,14 @@ soap_instantiate_ns1__removeKeywordResponse(struct soap *, int, const char *,
 
 inline ns1__removeKeywordResponse *
 soap_new_ns1__removeKeywordResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeKeywordResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__removeKeywordResponse(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline ns1__removeKeywordResponse *
 soap_new_req_ns1__removeKeywordResponse(struct soap *soap) {
-  ns1__removeKeywordResponse *_p =
-      soap_instantiate_ns1__removeKeywordResponse(soap, -1, NULL, NULL, NULL);
+  ns1__removeKeywordResponse *_p = soap_instantiate_ns1__removeKeywordResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -21723,8 +21871,8 @@ soap_new_req_ns1__removeKeywordResponse(struct soap *soap) {
 
 inline ns1__removeKeywordResponse *
 soap_new_set_ns1__removeKeywordResponse(struct soap *soap, char *__item1) {
-  ns1__removeKeywordResponse *_p =
-      soap_instantiate_ns1__removeKeywordResponse(soap, -1, NULL, NULL, NULL);
+  ns1__removeKeywordResponse *_p = soap_instantiate_ns1__removeKeywordResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -21778,12 +21926,12 @@ soap_instantiate_ns1__keywordPK(struct soap *, int, const char *, const char *,
                                 size_t *);
 
 inline ns1__keywordPK *soap_new_ns1__keywordPK(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__keywordPK(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__keywordPK(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__keywordPK *soap_new_req_ns1__keywordPK(struct soap *soap) {
   ns1__keywordPK *_p =
-      soap_instantiate_ns1__keywordPK(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__keywordPK(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -21795,7 +21943,7 @@ inline ns1__keywordPK *soap_new_set_ns1__keywordPK(struct soap *soap,
                                                    std::string *name,
                                                    char *__item2) {
   ns1__keywordPK *_p =
-      soap_instantiate_ns1__keywordPK(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__keywordPK(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__keywordPK::investigationId = investigationId;
@@ -21851,12 +21999,13 @@ soap_instantiate_ns1__removeKeyword(struct soap *, int, const char *,
 
 inline ns1__removeKeyword *soap_new_ns1__removeKeyword(struct soap *soap,
                                                        int n = -1) {
-  return soap_instantiate_ns1__removeKeyword(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__removeKeyword(soap, n, nullptr, nullptr,
+                                             nullptr);
 }
 
 inline ns1__removeKeyword *soap_new_req_ns1__removeKeyword(struct soap *soap) {
   ns1__removeKeyword *_p =
-      soap_instantiate_ns1__removeKeyword(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__removeKeyword(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -21867,7 +22016,7 @@ inline ns1__removeKeyword *
 soap_new_set_ns1__removeKeyword(struct soap *soap, std::string *sessionId,
                                 ns1__keywordPK *keywordPK, char *__item1) {
   ns1__removeKeyword *_p =
-      soap_instantiate_ns1__removeKeyword(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__removeKeyword(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__removeKeyword::sessionId = sessionId;
@@ -21929,15 +22078,15 @@ soap_instantiate_ns1__getParameterByRestrictionResponse(struct soap *, int,
 
 inline ns1__getParameterByRestrictionResponse *
 soap_new_ns1__getParameterByRestrictionResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getParameterByRestrictionResponse(soap, n, NULL,
-                                                                 NULL, NULL);
+  return soap_instantiate_ns1__getParameterByRestrictionResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getParameterByRestrictionResponse *
 soap_new_req_ns1__getParameterByRestrictionResponse(struct soap *soap) {
   ns1__getParameterByRestrictionResponse *_p =
-      soap_instantiate_ns1__getParameterByRestrictionResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__getParameterByRestrictionResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -21948,8 +22097,8 @@ inline ns1__getParameterByRestrictionResponse *
 soap_new_set_ns1__getParameterByRestrictionResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__getParameterByRestrictionResponse *_p =
-      soap_instantiate_ns1__getParameterByRestrictionResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__getParameterByRestrictionResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getParameterByRestrictionResponse::return_ = return_;
@@ -22011,15 +22160,15 @@ soap_instantiate_ns1__getParameterByRestriction(struct soap *, int,
 
 inline ns1__getParameterByRestriction *
 soap_new_ns1__getParameterByRestriction(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getParameterByRestriction(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__getParameterByRestriction(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__getParameterByRestriction *
 soap_new_req_ns1__getParameterByRestriction(struct soap *soap) {
   ns1__getParameterByRestriction *_p =
-      soap_instantiate_ns1__getParameterByRestriction(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__getParameterByRestriction(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -22031,8 +22180,8 @@ soap_new_set_ns1__getParameterByRestriction(
     struct soap *soap, std::string *sessionId,
     ns1__restrictionCondition *condition, char *__item1) {
   ns1__getParameterByRestriction *_p =
-      soap_instantiate_ns1__getParameterByRestriction(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__getParameterByRestriction(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getParameterByRestriction::sessionId = sessionId;
@@ -22094,15 +22243,15 @@ soap_instantiate_ns1__removeInvestigatorResponse(struct soap *, int,
 
 inline ns1__removeInvestigatorResponse *
 soap_new_ns1__removeInvestigatorResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeInvestigatorResponse(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate_ns1__removeInvestigatorResponse(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline ns1__removeInvestigatorResponse *
 soap_new_req_ns1__removeInvestigatorResponse(struct soap *soap) {
   ns1__removeInvestigatorResponse *_p =
-      soap_instantiate_ns1__removeInvestigatorResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__removeInvestigatorResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -22112,8 +22261,8 @@ soap_new_req_ns1__removeInvestigatorResponse(struct soap *soap) {
 inline ns1__removeInvestigatorResponse *
 soap_new_set_ns1__removeInvestigatorResponse(struct soap *soap, char *__item1) {
   ns1__removeInvestigatorResponse *_p =
-      soap_instantiate_ns1__removeInvestigatorResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__removeInvestigatorResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -22168,13 +22317,14 @@ soap_instantiate_ns1__investigatorPK(struct soap *, int, const char *,
 
 inline ns1__investigatorPK *soap_new_ns1__investigatorPK(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__investigatorPK(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__investigatorPK(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__investigatorPK *
 soap_new_req_ns1__investigatorPK(struct soap *soap) {
   ns1__investigatorPK *_p =
-      soap_instantiate_ns1__investigatorPK(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__investigatorPK(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -22185,7 +22335,7 @@ inline ns1__investigatorPK *
 soap_new_set_ns1__investigatorPK(struct soap *soap, std::string *facilityUserId,
                                  LONG64 *investigationId, char *__item2) {
   ns1__investigatorPK *_p =
-      soap_instantiate_ns1__investigatorPK(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__investigatorPK(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__investigatorPK::facilityUserId = facilityUserId;
@@ -22242,13 +22392,14 @@ soap_instantiate_ns1__removeInvestigator(struct soap *, int, const char *,
 
 inline ns1__removeInvestigator *
 soap_new_ns1__removeInvestigator(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeInvestigator(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__removeInvestigator(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline ns1__removeInvestigator *
 soap_new_req_ns1__removeInvestigator(struct soap *soap) {
-  ns1__removeInvestigator *_p =
-      soap_instantiate_ns1__removeInvestigator(soap, -1, NULL, NULL, NULL);
+  ns1__removeInvestigator *_p = soap_instantiate_ns1__removeInvestigator(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -22259,8 +22410,8 @@ inline ns1__removeInvestigator *
 soap_new_set_ns1__removeInvestigator(struct soap *soap, std::string *sessionId,
                                      ns1__investigatorPK *investigatorPK,
                                      char *__item1) {
-  ns1__removeInvestigator *_p =
-      soap_instantiate_ns1__removeInvestigator(soap, -1, NULL, NULL, NULL);
+  ns1__removeInvestigator *_p = soap_instantiate_ns1__removeInvestigator(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__removeInvestigator::sessionId = sessionId;
@@ -22321,15 +22472,15 @@ soap_instantiate_ns1__removeInvestigationResponse(struct soap *, int,
 
 inline ns1__removeInvestigationResponse *
 soap_new_ns1__removeInvestigationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeInvestigationResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__removeInvestigationResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__removeInvestigationResponse *
 soap_new_req_ns1__removeInvestigationResponse(struct soap *soap) {
   ns1__removeInvestigationResponse *_p =
-      soap_instantiate_ns1__removeInvestigationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__removeInvestigationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -22340,8 +22491,8 @@ inline ns1__removeInvestigationResponse *
 soap_new_set_ns1__removeInvestigationResponse(struct soap *soap,
                                               char *__item1) {
   ns1__removeInvestigationResponse *_p =
-      soap_instantiate_ns1__removeInvestigationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__removeInvestigationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -22397,13 +22548,14 @@ soap_instantiate_ns1__removeInvestigation(struct soap *, int, const char *,
 
 inline ns1__removeInvestigation *
 soap_new_ns1__removeInvestigation(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeInvestigation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__removeInvestigation(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__removeInvestigation *
 soap_new_req_ns1__removeInvestigation(struct soap *soap) {
-  ns1__removeInvestigation *_p =
-      soap_instantiate_ns1__removeInvestigation(soap, -1, NULL, NULL, NULL);
+  ns1__removeInvestigation *_p = soap_instantiate_ns1__removeInvestigation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -22413,8 +22565,8 @@ soap_new_req_ns1__removeInvestigation(struct soap *soap) {
 inline ns1__removeInvestigation *
 soap_new_set_ns1__removeInvestigation(struct soap *soap, std::string *sessionId,
                                       LONG64 *investigationId, char *__item1) {
-  ns1__removeInvestigation *_p =
-      soap_instantiate_ns1__removeInvestigation(soap, -1, NULL, NULL, NULL);
+  ns1__removeInvestigation *_p = soap_instantiate_ns1__removeInvestigation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__removeInvestigation::sessionId = sessionId;
@@ -22478,15 +22630,15 @@ soap_instantiate_ns1__getFacilityUserByFederalIdResponse(struct soap *, int,
 inline ns1__getFacilityUserByFederalIdResponse *
 soap_new_ns1__getFacilityUserByFederalIdResponse(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate_ns1__getFacilityUserByFederalIdResponse(soap, n, NULL,
-                                                                  NULL, NULL);
+  return soap_instantiate_ns1__getFacilityUserByFederalIdResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getFacilityUserByFederalIdResponse *
 soap_new_req_ns1__getFacilityUserByFederalIdResponse(struct soap *soap) {
   ns1__getFacilityUserByFederalIdResponse *_p =
-      soap_instantiate_ns1__getFacilityUserByFederalIdResponse(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__getFacilityUserByFederalIdResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -22498,8 +22650,8 @@ soap_new_set_ns1__getFacilityUserByFederalIdResponse(struct soap *soap,
                                                      ns1__facilityUser *return_,
                                                      char *__item1) {
   ns1__getFacilityUserByFederalIdResponse *_p =
-      soap_instantiate_ns1__getFacilityUserByFederalIdResponse(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate_ns1__getFacilityUserByFederalIdResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getFacilityUserByFederalIdResponse::return_ = return_;
@@ -22560,15 +22712,15 @@ soap_instantiate_ns1__getFacilityUserByFederalId(struct soap *, int,
 
 inline ns1__getFacilityUserByFederalId *
 soap_new_ns1__getFacilityUserByFederalId(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getFacilityUserByFederalId(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate_ns1__getFacilityUserByFederalId(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline ns1__getFacilityUserByFederalId *
 soap_new_req_ns1__getFacilityUserByFederalId(struct soap *soap) {
   ns1__getFacilityUserByFederalId *_p =
-      soap_instantiate_ns1__getFacilityUserByFederalId(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__getFacilityUserByFederalId(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -22581,8 +22733,8 @@ soap_new_set_ns1__getFacilityUserByFederalId(struct soap *soap,
                                              std::string *federalId,
                                              char *__item1) {
   ns1__getFacilityUserByFederalId *_p =
-      soap_instantiate_ns1__getFacilityUserByFederalId(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__getFacilityUserByFederalId(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getFacilityUserByFederalId::sessionId = sessionId;
@@ -22643,14 +22795,15 @@ soap_instantiate_ns1__downloadDatasetResponse(struct soap *, int, const char *,
 
 inline ns1__downloadDatasetResponse *
 soap_new_ns1__downloadDatasetResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__downloadDatasetResponse(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate_ns1__downloadDatasetResponse(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline ns1__downloadDatasetResponse *
 soap_new_req_ns1__downloadDatasetResponse(struct soap *soap) {
   ns1__downloadDatasetResponse *_p =
-      soap_instantiate_ns1__downloadDatasetResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__downloadDatasetResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -22661,7 +22814,8 @@ inline ns1__downloadDatasetResponse *
 soap_new_set_ns1__downloadDatasetResponse(struct soap *soap, std::string *URL,
                                           char *__item1) {
   ns1__downloadDatasetResponse *_p =
-      soap_instantiate_ns1__downloadDatasetResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__downloadDatasetResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__downloadDatasetResponse::URL = URL;
@@ -22718,13 +22872,14 @@ soap_instantiate_ns1__downloadDataset(struct soap *, int, const char *,
 
 inline ns1__downloadDataset *soap_new_ns1__downloadDataset(struct soap *soap,
                                                            int n = -1) {
-  return soap_instantiate_ns1__downloadDataset(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__downloadDataset(soap, n, nullptr, nullptr,
+                                               nullptr);
 }
 
 inline ns1__downloadDataset *
 soap_new_req_ns1__downloadDataset(struct soap *soap) {
-  ns1__downloadDataset *_p =
-      soap_instantiate_ns1__downloadDataset(soap, -1, NULL, NULL, NULL);
+  ns1__downloadDataset *_p = soap_instantiate_ns1__downloadDataset(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -22734,8 +22889,8 @@ soap_new_req_ns1__downloadDataset(struct soap *soap) {
 inline ns1__downloadDataset *
 soap_new_set_ns1__downloadDataset(struct soap *soap, std::string *sessionId,
                                   LONG64 *datasetId, char *__item1) {
-  ns1__downloadDataset *_p =
-      soap_instantiate_ns1__downloadDataset(soap, -1, NULL, NULL, NULL);
+  ns1__downloadDataset *_p = soap_instantiate_ns1__downloadDataset(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__downloadDataset::sessionId = sessionId;
@@ -22791,14 +22946,14 @@ soap_instantiate_ns1__instrument(struct soap *, int, const char *, const char *,
 
 inline ns1__instrument *soap_new_ns1__instrument(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate_ns1__instrument(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__instrument(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__instrument *soap_new_req_ns1__instrument(struct soap *soap,
                                                      bool facilityAcquiredData1,
                                                      bool selected1) {
   ns1__instrument *_p =
-      soap_instantiate_ns1__instrument(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__instrument(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -22814,7 +22969,7 @@ soap_new_set_ns1__instrument(struct soap *soap, std::string *description,
                              ns1__icatRole *icatRole1, bool selected1,
                              std::string *uniqueId1, char *__item2) {
   ns1__instrument *_p =
-      soap_instantiate_ns1__instrument(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__instrument(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__instrument::description = description;
@@ -22880,15 +23035,15 @@ soap_instantiate_ns1__getInstrumentsWithDataResponse(struct soap *, int,
 
 inline ns1__getInstrumentsWithDataResponse *
 soap_new_ns1__getInstrumentsWithDataResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getInstrumentsWithDataResponse(soap, n, NULL,
-                                                              NULL, NULL);
+  return soap_instantiate_ns1__getInstrumentsWithDataResponse(soap, n, nullptr,
+                                                              nullptr, nullptr);
 }
 
 inline ns1__getInstrumentsWithDataResponse *
 soap_new_req_ns1__getInstrumentsWithDataResponse(struct soap *soap) {
   ns1__getInstrumentsWithDataResponse *_p =
-      soap_instantiate_ns1__getInstrumentsWithDataResponse(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__getInstrumentsWithDataResponse(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -22899,8 +23054,8 @@ inline ns1__getInstrumentsWithDataResponse *
 soap_new_set_ns1__getInstrumentsWithDataResponse(
     struct soap *soap, std::vector<ns1__instrument *> &return_, char *__item1) {
   ns1__getInstrumentsWithDataResponse *_p =
-      soap_instantiate_ns1__getInstrumentsWithDataResponse(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__getInstrumentsWithDataResponse(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getInstrumentsWithDataResponse::return_ = return_;
@@ -22959,14 +23114,15 @@ soap_instantiate_ns1__getInstrumentsWithData(struct soap *, int, const char *,
 
 inline ns1__getInstrumentsWithData *
 soap_new_ns1__getInstrumentsWithData(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getInstrumentsWithData(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__getInstrumentsWithData(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__getInstrumentsWithData *
 soap_new_req_ns1__getInstrumentsWithData(struct soap *soap) {
   ns1__getInstrumentsWithData *_p =
-      soap_instantiate_ns1__getInstrumentsWithData(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getInstrumentsWithData(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -22976,7 +23132,8 @@ soap_new_req_ns1__getInstrumentsWithData(struct soap *soap) {
 inline ns1__getInstrumentsWithData *soap_new_set_ns1__getInstrumentsWithData(
     struct soap *soap, std::string *sessionId, char *__item1) {
   ns1__getInstrumentsWithData *_p =
-      soap_instantiate_ns1__getInstrumentsWithData(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getInstrumentsWithData(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getInstrumentsWithData::sessionId = sessionId;
@@ -23033,13 +23190,14 @@ soap_instantiate_ns1__logoutResponse(struct soap *, int, const char *,
 
 inline ns1__logoutResponse *soap_new_ns1__logoutResponse(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__logoutResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__logoutResponse(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__logoutResponse *soap_new_req_ns1__logoutResponse(struct soap *soap,
                                                              bool return_) {
   ns1__logoutResponse *_p =
-      soap_instantiate_ns1__logoutResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__logoutResponse(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__logoutResponse::return_ = return_;
@@ -23051,7 +23209,7 @@ inline ns1__logoutResponse *soap_new_set_ns1__logoutResponse(struct soap *soap,
                                                              bool return_,
                                                              char *__item1) {
   ns1__logoutResponse *_p =
-      soap_instantiate_ns1__logoutResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__logoutResponse(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__logoutResponse::return_ = return_;
@@ -23103,11 +23261,12 @@ soap_instantiate_ns1__logout(struct soap *, int, const char *, const char *,
                              size_t *);
 
 inline ns1__logout *soap_new_ns1__logout(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__logout(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__logout(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__logout *soap_new_req_ns1__logout(struct soap *soap) {
-  ns1__logout *_p = soap_instantiate_ns1__logout(soap, -1, NULL, NULL, NULL);
+  ns1__logout *_p =
+      soap_instantiate_ns1__logout(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -23117,7 +23276,8 @@ inline ns1__logout *soap_new_req_ns1__logout(struct soap *soap) {
 inline ns1__logout *soap_new_set_ns1__logout(struct soap *soap,
                                              std::string *sessionId,
                                              char *__item1) {
-  ns1__logout *_p = soap_instantiate_ns1__logout(soap, -1, NULL, NULL, NULL);
+  ns1__logout *_p =
+      soap_instantiate_ns1__logout(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__logout::sessionId = sessionId;
@@ -23176,15 +23336,15 @@ soap_instantiate_ns1__addDataFileParametersResponse(struct soap *, int,
 
 inline ns1__addDataFileParametersResponse *
 soap_new_ns1__addDataFileParametersResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addDataFileParametersResponse(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate_ns1__addDataFileParametersResponse(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline ns1__addDataFileParametersResponse *
 soap_new_req_ns1__addDataFileParametersResponse(struct soap *soap) {
   ns1__addDataFileParametersResponse *_p =
-      soap_instantiate_ns1__addDataFileParametersResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate_ns1__addDataFileParametersResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -23196,8 +23356,8 @@ soap_new_set_ns1__addDataFileParametersResponse(
     struct soap *soap, std::vector<ns1__datafileParameter *> &return_,
     char *__item1) {
   ns1__addDataFileParametersResponse *_p =
-      soap_instantiate_ns1__addDataFileParametersResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate_ns1__addDataFileParametersResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addDataFileParametersResponse::return_ = return_;
@@ -23254,13 +23414,14 @@ soap_instantiate_ns1__addDataFileParameters(struct soap *, int, const char *,
 
 inline ns1__addDataFileParameters *
 soap_new_ns1__addDataFileParameters(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__addDataFileParameters(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__addDataFileParameters(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline ns1__addDataFileParameters *
 soap_new_req_ns1__addDataFileParameters(struct soap *soap) {
-  ns1__addDataFileParameters *_p =
-      soap_instantiate_ns1__addDataFileParameters(soap, -1, NULL, NULL, NULL);
+  ns1__addDataFileParameters *_p = soap_instantiate_ns1__addDataFileParameters(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -23271,8 +23432,8 @@ inline ns1__addDataFileParameters *soap_new_set_ns1__addDataFileParameters(
     struct soap *soap, std::string *sessionId,
     std::vector<ns1__datafileParameter *> &dataFileParameters,
     LONG64 *datafileId, char *__item1) {
-  ns1__addDataFileParameters *_p =
-      soap_instantiate_ns1__addDataFileParameters(soap, -1, NULL, NULL, NULL);
+  ns1__addDataFileParameters *_p = soap_instantiate_ns1__addDataFileParameters(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__addDataFileParameters::sessionId = sessionId;
@@ -23331,14 +23492,15 @@ soap_instantiate_ns1__facilityCycle(struct soap *, int, const char *,
 
 inline ns1__facilityCycle *soap_new_ns1__facilityCycle(struct soap *soap,
                                                        int n = -1) {
-  return soap_instantiate_ns1__facilityCycle(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__facilityCycle(soap, n, nullptr, nullptr,
+                                             nullptr);
 }
 
 inline ns1__facilityCycle *
 soap_new_req_ns1__facilityCycle(struct soap *soap, bool facilityAcquiredData1,
                                 bool selected1) {
   ns1__facilityCycle *_p =
-      soap_instantiate_ns1__facilityCycle(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__facilityCycle(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -23354,7 +23516,7 @@ soap_new_set_ns1__facilityCycle(struct soap *soap, std::string *description,
                                 ns1__icatRole *icatRole1, bool selected1,
                                 std::string *uniqueId1, char *__item2) {
   ns1__facilityCycle *_p =
-      soap_instantiate_ns1__facilityCycle(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__facilityCycle(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__facilityCycle::description = description;
@@ -23421,15 +23583,15 @@ soap_instantiate_ns1__listFacilityCyclesResponse(struct soap *, int,
 
 inline ns1__listFacilityCyclesResponse *
 soap_new_ns1__listFacilityCyclesResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__listFacilityCyclesResponse(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate_ns1__listFacilityCyclesResponse(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline ns1__listFacilityCyclesResponse *
 soap_new_req_ns1__listFacilityCyclesResponse(struct soap *soap) {
   ns1__listFacilityCyclesResponse *_p =
-      soap_instantiate_ns1__listFacilityCyclesResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__listFacilityCyclesResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -23441,8 +23603,8 @@ soap_new_set_ns1__listFacilityCyclesResponse(
     struct soap *soap, std::vector<ns1__facilityCycle *> &return_,
     char *__item1) {
   ns1__listFacilityCyclesResponse *_p =
-      soap_instantiate_ns1__listFacilityCyclesResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate_ns1__listFacilityCyclesResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listFacilityCyclesResponse::return_ = return_;
@@ -23498,13 +23660,14 @@ soap_instantiate_ns1__listFacilityCycles(struct soap *, int, const char *,
 
 inline ns1__listFacilityCycles *
 soap_new_ns1__listFacilityCycles(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__listFacilityCycles(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__listFacilityCycles(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline ns1__listFacilityCycles *
 soap_new_req_ns1__listFacilityCycles(struct soap *soap) {
-  ns1__listFacilityCycles *_p =
-      soap_instantiate_ns1__listFacilityCycles(soap, -1, NULL, NULL, NULL);
+  ns1__listFacilityCycles *_p = soap_instantiate_ns1__listFacilityCycles(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -23514,8 +23677,8 @@ soap_new_req_ns1__listFacilityCycles(struct soap *soap) {
 inline ns1__listFacilityCycles *
 soap_new_set_ns1__listFacilityCycles(struct soap *soap, std::string *sessionId,
                                      char *__item1) {
-  ns1__listFacilityCycles *_p =
-      soap_instantiate_ns1__listFacilityCycles(soap, -1, NULL, NULL, NULL);
+  ns1__listFacilityCycles *_p = soap_instantiate_ns1__listFacilityCycles(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listFacilityCycles::sessionId = sessionId;
@@ -23575,15 +23738,15 @@ soap_instantiate_ns1__removeAuthorisationResponse(struct soap *, int,
 
 inline ns1__removeAuthorisationResponse *
 soap_new_ns1__removeAuthorisationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeAuthorisationResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__removeAuthorisationResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__removeAuthorisationResponse *
 soap_new_req_ns1__removeAuthorisationResponse(struct soap *soap) {
   ns1__removeAuthorisationResponse *_p =
-      soap_instantiate_ns1__removeAuthorisationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__removeAuthorisationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -23594,8 +23757,8 @@ inline ns1__removeAuthorisationResponse *
 soap_new_set_ns1__removeAuthorisationResponse(struct soap *soap,
                                               char *__item1) {
   ns1__removeAuthorisationResponse *_p =
-      soap_instantiate_ns1__removeAuthorisationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__removeAuthorisationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -23651,13 +23814,14 @@ soap_instantiate_ns1__removeAuthorisation(struct soap *, int, const char *,
 
 inline ns1__removeAuthorisation *
 soap_new_ns1__removeAuthorisation(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeAuthorisation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__removeAuthorisation(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__removeAuthorisation *
 soap_new_req_ns1__removeAuthorisation(struct soap *soap) {
-  ns1__removeAuthorisation *_p =
-      soap_instantiate_ns1__removeAuthorisation(soap, -1, NULL, NULL, NULL);
+  ns1__removeAuthorisation *_p = soap_instantiate_ns1__removeAuthorisation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -23667,8 +23831,8 @@ soap_new_req_ns1__removeAuthorisation(struct soap *soap) {
 inline ns1__removeAuthorisation *
 soap_new_set_ns1__removeAuthorisation(struct soap *soap, std::string *sessionId,
                                       LONG64 *authorisationId, char *__item1) {
-  ns1__removeAuthorisation *_p =
-      soap_instantiate_ns1__removeAuthorisation(soap, -1, NULL, NULL, NULL);
+  ns1__removeAuthorisation *_p = soap_instantiate_ns1__removeAuthorisation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__removeAuthorisation::sessionId = sessionId;
@@ -23728,14 +23892,15 @@ soap_instantiate_ns1__removeDataFileResponse(struct soap *, int, const char *,
 
 inline ns1__removeDataFileResponse *
 soap_new_ns1__removeDataFileResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeDataFileResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__removeDataFileResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__removeDataFileResponse *
 soap_new_req_ns1__removeDataFileResponse(struct soap *soap) {
   ns1__removeDataFileResponse *_p =
-      soap_instantiate_ns1__removeDataFileResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__removeDataFileResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -23745,7 +23910,8 @@ soap_new_req_ns1__removeDataFileResponse(struct soap *soap) {
 inline ns1__removeDataFileResponse *
 soap_new_set_ns1__removeDataFileResponse(struct soap *soap, char *__item1) {
   ns1__removeDataFileResponse *_p =
-      soap_instantiate_ns1__removeDataFileResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__removeDataFileResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -23801,13 +23967,14 @@ soap_instantiate_ns1__removeDataFile(struct soap *, int, const char *,
 
 inline ns1__removeDataFile *soap_new_ns1__removeDataFile(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__removeDataFile(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__removeDataFile(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__removeDataFile *
 soap_new_req_ns1__removeDataFile(struct soap *soap) {
   ns1__removeDataFile *_p =
-      soap_instantiate_ns1__removeDataFile(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__removeDataFile(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -23818,7 +23985,7 @@ inline ns1__removeDataFile *
 soap_new_set_ns1__removeDataFile(struct soap *soap, std::string *sessionId,
                                  LONG64 *datafileId, char *__item1) {
   ns1__removeDataFile *_p =
-      soap_instantiate_ns1__removeDataFile(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__removeDataFile(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__removeDataFile::sessionId = sessionId;
@@ -23874,12 +24041,12 @@ soap_instantiate_ns1__parameterPK(struct soap *, int, const char *,
 
 inline ns1__parameterPK *soap_new_ns1__parameterPK(struct soap *soap,
                                                    int n = -1) {
-  return soap_instantiate_ns1__parameterPK(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__parameterPK(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__parameterPK *soap_new_req_ns1__parameterPK(struct soap *soap) {
   ns1__parameterPK *_p =
-      soap_instantiate_ns1__parameterPK(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__parameterPK(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -23891,7 +24058,7 @@ inline ns1__parameterPK *soap_new_set_ns1__parameterPK(struct soap *soap,
                                                        std::string *units,
                                                        char *__item2) {
   ns1__parameterPK *_p =
-      soap_instantiate_ns1__parameterPK(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__parameterPK(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__parameterPK::name = name;
@@ -23946,7 +24113,7 @@ soap_instantiate_ns1__parameter(struct soap *, int, const char *, const char *,
                                 size_t *);
 
 inline ns1__parameter *soap_new_ns1__parameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__parameter(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__parameter(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__parameter *
@@ -23955,7 +24122,7 @@ soap_new_req_ns1__parameter(struct soap *soap, bool datafileParameter,
                             bool verified, bool facilityAcquiredData1,
                             bool selected1) {
   ns1__parameter *_p =
-      soap_instantiate_ns1__parameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__parameter(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__parameter::datafileParameter = datafileParameter;
@@ -23977,7 +24144,7 @@ inline ns1__parameter *soap_new_set_ns1__parameter(
     bool facilityAcquiredData1, ns1__icatRole *icatRole1, bool selected1,
     std::string *uniqueId1, char *__item2) {
   ns1__parameter *_p =
-      soap_instantiate_ns1__parameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__parameter(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__parameter::datafileParameter = datafileParameter;
@@ -24049,15 +24216,15 @@ soap_instantiate_ns1__getParameterByNameUnitsResponse(struct soap *, int,
 
 inline ns1__getParameterByNameUnitsResponse *
 soap_new_ns1__getParameterByNameUnitsResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getParameterByNameUnitsResponse(soap, n, NULL,
-                                                               NULL, NULL);
+  return soap_instantiate_ns1__getParameterByNameUnitsResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__getParameterByNameUnitsResponse *
 soap_new_req_ns1__getParameterByNameUnitsResponse(struct soap *soap) {
   ns1__getParameterByNameUnitsResponse *_p =
-      soap_instantiate_ns1__getParameterByNameUnitsResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__getParameterByNameUnitsResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -24068,8 +24235,8 @@ inline ns1__getParameterByNameUnitsResponse *
 soap_new_set_ns1__getParameterByNameUnitsResponse(
     struct soap *soap, std::vector<ns1__parameter *> &return_, char *__item1) {
   ns1__getParameterByNameUnitsResponse *_p =
-      soap_instantiate_ns1__getParameterByNameUnitsResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__getParameterByNameUnitsResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getParameterByNameUnitsResponse::return_ = return_;
@@ -24129,14 +24296,15 @@ soap_instantiate_ns1__getParameterByNameUnits(struct soap *, int, const char *,
 
 inline ns1__getParameterByNameUnits *
 soap_new_ns1__getParameterByNameUnits(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__getParameterByNameUnits(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate_ns1__getParameterByNameUnits(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline ns1__getParameterByNameUnits *
 soap_new_req_ns1__getParameterByNameUnits(struct soap *soap) {
   ns1__getParameterByNameUnits *_p =
-      soap_instantiate_ns1__getParameterByNameUnits(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getParameterByNameUnits(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -24147,7 +24315,8 @@ inline ns1__getParameterByNameUnits *soap_new_set_ns1__getParameterByNameUnits(
     struct soap *soap, std::string *sesssionId, std::string *name,
     std::string *units, char *__item1) {
   ns1__getParameterByNameUnits *_p =
-      soap_instantiate_ns1__getParameterByNameUnits(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__getParameterByNameUnits(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__getParameterByNameUnits::sesssionId = sesssionId;
@@ -24215,7 +24384,7 @@ inline ns1__searchInvestigationByParameterLogicalResponse *
 soap_new_ns1__searchInvestigationByParameterLogicalResponse(struct soap *soap,
                                                             int n = -1) {
   return soap_instantiate_ns1__searchInvestigationByParameterLogicalResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByParameterLogicalResponse *
@@ -24223,7 +24392,7 @@ soap_new_req_ns1__searchInvestigationByParameterLogicalResponse(
     struct soap *soap) {
   ns1__searchInvestigationByParameterLogicalResponse *_p =
       soap_instantiate_ns1__searchInvestigationByParameterLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -24235,7 +24404,7 @@ soap_new_set_ns1__searchInvestigationByParameterLogicalResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchInvestigationByParameterLogicalResponse *_p =
       soap_instantiate_ns1__searchInvestigationByParameterLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByParameterLogicalResponse::return_ = return_;
@@ -24296,16 +24465,16 @@ soap_instantiate_ns1__parameterLogicalCondition(struct soap *, int,
 
 inline ns1__parameterLogicalCondition *
 soap_new_ns1__parameterLogicalCondition(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__parameterLogicalCondition(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__parameterLogicalCondition(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__parameterLogicalCondition *
 soap_new_req_ns1__parameterLogicalCondition(struct soap *soap, bool negate2,
                                             bool sensitive2) {
   ns1__parameterLogicalCondition *_p =
-      soap_instantiate_ns1__parameterLogicalCondition(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__parameterLogicalCondition(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__condition::negate = negate2;
@@ -24320,8 +24489,8 @@ soap_new_set_ns1__parameterLogicalCondition(
     enum ns1__logicalOperator *operator_, bool negate2, bool sensitive2,
     char *__item3) {
   ns1__parameterLogicalCondition *_p =
-      soap_instantiate_ns1__parameterLogicalCondition(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__parameterLogicalCondition(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__parameterLogicalCondition::listComparable = listComparable;
@@ -24389,14 +24558,14 @@ inline ns1__searchInvestigationByParameterLogical *
 soap_new_ns1__searchInvestigationByParameterLogical(struct soap *soap,
                                                     int n = -1) {
   return soap_instantiate_ns1__searchInvestigationByParameterLogical(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchInvestigationByParameterLogical *
 soap_new_req_ns1__searchInvestigationByParameterLogical(struct soap *soap) {
   ns1__searchInvestigationByParameterLogical *_p =
       soap_instantiate_ns1__searchInvestigationByParameterLogical(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -24409,7 +24578,7 @@ soap_new_set_ns1__searchInvestigationByParameterLogical(
     ns1__parameterLogicalCondition *logicalCondition, char *__item1) {
   ns1__searchInvestigationByParameterLogical *_p =
       soap_instantiate_ns1__searchInvestigationByParameterLogical(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchInvestigationByParameterLogical::sessionId = sessionId;
@@ -24469,13 +24638,14 @@ soap_instantiate_ns1__modifySampleResponse(struct soap *, int, const char *,
 
 inline ns1__modifySampleResponse *
 soap_new_ns1__modifySampleResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__modifySampleResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__modifySampleResponse(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline ns1__modifySampleResponse *
 soap_new_req_ns1__modifySampleResponse(struct soap *soap) {
-  ns1__modifySampleResponse *_p =
-      soap_instantiate_ns1__modifySampleResponse(soap, -1, NULL, NULL, NULL);
+  ns1__modifySampleResponse *_p = soap_instantiate_ns1__modifySampleResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -24484,8 +24654,8 @@ soap_new_req_ns1__modifySampleResponse(struct soap *soap) {
 
 inline ns1__modifySampleResponse *
 soap_new_set_ns1__modifySampleResponse(struct soap *soap, char *__item1) {
-  ns1__modifySampleResponse *_p =
-      soap_instantiate_ns1__modifySampleResponse(soap, -1, NULL, NULL, NULL);
+  ns1__modifySampleResponse *_p = soap_instantiate_ns1__modifySampleResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -24541,12 +24711,12 @@ soap_instantiate_ns1__modifySample(struct soap *, int, const char *,
 
 inline ns1__modifySample *soap_new_ns1__modifySample(struct soap *soap,
                                                      int n = -1) {
-  return soap_instantiate_ns1__modifySample(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__modifySample(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__modifySample *soap_new_req_ns1__modifySample(struct soap *soap) {
   ns1__modifySample *_p =
-      soap_instantiate_ns1__modifySample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__modifySample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -24558,7 +24728,7 @@ inline ns1__modifySample *soap_new_set_ns1__modifySample(struct soap *soap,
                                                          ns1__sample *sample,
                                                          char *__item1) {
   ns1__modifySample *_p =
-      soap_instantiate_ns1__modifySample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__modifySample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__modifySample::sessionId = sessionId;
@@ -24618,14 +24788,15 @@ soap_instantiate_ns1__createDataFileResponse(struct soap *, int, const char *,
 
 inline ns1__createDataFileResponse *
 soap_new_ns1__createDataFileResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__createDataFileResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_ns1__createDataFileResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline ns1__createDataFileResponse *
 soap_new_req_ns1__createDataFileResponse(struct soap *soap) {
   ns1__createDataFileResponse *_p =
-      soap_instantiate_ns1__createDataFileResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__createDataFileResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -24635,7 +24806,8 @@ soap_new_req_ns1__createDataFileResponse(struct soap *soap) {
 inline ns1__createDataFileResponse *soap_new_set_ns1__createDataFileResponse(
     struct soap *soap, ns1__datafile *return_, char *__item1) {
   ns1__createDataFileResponse *_p =
-      soap_instantiate_ns1__createDataFileResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__createDataFileResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__createDataFileResponse::return_ = return_;
@@ -24692,13 +24864,14 @@ soap_instantiate_ns1__relatedDatafilesPK(struct soap *, int, const char *,
 
 inline ns1__relatedDatafilesPK *
 soap_new_ns1__relatedDatafilesPK(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__relatedDatafilesPK(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__relatedDatafilesPK(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline ns1__relatedDatafilesPK *
 soap_new_req_ns1__relatedDatafilesPK(struct soap *soap) {
-  ns1__relatedDatafilesPK *_p =
-      soap_instantiate_ns1__relatedDatafilesPK(soap, -1, NULL, NULL, NULL);
+  ns1__relatedDatafilesPK *_p = soap_instantiate_ns1__relatedDatafilesPK(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -24708,8 +24881,8 @@ soap_new_req_ns1__relatedDatafilesPK(struct soap *soap) {
 inline ns1__relatedDatafilesPK *
 soap_new_set_ns1__relatedDatafilesPK(struct soap *soap, LONG64 *destDatafileId,
                                      LONG64 *sourceDatafileId, char *__item2) {
-  ns1__relatedDatafilesPK *_p =
-      soap_instantiate_ns1__relatedDatafilesPK(soap, -1, NULL, NULL, NULL);
+  ns1__relatedDatafilesPK *_p = soap_instantiate_ns1__relatedDatafilesPK(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__relatedDatafilesPK::destDatafileId = destDatafileId;
@@ -24766,14 +24939,15 @@ soap_instantiate_ns1__relatedDatafiles(struct soap *, int, const char *,
 
 inline ns1__relatedDatafiles *soap_new_ns1__relatedDatafiles(struct soap *soap,
                                                              int n = -1) {
-  return soap_instantiate_ns1__relatedDatafiles(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__relatedDatafiles(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline ns1__relatedDatafiles *
 soap_new_req_ns1__relatedDatafiles(struct soap *soap,
                                    bool facilityAcquiredData1, bool selected1) {
-  ns1__relatedDatafiles *_p =
-      soap_instantiate_ns1__relatedDatafiles(soap, -1, NULL, NULL, NULL);
+  ns1__relatedDatafiles *_p = soap_instantiate_ns1__relatedDatafiles(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -24786,8 +24960,8 @@ inline ns1__relatedDatafiles *soap_new_set_ns1__relatedDatafiles(
     struct soap *soap, ns1__relatedDatafilesPK *relatedDatafilesPK,
     std::string *relation, bool facilityAcquiredData1, ns1__icatRole *icatRole1,
     bool selected1, std::string *uniqueId1, char *__item2) {
-  ns1__relatedDatafiles *_p =
-      soap_instantiate_ns1__relatedDatafiles(soap, -1, NULL, NULL, NULL);
+  ns1__relatedDatafiles *_p = soap_instantiate_ns1__relatedDatafiles(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__relatedDatafiles::relatedDatafilesPK = relatedDatafilesPK;
@@ -24849,13 +25023,14 @@ soap_instantiate_ns1__datafileParameterPK(struct soap *, int, const char *,
 
 inline ns1__datafileParameterPK *
 soap_new_ns1__datafileParameterPK(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__datafileParameterPK(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__datafileParameterPK(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline ns1__datafileParameterPK *
 soap_new_req_ns1__datafileParameterPK(struct soap *soap) {
-  ns1__datafileParameterPK *_p =
-      soap_instantiate_ns1__datafileParameterPK(soap, -1, NULL, NULL, NULL);
+  ns1__datafileParameterPK *_p = soap_instantiate_ns1__datafileParameterPK(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -24866,8 +25041,8 @@ inline ns1__datafileParameterPK *
 soap_new_set_ns1__datafileParameterPK(struct soap *soap, LONG64 *datafileId,
                                       std::string *name, std::string *units,
                                       char *__item2) {
-  ns1__datafileParameterPK *_p =
-      soap_instantiate_ns1__datafileParameterPK(soap, -1, NULL, NULL, NULL);
+  ns1__datafileParameterPK *_p = soap_instantiate_ns1__datafileParameterPK(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__datafileParameterPK::datafileId = datafileId;
@@ -24925,13 +25100,14 @@ soap_instantiate_ns1__datafileParameter(struct soap *, int, const char *,
 
 inline ns1__datafileParameter *
 soap_new_ns1__datafileParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__datafileParameter(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__datafileParameter(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__datafileParameter *soap_new_req_ns1__datafileParameter(
     struct soap *soap, bool facilityAcquiredData1, bool selected1) {
-  ns1__datafileParameter *_p =
-      soap_instantiate_ns1__datafileParameter(soap, -1, NULL, NULL, NULL);
+  ns1__datafileParameter *_p = soap_instantiate_ns1__datafileParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -24947,8 +25123,8 @@ inline ns1__datafileParameter *soap_new_set_ns1__datafileParameter(
     std::string *stringValue, enum ns1__parameterValueType *valueType,
     bool facilityAcquiredData1, ns1__icatRole *icatRole1, bool selected1,
     std::string *uniqueId1, char *__item2) {
-  ns1__datafileParameter *_p =
-      soap_instantiate_ns1__datafileParameter(soap, -1, NULL, NULL, NULL);
+  ns1__datafileParameter *_p = soap_instantiate_ns1__datafileParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__datafileParameter::datafileParameterPK = datafileParameterPK;
@@ -25016,13 +25192,14 @@ soap_instantiate_ns1__datafileFormatPK(struct soap *, int, const char *,
 
 inline ns1__datafileFormatPK *soap_new_ns1__datafileFormatPK(struct soap *soap,
                                                              int n = -1) {
-  return soap_instantiate_ns1__datafileFormatPK(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__datafileFormatPK(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline ns1__datafileFormatPK *
 soap_new_req_ns1__datafileFormatPK(struct soap *soap) {
-  ns1__datafileFormatPK *_p =
-      soap_instantiate_ns1__datafileFormatPK(soap, -1, NULL, NULL, NULL);
+  ns1__datafileFormatPK *_p = soap_instantiate_ns1__datafileFormatPK(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -25032,8 +25209,8 @@ soap_new_req_ns1__datafileFormatPK(struct soap *soap) {
 inline ns1__datafileFormatPK *
 soap_new_set_ns1__datafileFormatPK(struct soap *soap, std::string *name,
                                    std::string *version, char *__item2) {
-  ns1__datafileFormatPK *_p =
-      soap_instantiate_ns1__datafileFormatPK(soap, -1, NULL, NULL, NULL);
+  ns1__datafileFormatPK *_p = soap_instantiate_ns1__datafileFormatPK(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__datafileFormatPK::name = name;
@@ -25090,14 +25267,15 @@ soap_instantiate_ns1__datafileFormat(struct soap *, int, const char *,
 
 inline ns1__datafileFormat *soap_new_ns1__datafileFormat(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__datafileFormat(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__datafileFormat(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__datafileFormat *
 soap_new_req_ns1__datafileFormat(struct soap *soap, bool facilityAcquiredData1,
                                  bool selected1) {
   ns1__datafileFormat *_p =
-      soap_instantiate_ns1__datafileFormat(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__datafileFormat(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -25112,7 +25290,7 @@ inline ns1__datafileFormat *soap_new_set_ns1__datafileFormat(
     bool facilityAcquiredData1, ns1__icatRole *icatRole1, bool selected1,
     std::string *uniqueId1, char *__item2) {
   ns1__datafileFormat *_p =
-      soap_instantiate_ns1__datafileFormat(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__datafileFormat(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__datafileFormat::datafileFormatPK = datafileFormatPK;
@@ -25172,14 +25350,14 @@ soap_instantiate_ns1__datafile(struct soap *, int, const char *, const char *,
                                size_t *);
 
 inline ns1__datafile *soap_new_ns1__datafile(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__datafile(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__datafile(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__datafile *soap_new_req_ns1__datafile(struct soap *soap,
                                                  bool facilityAcquiredData1,
                                                  bool selected1) {
   ns1__datafile *_p =
-      soap_instantiate_ns1__datafile(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__datafile(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -25202,7 +25380,7 @@ inline ns1__datafile *soap_new_set_ns1__datafile(
     ns1__icatRole *icatRole1, bool selected1, std::string *uniqueId1,
     char *__item2) {
   ns1__datafile *_p =
-      soap_instantiate_ns1__datafile(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__datafile(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__datafile::checksum = checksum;
@@ -25280,13 +25458,14 @@ soap_instantiate_ns1__createDataFile(struct soap *, int, const char *,
 
 inline ns1__createDataFile *soap_new_ns1__createDataFile(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__createDataFile(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__createDataFile(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__createDataFile *
 soap_new_req_ns1__createDataFile(struct soap *soap) {
   ns1__createDataFile *_p =
-      soap_instantiate_ns1__createDataFile(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__createDataFile(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -25298,7 +25477,7 @@ soap_new_set_ns1__createDataFile(struct soap *soap, std::string *sessionId,
                                  ns1__datafile *dataFile, LONG64 *datasetId,
                                  char *__item1) {
   ns1__createDataFile *_p =
-      soap_instantiate_ns1__createDataFile(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__createDataFile(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__createDataFile::sessionId = sessionId;
@@ -25360,15 +25539,15 @@ soap_instantiate_ns1__InsufficientPrivilegesException(struct soap *, int,
 
 inline ns1__InsufficientPrivilegesException *
 soap_new_ns1__InsufficientPrivilegesException(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__InsufficientPrivilegesException(soap, n, NULL,
-                                                               NULL, NULL);
+  return soap_instantiate_ns1__InsufficientPrivilegesException(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__InsufficientPrivilegesException *
 soap_new_req_ns1__InsufficientPrivilegesException(struct soap *soap) {
   ns1__InsufficientPrivilegesException *_p =
-      soap_instantiate_ns1__InsufficientPrivilegesException(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__InsufficientPrivilegesException(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -25380,8 +25559,8 @@ soap_new_set_ns1__InsufficientPrivilegesException(
     struct soap *soap, std::string *message, std::string *stackTraceAsString,
     std::string *uniqueId, char *__item1) {
   ns1__InsufficientPrivilegesException *_p =
-      soap_instantiate_ns1__InsufficientPrivilegesException(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__InsufficientPrivilegesException(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__InsufficientPrivilegesException::message = message;
@@ -25441,13 +25620,14 @@ soap_instantiate_ns1__removeSampleResponse(struct soap *, int, const char *,
 
 inline ns1__removeSampleResponse *
 soap_new_ns1__removeSampleResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__removeSampleResponse(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__removeSampleResponse(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline ns1__removeSampleResponse *
 soap_new_req_ns1__removeSampleResponse(struct soap *soap) {
-  ns1__removeSampleResponse *_p =
-      soap_instantiate_ns1__removeSampleResponse(soap, -1, NULL, NULL, NULL);
+  ns1__removeSampleResponse *_p = soap_instantiate_ns1__removeSampleResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -25456,8 +25636,8 @@ soap_new_req_ns1__removeSampleResponse(struct soap *soap) {
 
 inline ns1__removeSampleResponse *
 soap_new_set_ns1__removeSampleResponse(struct soap *soap, char *__item1) {
-  ns1__removeSampleResponse *_p =
-      soap_instantiate_ns1__removeSampleResponse(soap, -1, NULL, NULL, NULL);
+  ns1__removeSampleResponse *_p = soap_instantiate_ns1__removeSampleResponse(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -25513,12 +25693,12 @@ soap_instantiate_ns1__removeSample(struct soap *, int, const char *,
 
 inline ns1__removeSample *soap_new_ns1__removeSample(struct soap *soap,
                                                      int n = -1) {
-  return soap_instantiate_ns1__removeSample(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__removeSample(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__removeSample *soap_new_req_ns1__removeSample(struct soap *soap) {
   ns1__removeSample *_p =
-      soap_instantiate_ns1__removeSample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__removeSample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -25530,7 +25710,7 @@ inline ns1__removeSample *soap_new_set_ns1__removeSample(struct soap *soap,
                                                          LONG64 *sampleId,
                                                          char *__item1) {
   ns1__removeSample *_p =
-      soap_instantiate_ns1__removeSample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__removeSample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__removeSample::sessionId = sessionId;
@@ -25591,14 +25771,15 @@ soap_instantiate_ns1__listInstrumentsResponse(struct soap *, int, const char *,
 
 inline ns1__listInstrumentsResponse *
 soap_new_ns1__listInstrumentsResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__listInstrumentsResponse(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate_ns1__listInstrumentsResponse(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline ns1__listInstrumentsResponse *
 soap_new_req_ns1__listInstrumentsResponse(struct soap *soap) {
   ns1__listInstrumentsResponse *_p =
-      soap_instantiate_ns1__listInstrumentsResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__listInstrumentsResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -25608,7 +25789,8 @@ soap_new_req_ns1__listInstrumentsResponse(struct soap *soap) {
 inline ns1__listInstrumentsResponse *soap_new_set_ns1__listInstrumentsResponse(
     struct soap *soap, std::vector<std::string> &return_, char *__item1) {
   ns1__listInstrumentsResponse *_p =
-      soap_instantiate_ns1__listInstrumentsResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__listInstrumentsResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listInstrumentsResponse::return_ = return_;
@@ -25665,13 +25847,14 @@ soap_instantiate_ns1__listInstruments(struct soap *, int, const char *,
 
 inline ns1__listInstruments *soap_new_ns1__listInstruments(struct soap *soap,
                                                            int n = -1) {
-  return soap_instantiate_ns1__listInstruments(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__listInstruments(soap, n, nullptr, nullptr,
+                                               nullptr);
 }
 
 inline ns1__listInstruments *
 soap_new_req_ns1__listInstruments(struct soap *soap) {
-  ns1__listInstruments *_p =
-      soap_instantiate_ns1__listInstruments(soap, -1, NULL, NULL, NULL);
+  ns1__listInstruments *_p = soap_instantiate_ns1__listInstruments(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -25681,8 +25864,8 @@ soap_new_req_ns1__listInstruments(struct soap *soap) {
 inline ns1__listInstruments *
 soap_new_set_ns1__listInstruments(struct soap *soap, std::string *sessionId,
                                   char *__item1) {
-  ns1__listInstruments *_p =
-      soap_instantiate_ns1__listInstruments(soap, -1, NULL, NULL, NULL);
+  ns1__listInstruments *_p = soap_instantiate_ns1__listInstruments(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listInstruments::sessionId = sessionId;
@@ -25746,14 +25929,14 @@ inline ns1__searchDatafileByRestrictionResponse *
 soap_new_ns1__searchDatafileByRestrictionResponse(struct soap *soap,
                                                   int n = -1) {
   return soap_instantiate_ns1__searchDatafileByRestrictionResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByRestrictionResponse *
 soap_new_req_ns1__searchDatafileByRestrictionResponse(struct soap *soap) {
   ns1__searchDatafileByRestrictionResponse *_p =
-      soap_instantiate_ns1__searchDatafileByRestrictionResponse(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate_ns1__searchDatafileByRestrictionResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -25764,8 +25947,8 @@ inline ns1__searchDatafileByRestrictionResponse *
 soap_new_set_ns1__searchDatafileByRestrictionResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatafileByRestrictionResponse *_p =
-      soap_instantiate_ns1__searchDatafileByRestrictionResponse(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate_ns1__searchDatafileByRestrictionResponse(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByRestrictionResponse::return_ = return_;
@@ -25826,15 +26009,15 @@ soap_instantiate_ns1__searchDatafileByRestriction(struct soap *, int,
 
 inline ns1__searchDatafileByRestriction *
 soap_new_ns1__searchDatafileByRestriction(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchDatafileByRestriction(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__searchDatafileByRestriction(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__searchDatafileByRestriction *
 soap_new_req_ns1__searchDatafileByRestriction(struct soap *soap) {
   ns1__searchDatafileByRestriction *_p =
-      soap_instantiate_ns1__searchDatafileByRestriction(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__searchDatafileByRestriction(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -25846,8 +26029,8 @@ soap_new_set_ns1__searchDatafileByRestriction(
     struct soap *soap, std::string *sessionId,
     ns1__restrictionCondition *restriction, char *__item1) {
   ns1__searchDatafileByRestriction *_p =
-      soap_instantiate_ns1__searchDatafileByRestriction(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__searchDatafileByRestriction(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatafileByRestriction::sessionId = sessionId;
@@ -25912,7 +26095,7 @@ inline ns1__searchSampleByRestrictionComparisonResponse *
 soap_new_ns1__searchSampleByRestrictionComparisonResponse(struct soap *soap,
                                                           int n = -1) {
   return soap_instantiate_ns1__searchSampleByRestrictionComparisonResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchSampleByRestrictionComparisonResponse *
@@ -25920,7 +26103,7 @@ soap_new_req_ns1__searchSampleByRestrictionComparisonResponse(
     struct soap *soap) {
   ns1__searchSampleByRestrictionComparisonResponse *_p =
       soap_instantiate_ns1__searchSampleByRestrictionComparisonResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -25932,7 +26115,7 @@ soap_new_set_ns1__searchSampleByRestrictionComparisonResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchSampleByRestrictionComparisonResponse *_p =
       soap_instantiate_ns1__searchSampleByRestrictionComparisonResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByRestrictionComparisonResponse::return_ = return_;
@@ -25994,8 +26177,8 @@ soap_instantiate_ns1__restrictionComparisonCondition(struct soap *, int,
 
 inline ns1__restrictionComparisonCondition *
 soap_new_ns1__restrictionComparisonCondition(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__restrictionComparisonCondition(soap, n, NULL,
-                                                              NULL, NULL);
+  return soap_instantiate_ns1__restrictionComparisonCondition(soap, n, nullptr,
+                                                              nullptr, nullptr);
 }
 
 inline ns1__restrictionComparisonCondition *
@@ -26003,8 +26186,8 @@ soap_new_req_ns1__restrictionComparisonCondition(
     struct soap *soap, int maxResults1, bool orderByAsc1, bool returnLongId1,
     bool negate2, bool sensitive2) {
   ns1__restrictionComparisonCondition *_p =
-      soap_instantiate_ns1__restrictionComparisonCondition(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__restrictionComparisonCondition(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__restrictionCondition::maxResults = maxResults1;
@@ -26027,8 +26210,8 @@ soap_new_set_ns1__restrictionComparisonCondition(
     bool returnLongId1, enum ns1__sampleInclude *sampleInclude1, bool negate2,
     bool sensitive2, char *__item3) {
   ns1__restrictionComparisonCondition *_p =
-      soap_instantiate_ns1__restrictionComparisonCondition(soap, -1, NULL, NULL,
-                                                           NULL);
+      soap_instantiate_ns1__restrictionComparisonCondition(soap, -1, nullptr,
+                                                           nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__restrictionComparisonCondition::comparisonOperator =
@@ -26108,14 +26291,14 @@ inline ns1__searchSampleByRestrictionComparison *
 soap_new_ns1__searchSampleByRestrictionComparison(struct soap *soap,
                                                   int n = -1) {
   return soap_instantiate_ns1__searchSampleByRestrictionComparison(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchSampleByRestrictionComparison *
 soap_new_req_ns1__searchSampleByRestrictionComparison(struct soap *soap) {
   ns1__searchSampleByRestrictionComparison *_p =
-      soap_instantiate_ns1__searchSampleByRestrictionComparison(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate_ns1__searchSampleByRestrictionComparison(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -26128,8 +26311,8 @@ soap_new_set_ns1__searchSampleByRestrictionComparison(
     std::vector<ns1__restrictionComparisonCondition *> &restriction,
     char *__item1) {
   ns1__searchSampleByRestrictionComparison *_p =
-      soap_instantiate_ns1__searchSampleByRestrictionComparison(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate_ns1__searchSampleByRestrictionComparison(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSampleByRestrictionComparison::sessionId = sessionId;
@@ -26191,15 +26374,15 @@ soap_instantiate_ns1__entityPrimaryKeyBaseBean(struct soap *, int, const char *,
 
 inline ns1__entityPrimaryKeyBaseBean *
 soap_new_ns1__entityPrimaryKeyBaseBean(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__entityPrimaryKeyBaseBean(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate_ns1__entityPrimaryKeyBaseBean(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline ns1__entityPrimaryKeyBaseBean *
 soap_new_req_ns1__entityPrimaryKeyBaseBean(struct soap *soap) {
   ns1__entityPrimaryKeyBaseBean *_p =
-      soap_instantiate_ns1__entityPrimaryKeyBaseBean(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__entityPrimaryKeyBaseBean(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -26209,8 +26392,8 @@ soap_new_req_ns1__entityPrimaryKeyBaseBean(struct soap *soap) {
 inline ns1__entityPrimaryKeyBaseBean *
 soap_new_set_ns1__entityPrimaryKeyBaseBean(struct soap *soap, char *__item1) {
   ns1__entityPrimaryKeyBaseBean *_p =
-      soap_instantiate_ns1__entityPrimaryKeyBaseBean(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__entityPrimaryKeyBaseBean(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item1;
@@ -26266,13 +26449,14 @@ soap_instantiate_ns1__sampleParameterPK(struct soap *, int, const char *,
 
 inline ns1__sampleParameterPK *
 soap_new_ns1__sampleParameterPK(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__sampleParameterPK(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__sampleParameterPK(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline ns1__sampleParameterPK *
 soap_new_req_ns1__sampleParameterPK(struct soap *soap) {
-  ns1__sampleParameterPK *_p =
-      soap_instantiate_ns1__sampleParameterPK(soap, -1, NULL, NULL, NULL);
+  ns1__sampleParameterPK *_p = soap_instantiate_ns1__sampleParameterPK(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -26283,8 +26467,8 @@ inline ns1__sampleParameterPK *
 soap_new_set_ns1__sampleParameterPK(struct soap *soap, std::string *name,
                                     LONG64 *sampleId, std::string *units,
                                     char *__item2) {
-  ns1__sampleParameterPK *_p =
-      soap_instantiate_ns1__sampleParameterPK(soap, -1, NULL, NULL, NULL);
+  ns1__sampleParameterPK *_p = soap_instantiate_ns1__sampleParameterPK(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__sampleParameterPK::name = name;
@@ -26342,14 +26526,15 @@ soap_instantiate_ns1__sampleParameter(struct soap *, int, const char *,
 
 inline ns1__sampleParameter *soap_new_ns1__sampleParameter(struct soap *soap,
                                                            int n = -1) {
-  return soap_instantiate_ns1__sampleParameter(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__sampleParameter(soap, n, nullptr, nullptr,
+                                               nullptr);
 }
 
 inline ns1__sampleParameter *
 soap_new_req_ns1__sampleParameter(struct soap *soap, bool facilityAcquiredData1,
                                   bool selected1) {
-  ns1__sampleParameter *_p =
-      soap_instantiate_ns1__sampleParameter(soap, -1, NULL, NULL, NULL);
+  ns1__sampleParameter *_p = soap_instantiate_ns1__sampleParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -26365,8 +26550,8 @@ inline ns1__sampleParameter *soap_new_set_ns1__sampleParameter(
     std::string *stringValue, enum ns1__parameterValueType *valueType,
     bool facilityAcquiredData1, ns1__icatRole *icatRole1, bool selected1,
     std::string *uniqueId1, char *__item2) {
-  ns1__sampleParameter *_p =
-      soap_instantiate_ns1__sampleParameter(soap, -1, NULL, NULL, NULL);
+  ns1__sampleParameter *_p = soap_instantiate_ns1__sampleParameter(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__sampleParameter::dateTimeValue = dateTimeValue;
@@ -26430,13 +26615,14 @@ soap_instantiate_ns1__sample(struct soap *, int, const char *, const char *,
                              size_t *);
 
 inline ns1__sample *soap_new_ns1__sample(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__sample(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__sample(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__sample *soap_new_req_ns1__sample(struct soap *soap,
                                              bool facilityAcquiredData1,
                                              bool selected1) {
-  ns1__sample *_p = soap_instantiate_ns1__sample(soap, -1, NULL, NULL, NULL);
+  ns1__sample *_p =
+      soap_instantiate_ns1__sample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -26452,7 +26638,8 @@ inline ns1__sample *soap_new_set_ns1__sample(
     std::vector<ns1__sampleParameter *> &sampleParameterCollection,
     bool facilityAcquiredData1, ns1__icatRole *icatRole1, bool selected1,
     std::string *uniqueId1, char *__item2) {
-  ns1__sample *_p = soap_instantiate_ns1__sample(soap, -1, NULL, NULL, NULL);
+  ns1__sample *_p =
+      soap_instantiate_ns1__sample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__sample::chemicalFormula = chemicalFormula;
@@ -26522,15 +26709,15 @@ soap_instantiate_ns1__searchSamplesBySampleNameResponse(struct soap *, int,
 
 inline ns1__searchSamplesBySampleNameResponse *
 soap_new_ns1__searchSamplesBySampleNameResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchSamplesBySampleNameResponse(soap, n, NULL,
-                                                                 NULL, NULL);
+  return soap_instantiate_ns1__searchSamplesBySampleNameResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchSamplesBySampleNameResponse *
 soap_new_req_ns1__searchSamplesBySampleNameResponse(struct soap *soap) {
   ns1__searchSamplesBySampleNameResponse *_p =
-      soap_instantiate_ns1__searchSamplesBySampleNameResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__searchSamplesBySampleNameResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -26541,8 +26728,8 @@ inline ns1__searchSamplesBySampleNameResponse *
 soap_new_set_ns1__searchSamplesBySampleNameResponse(
     struct soap *soap, std::vector<ns1__sample *> &return_, char *__item1) {
   ns1__searchSamplesBySampleNameResponse *_p =
-      soap_instantiate_ns1__searchSamplesBySampleNameResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__searchSamplesBySampleNameResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSamplesBySampleNameResponse::return_ = return_;
@@ -26604,15 +26791,15 @@ soap_instantiate_ns1__searchSamplesBySampleName(struct soap *, int,
 
 inline ns1__searchSamplesBySampleName *
 soap_new_ns1__searchSamplesBySampleName(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchSamplesBySampleName(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate_ns1__searchSamplesBySampleName(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline ns1__searchSamplesBySampleName *
 soap_new_req_ns1__searchSamplesBySampleName(struct soap *soap) {
   ns1__searchSamplesBySampleName *_p =
-      soap_instantiate_ns1__searchSamplesBySampleName(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__searchSamplesBySampleName(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -26625,8 +26812,8 @@ soap_new_set_ns1__searchSamplesBySampleName(struct soap *soap,
                                             std::string *sampleName,
                                             char *__item1) {
   ns1__searchSamplesBySampleName *_p =
-      soap_instantiate_ns1__searchSamplesBySampleName(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate_ns1__searchSamplesBySampleName(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchSamplesBySampleName::sessionId = sessionId;
@@ -26682,7 +26869,7 @@ soap_instantiate_ns1__icatRole(struct soap *, int, const char *, const char *,
                                size_t *);
 
 inline ns1__icatRole *soap_new_ns1__icatRole(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__icatRole(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__icatRole(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__icatRole *soap_new_req_ns1__icatRole(
@@ -26692,7 +26879,7 @@ inline ns1__icatRole *soap_new_req_ns1__icatRole(
     bool actionSelect, bool actionUpdate, bool facilityAcquiredData1,
     bool selected1) {
   ns1__icatRole *_p =
-      soap_instantiate_ns1__icatRole(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__icatRole(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__icatRole::actionDelete = actionDelete;
@@ -26719,7 +26906,7 @@ inline ns1__icatRole *soap_new_set_ns1__icatRole(
     bool facilityAcquiredData1, ns1__icatRole *icatRole1, bool selected1,
     std::string *uniqueId1, char *__item2) {
   ns1__icatRole *_p =
-      soap_instantiate_ns1__icatRole(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__icatRole(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__icatRole::actionDelete = actionDelete;
@@ -26788,14 +26975,15 @@ soap_instantiate_ns1__entityBaseBean(struct soap *, int, const char *,
 
 inline ns1__entityBaseBean *soap_new_ns1__entityBaseBean(struct soap *soap,
                                                          int n = -1) {
-  return soap_instantiate_ns1__entityBaseBean(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__entityBaseBean(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline ns1__entityBaseBean *
 soap_new_req_ns1__entityBaseBean(struct soap *soap, bool facilityAcquiredData,
                                  bool selected) {
   ns1__entityBaseBean *_p =
-      soap_instantiate_ns1__entityBaseBean(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__entityBaseBean(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData;
@@ -26809,7 +26997,7 @@ soap_new_set_ns1__entityBaseBean(struct soap *soap, bool facilityAcquiredData,
                                  ns1__icatRole *icatRole, bool selected,
                                  std::string *uniqueId, char *__item1) {
   ns1__entityBaseBean *_p =
-      soap_instantiate_ns1__entityBaseBean(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__entityBaseBean(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData;
@@ -26868,14 +27056,14 @@ soap_instantiate_ns1__facilityUser(struct soap *, int, const char *,
 
 inline ns1__facilityUser *soap_new_ns1__facilityUser(struct soap *soap,
                                                      int n = -1) {
-  return soap_instantiate_ns1__facilityUser(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__facilityUser(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__facilityUser *
 soap_new_req_ns1__facilityUser(struct soap *soap, bool facilityAcquiredData1,
                                bool selected1) {
   ns1__facilityUser *_p =
-      soap_instantiate_ns1__facilityUser(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__facilityUser(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__entityBaseBean::facilityAcquiredData = facilityAcquiredData1;
@@ -26891,7 +27079,7 @@ inline ns1__facilityUser *soap_new_set_ns1__facilityUser(
     ns1__icatRole *icatRole1, bool selected1, std::string *uniqueId1,
     char *__item2) {
   ns1__facilityUser *_p =
-      soap_instantiate_ns1__facilityUser(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__facilityUser(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__facilityUser::facilityUserId = facilityUserId;
@@ -26965,14 +27153,14 @@ inline ns1__searchFacilityUserByRestrictionResponse *
 soap_new_ns1__searchFacilityUserByRestrictionResponse(struct soap *soap,
                                                       int n = -1) {
   return soap_instantiate_ns1__searchFacilityUserByRestrictionResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchFacilityUserByRestrictionResponse *
 soap_new_req_ns1__searchFacilityUserByRestrictionResponse(struct soap *soap) {
   ns1__searchFacilityUserByRestrictionResponse *_p =
       soap_instantiate_ns1__searchFacilityUserByRestrictionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -26985,7 +27173,7 @@ soap_new_set_ns1__searchFacilityUserByRestrictionResponse(
     char *__item1) {
   ns1__searchFacilityUserByRestrictionResponse *_p =
       soap_instantiate_ns1__searchFacilityUserByRestrictionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchFacilityUserByRestrictionResponse::return_ = return_;
@@ -27046,15 +27234,15 @@ soap_instantiate_ns1__searchFacilityUserByRestriction(struct soap *, int,
 
 inline ns1__searchFacilityUserByRestriction *
 soap_new_ns1__searchFacilityUserByRestriction(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchFacilityUserByRestriction(soap, n, NULL,
-                                                               NULL, NULL);
+  return soap_instantiate_ns1__searchFacilityUserByRestriction(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchFacilityUserByRestriction *
 soap_new_req_ns1__searchFacilityUserByRestriction(struct soap *soap) {
   ns1__searchFacilityUserByRestriction *_p =
-      soap_instantiate_ns1__searchFacilityUserByRestriction(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__searchFacilityUserByRestriction(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -27066,8 +27254,8 @@ soap_new_set_ns1__searchFacilityUserByRestriction(
     struct soap *soap, std::string *sessionId,
     ns1__restrictionCondition *restriction, char *__item1) {
   ns1__searchFacilityUserByRestriction *_p =
-      soap_instantiate_ns1__searchFacilityUserByRestriction(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate_ns1__searchFacilityUserByRestriction(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchFacilityUserByRestriction::sessionId = sessionId;
@@ -27128,15 +27316,15 @@ soap_instantiate_ns1__listDatasetTypesResponse(struct soap *, int, const char *,
 
 inline ns1__listDatasetTypesResponse *
 soap_new_ns1__listDatasetTypesResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__listDatasetTypesResponse(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate_ns1__listDatasetTypesResponse(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline ns1__listDatasetTypesResponse *
 soap_new_req_ns1__listDatasetTypesResponse(struct soap *soap) {
   ns1__listDatasetTypesResponse *_p =
-      soap_instantiate_ns1__listDatasetTypesResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__listDatasetTypesResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -27148,8 +27336,8 @@ soap_new_set_ns1__listDatasetTypesResponse(struct soap *soap,
                                            std::vector<std::string> &return_,
                                            char *__item1) {
   ns1__listDatasetTypesResponse *_p =
-      soap_instantiate_ns1__listDatasetTypesResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate_ns1__listDatasetTypesResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listDatasetTypesResponse::return_ = return_;
@@ -27206,13 +27394,14 @@ soap_instantiate_ns1__listDatasetTypes(struct soap *, int, const char *,
 
 inline ns1__listDatasetTypes *soap_new_ns1__listDatasetTypes(struct soap *soap,
                                                              int n = -1) {
-  return soap_instantiate_ns1__listDatasetTypes(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__listDatasetTypes(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline ns1__listDatasetTypes *
 soap_new_req_ns1__listDatasetTypes(struct soap *soap) {
-  ns1__listDatasetTypes *_p =
-      soap_instantiate_ns1__listDatasetTypes(soap, -1, NULL, NULL, NULL);
+  ns1__listDatasetTypes *_p = soap_instantiate_ns1__listDatasetTypes(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -27222,8 +27411,8 @@ soap_new_req_ns1__listDatasetTypes(struct soap *soap) {
 inline ns1__listDatasetTypes *
 soap_new_set_ns1__listDatasetTypes(struct soap *soap, std::string *sessionId,
                                    char *__item1) {
-  ns1__listDatasetTypes *_p =
-      soap_instantiate_ns1__listDatasetTypes(soap, -1, NULL, NULL, NULL);
+  ns1__listDatasetTypes *_p = soap_instantiate_ns1__listDatasetTypes(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__listDatasetTypes::sessionId = sessionId;
@@ -27287,7 +27476,7 @@ inline ns1__searchDatasetByParameterRestrictionResponse *
 soap_new_ns1__searchDatasetByParameterRestrictionResponse(struct soap *soap,
                                                           int n = -1) {
   return soap_instantiate_ns1__searchDatasetByParameterRestrictionResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByParameterRestrictionResponse *
@@ -27295,7 +27484,7 @@ soap_new_req_ns1__searchDatasetByParameterRestrictionResponse(
     struct soap *soap) {
   ns1__searchDatasetByParameterRestrictionResponse *_p =
       soap_instantiate_ns1__searchDatasetByParameterRestrictionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -27307,7 +27496,7 @@ soap_new_set_ns1__searchDatasetByParameterRestrictionResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatasetByParameterRestrictionResponse *_p =
       soap_instantiate_ns1__searchDatasetByParameterRestrictionResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByParameterRestrictionResponse::return_ = return_;
@@ -27365,14 +27554,15 @@ soap_instantiate_ns1__parameterCondition(struct soap *, int, const char *,
 
 inline ns1__parameterCondition *
 soap_new_ns1__parameterCondition(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__parameterCondition(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__parameterCondition(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline ns1__parameterCondition *
 soap_new_req_ns1__parameterCondition(struct soap *soap, bool negate1,
                                      bool sensitive1) {
-  ns1__parameterCondition *_p =
-      soap_instantiate_ns1__parameterCondition(soap, -1, NULL, NULL, NULL);
+  ns1__parameterCondition *_p = soap_instantiate_ns1__parameterCondition(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__condition::negate = negate1;
@@ -27384,8 +27574,8 @@ soap_new_req_ns1__parameterCondition(struct soap *soap, bool negate1,
 inline ns1__parameterCondition *
 soap_new_set_ns1__parameterCondition(struct soap *soap, bool negate1,
                                      bool sensitive1, char *__item2) {
-  ns1__parameterCondition *_p =
-      soap_instantiate_ns1__parameterCondition(soap, -1, NULL, NULL, NULL);
+  ns1__parameterCondition *_p = soap_instantiate_ns1__parameterCondition(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__condition::negate = negate1;
@@ -27450,14 +27640,14 @@ inline ns1__searchDatasetByParameterRestriction *
 soap_new_ns1__searchDatasetByParameterRestriction(struct soap *soap,
                                                   int n = -1) {
   return soap_instantiate_ns1__searchDatasetByParameterRestriction(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByParameterRestriction *
 soap_new_req_ns1__searchDatasetByParameterRestriction(struct soap *soap) {
   ns1__searchDatasetByParameterRestriction *_p =
-      soap_instantiate_ns1__searchDatasetByParameterRestriction(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByParameterRestriction(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -27470,8 +27660,8 @@ soap_new_set_ns1__searchDatasetByParameterRestriction(
     ns1__parameterCondition *parameterCondition,
     ns1__restrictionCondition *restrictions, char *__item1) {
   ns1__searchDatasetByParameterRestriction *_p =
-      soap_instantiate_ns1__searchDatasetByParameterRestriction(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByParameterRestriction(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByParameterRestriction::sessionId = sessionId;
@@ -27538,14 +27728,14 @@ inline ns1__searchDatasetByRestrictionLogicalResponse *
 soap_new_ns1__searchDatasetByRestrictionLogicalResponse(struct soap *soap,
                                                         int n = -1) {
   return soap_instantiate_ns1__searchDatasetByRestrictionLogicalResponse(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByRestrictionLogicalResponse *
 soap_new_req_ns1__searchDatasetByRestrictionLogicalResponse(struct soap *soap) {
   ns1__searchDatasetByRestrictionLogicalResponse *_p =
       soap_instantiate_ns1__searchDatasetByRestrictionLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -27557,7 +27747,7 @@ soap_new_set_ns1__searchDatasetByRestrictionLogicalResponse(
     struct soap *soap, std::vector<xsd__anyType *> &return_, char *__item1) {
   ns1__searchDatasetByRestrictionLogicalResponse *_p =
       soap_instantiate_ns1__searchDatasetByRestrictionLogicalResponse(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByRestrictionLogicalResponse::return_ = return_;
@@ -27612,13 +27802,13 @@ soap_instantiate_ns1__condition(struct soap *, int, const char *, const char *,
                                 size_t *);
 
 inline ns1__condition *soap_new_ns1__condition(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__condition(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__condition(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__condition *
 soap_new_req_ns1__condition(struct soap *soap, bool negate, bool sensitive) {
   ns1__condition *_p =
-      soap_instantiate_ns1__condition(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__condition(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__condition::negate = negate;
@@ -27631,7 +27821,7 @@ inline ns1__condition *soap_new_set_ns1__condition(struct soap *soap,
                                                    bool negate, bool sensitive,
                                                    char *__item1) {
   ns1__condition *_p =
-      soap_instantiate_ns1__condition(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_ns1__condition(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__condition::negate = negate;
@@ -27688,15 +27878,16 @@ soap_instantiate_ns1__restrictionCondition(struct soap *, int, const char *,
 
 inline ns1__restrictionCondition *
 soap_new_ns1__restrictionCondition(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__restrictionCondition(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_ns1__restrictionCondition(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline ns1__restrictionCondition *
 soap_new_req_ns1__restrictionCondition(struct soap *soap, int maxResults,
                                        bool orderByAsc, bool returnLongId,
                                        bool negate1, bool sensitive1) {
-  ns1__restrictionCondition *_p =
-      soap_instantiate_ns1__restrictionCondition(soap, -1, NULL, NULL, NULL);
+  ns1__restrictionCondition *_p = soap_instantiate_ns1__restrictionCondition(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__restrictionCondition::maxResults = maxResults;
@@ -27715,8 +27906,8 @@ inline ns1__restrictionCondition *soap_new_set_ns1__restrictionCondition(
     bool orderByAsc, enum ns1__restrictionAttributes *orderByAttribute,
     bool returnLongId, enum ns1__sampleInclude *sampleInclude, bool negate1,
     bool sensitive1, char *__item2) {
-  ns1__restrictionCondition *_p =
-      soap_instantiate_ns1__restrictionCondition(soap, -1, NULL, NULL, NULL);
+  ns1__restrictionCondition *_p = soap_instantiate_ns1__restrictionCondition(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__restrictionCondition::datafileInclude = datafileInclude;
@@ -27787,8 +27978,8 @@ soap_instantiate_ns1__restrictionLogicalCondition(struct soap *, int,
 
 inline ns1__restrictionLogicalCondition *
 soap_new_ns1__restrictionLogicalCondition(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__restrictionLogicalCondition(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_ns1__restrictionLogicalCondition(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline ns1__restrictionLogicalCondition *
@@ -27797,8 +27988,8 @@ soap_new_req_ns1__restrictionLogicalCondition(struct soap *soap,
                                               bool returnLongId1, bool negate2,
                                               bool sensitive2) {
   ns1__restrictionLogicalCondition *_p =
-      soap_instantiate_ns1__restrictionLogicalCondition(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__restrictionLogicalCondition(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__restrictionCondition::maxResults = maxResults1;
@@ -27821,8 +28012,8 @@ soap_new_set_ns1__restrictionLogicalCondition(
     bool returnLongId1, enum ns1__sampleInclude *sampleInclude1, bool negate2,
     bool sensitive2, char *__item3) {
   ns1__restrictionLogicalCondition *_p =
-      soap_instantiate_ns1__restrictionLogicalCondition(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate_ns1__restrictionLogicalCondition(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__restrictionLogicalCondition::operator_ = operator_;
@@ -27895,15 +28086,15 @@ soap_instantiate_ns1__searchDatasetByRestrictionLogical(struct soap *, int,
 
 inline ns1__searchDatasetByRestrictionLogical *
 soap_new_ns1__searchDatasetByRestrictionLogical(struct soap *soap, int n = -1) {
-  return soap_instantiate_ns1__searchDatasetByRestrictionLogical(soap, n, NULL,
-                                                                 NULL, NULL);
+  return soap_instantiate_ns1__searchDatasetByRestrictionLogical(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline ns1__searchDatasetByRestrictionLogical *
 soap_new_req_ns1__searchDatasetByRestrictionLogical(struct soap *soap) {
   ns1__searchDatasetByRestrictionLogical *_p =
-      soap_instantiate_ns1__searchDatasetByRestrictionLogical(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByRestrictionLogical(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -27915,8 +28106,8 @@ soap_new_set_ns1__searchDatasetByRestrictionLogical(
     struct soap *soap, std::string *sessionId,
     ns1__restrictionLogicalCondition *restriction, char *__item1) {
   ns1__searchDatasetByRestrictionLogical *_p =
-      soap_instantiate_ns1__searchDatasetByRestrictionLogical(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate_ns1__searchDatasetByRestrictionLogical(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->ns1__searchDatasetByRestrictionLogical::sessionId = sessionId;
@@ -27977,11 +28168,12 @@ soap_instantiate_std__string(struct soap *, int, const char *, const char *,
                              size_t *);
 
 inline std::string *soap_new_std__string(struct soap *soap, int n = -1) {
-  return soap_instantiate_std__string(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_std__string(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline std::string *soap_new_req_std__string(struct soap *soap) {
-  std::string *_p = soap_instantiate_std__string(soap, -1, NULL, NULL, NULL);
+  std::string *_p =
+      soap_instantiate_std__string(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default_std__string(soap, _p);
   }
@@ -27989,7 +28181,8 @@ inline std::string *soap_new_req_std__string(struct soap *soap) {
 }
 
 inline std::string *soap_new_set_std__string(struct soap *soap) {
-  std::string *_p = soap_instantiate_std__string(soap, -1, NULL, NULL, NULL);
+  std::string *_p =
+      soap_instantiate_std__string(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default_std__string(soap, _p);
   }
@@ -28038,12 +28231,13 @@ soap_instantiate_xsd__string(struct soap *, int, const char *, const char *,
                              size_t *);
 
 inline xsd__string *soap_new_xsd__string(struct soap *soap, int n = -1) {
-  return soap_instantiate_xsd__string(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_xsd__string(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline xsd__string *soap_new_req_xsd__string(struct soap *soap,
                                              std::string &__item) {
-  xsd__string *_p = soap_instantiate_xsd__string(soap, -1, NULL, NULL, NULL);
+  xsd__string *_p =
+      soap_instantiate_xsd__string(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__string::__item = __item;
@@ -28054,7 +28248,8 @@ inline xsd__string *soap_new_req_xsd__string(struct soap *soap,
 inline xsd__string *soap_new_set_xsd__string(struct soap *soap,
                                              std::string &__item,
                                              char *__item1) {
-  xsd__string *_p = soap_instantiate_xsd__string(soap, -1, NULL, NULL, NULL);
+  xsd__string *_p =
+      soap_instantiate_xsd__string(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__string::__item = __item;
@@ -28104,11 +28299,12 @@ soap_instantiate_xsd__long(struct soap *, int, const char *, const char *,
                            size_t *);
 
 inline xsd__long *soap_new_xsd__long(struct soap *soap, int n = -1) {
-  return soap_instantiate_xsd__long(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_xsd__long(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline xsd__long *soap_new_req_xsd__long(struct soap *soap, LONG64 __item) {
-  xsd__long *_p = soap_instantiate_xsd__long(soap, -1, NULL, NULL, NULL);
+  xsd__long *_p =
+      soap_instantiate_xsd__long(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__long::__item = __item;
@@ -28118,7 +28314,8 @@ inline xsd__long *soap_new_req_xsd__long(struct soap *soap, LONG64 __item) {
 
 inline xsd__long *soap_new_set_xsd__long(struct soap *soap, LONG64 __item,
                                          char *__item1) {
-  xsd__long *_p = soap_instantiate_xsd__long(soap, -1, NULL, NULL, NULL);
+  xsd__long *_p =
+      soap_instantiate_xsd__long(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__long::__item = __item;
@@ -28167,11 +28364,11 @@ soap_instantiate_xsd__int(struct soap *, int, const char *, const char *,
                           size_t *);
 
 inline xsd__int *soap_new_xsd__int(struct soap *soap, int n = -1) {
-  return soap_instantiate_xsd__int(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_xsd__int(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline xsd__int *soap_new_req_xsd__int(struct soap *soap, int __item) {
-  xsd__int *_p = soap_instantiate_xsd__int(soap, -1, NULL, NULL, NULL);
+  xsd__int *_p = soap_instantiate_xsd__int(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__int::__item = __item;
@@ -28181,7 +28378,7 @@ inline xsd__int *soap_new_req_xsd__int(struct soap *soap, int __item) {
 
 inline xsd__int *soap_new_set_xsd__int(struct soap *soap, int __item,
                                        char *__item1) {
-  xsd__int *_p = soap_instantiate_xsd__int(soap, -1, NULL, NULL, NULL);
+  xsd__int *_p = soap_instantiate_xsd__int(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__int::__item = __item;
@@ -28230,11 +28427,12 @@ soap_instantiate_xsd__float(struct soap *, int, const char *, const char *,
                             size_t *);
 
 inline xsd__float *soap_new_xsd__float(struct soap *soap, int n = -1) {
-  return soap_instantiate_xsd__float(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_xsd__float(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline xsd__float *soap_new_req_xsd__float(struct soap *soap, float __item) {
-  xsd__float *_p = soap_instantiate_xsd__float(soap, -1, NULL, NULL, NULL);
+  xsd__float *_p =
+      soap_instantiate_xsd__float(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__float::__item = __item;
@@ -28244,7 +28442,8 @@ inline xsd__float *soap_new_req_xsd__float(struct soap *soap, float __item) {
 
 inline xsd__float *soap_new_set_xsd__float(struct soap *soap, float __item,
                                            char *__item1) {
-  xsd__float *_p = soap_instantiate_xsd__float(soap, -1, NULL, NULL, NULL);
+  xsd__float *_p =
+      soap_instantiate_xsd__float(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__float::__item = __item;
@@ -28294,11 +28493,12 @@ soap_instantiate_xsd__double(struct soap *, int, const char *, const char *,
                              size_t *);
 
 inline xsd__double *soap_new_xsd__double(struct soap *soap, int n = -1) {
-  return soap_instantiate_xsd__double(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_xsd__double(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline xsd__double *soap_new_req_xsd__double(struct soap *soap, double __item) {
-  xsd__double *_p = soap_instantiate_xsd__double(soap, -1, NULL, NULL, NULL);
+  xsd__double *_p =
+      soap_instantiate_xsd__double(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__double::__item = __item;
@@ -28308,7 +28508,8 @@ inline xsd__double *soap_new_req_xsd__double(struct soap *soap, double __item) {
 
 inline xsd__double *soap_new_set_xsd__double(struct soap *soap, double __item,
                                              char *__item1) {
-  xsd__double *_p = soap_instantiate_xsd__double(soap, -1, NULL, NULL, NULL);
+  xsd__double *_p =
+      soap_instantiate_xsd__double(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__double::__item = __item;
@@ -28361,13 +28562,13 @@ soap_instantiate_xsd__dateTime(struct soap *, int, const char *, const char *,
                                size_t *);
 
 inline xsd__dateTime *soap_new_xsd__dateTime(struct soap *soap, int n = -1) {
-  return soap_instantiate_xsd__dateTime(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_xsd__dateTime(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline xsd__dateTime *soap_new_req_xsd__dateTime(struct soap *soap,
                                                  time_t __item) {
   xsd__dateTime *_p =
-      soap_instantiate_xsd__dateTime(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_xsd__dateTime(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__dateTime::__item = __item;
@@ -28378,7 +28579,7 @@ inline xsd__dateTime *soap_new_req_xsd__dateTime(struct soap *soap,
 inline xsd__dateTime *soap_new_set_xsd__dateTime(struct soap *soap,
                                                  time_t __item, char *__item1) {
   xsd__dateTime *_p =
-      soap_instantiate_xsd__dateTime(soap, -1, NULL, NULL, NULL);
+      soap_instantiate_xsd__dateTime(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__dateTime::__item = __item;
@@ -28430,11 +28631,12 @@ soap_instantiate_xsd__boolean(struct soap *, int, const char *, const char *,
                               size_t *);
 
 inline xsd__boolean *soap_new_xsd__boolean(struct soap *soap, int n = -1) {
-  return soap_instantiate_xsd__boolean(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_xsd__boolean(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline xsd__boolean *soap_new_req_xsd__boolean(struct soap *soap, bool __item) {
-  xsd__boolean *_p = soap_instantiate_xsd__boolean(soap, -1, NULL, NULL, NULL);
+  xsd__boolean *_p =
+      soap_instantiate_xsd__boolean(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__boolean::__item = __item;
@@ -28444,7 +28646,8 @@ inline xsd__boolean *soap_new_req_xsd__boolean(struct soap *soap, bool __item) {
 
 inline xsd__boolean *soap_new_set_xsd__boolean(struct soap *soap, bool __item,
                                                char *__item1) {
-  xsd__boolean *_p = soap_instantiate_xsd__boolean(soap, -1, NULL, NULL, NULL);
+  xsd__boolean *_p =
+      soap_instantiate_xsd__boolean(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__boolean::__item = __item;
@@ -28496,11 +28699,12 @@ soap_instantiate_xsd__anyType(struct soap *, int, const char *, const char *,
                               size_t *);
 
 inline xsd__anyType *soap_new_xsd__anyType(struct soap *soap, int n = -1) {
-  return soap_instantiate_xsd__anyType(soap, n, NULL, NULL, NULL);
+  return soap_instantiate_xsd__anyType(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline xsd__anyType *soap_new_req_xsd__anyType(struct soap *soap) {
-  xsd__anyType *_p = soap_instantiate_xsd__anyType(soap, -1, NULL, NULL, NULL);
+  xsd__anyType *_p =
+      soap_instantiate_xsd__anyType(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
   }
@@ -28509,7 +28713,8 @@ inline xsd__anyType *soap_new_req_xsd__anyType(struct soap *soap) {
 
 inline xsd__anyType *soap_new_set_xsd__anyType(struct soap *soap,
                                                char *__item) {
-  xsd__anyType *_p = soap_instantiate_xsd__anyType(soap, -1, NULL, NULL, NULL);
+  xsd__anyType *_p =
+      soap_instantiate_xsd__anyType(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     _p->soap_default(soap);
     _p->xsd__anyType::__item = __item;
@@ -28914,15 +29119,15 @@ soap_instantiate___ns1__searchFacilityUserByRestriction(struct soap *, int,
 
 inline struct __ns1__searchFacilityUserByRestriction *
 soap_new___ns1__searchFacilityUserByRestriction(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchFacilityUserByRestriction(soap, n, NULL,
-                                                                 NULL, NULL);
+  return soap_instantiate___ns1__searchFacilityUserByRestriction(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchFacilityUserByRestriction *
 soap_new_req___ns1__searchFacilityUserByRestriction(struct soap *soap) {
   struct __ns1__searchFacilityUserByRestriction *_p =
-      soap_instantiate___ns1__searchFacilityUserByRestriction(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate___ns1__searchFacilityUserByRestriction(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchFacilityUserByRestriction(soap, _p);
   }
@@ -28934,8 +29139,8 @@ soap_new_set___ns1__searchFacilityUserByRestriction(
     struct soap *soap, ns1__searchFacilityUserByRestriction *
                            ns1__searchFacilityUserByRestriction_) {
   struct __ns1__searchFacilityUserByRestriction *_p =
-      soap_instantiate___ns1__searchFacilityUserByRestriction(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate___ns1__searchFacilityUserByRestriction(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchFacilityUserByRestriction(soap, _p);
     _p->ns1__searchFacilityUserByRestriction_ =
@@ -29004,15 +29209,15 @@ soap_instantiate___ns1__searchSampleByParameterLogical(struct soap *, int,
 
 inline struct __ns1__searchSampleByParameterLogical *
 soap_new___ns1__searchSampleByParameterLogical(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchSampleByParameterLogical(soap, n, NULL,
-                                                                NULL, NULL);
+  return soap_instantiate___ns1__searchSampleByParameterLogical(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchSampleByParameterLogical *
 soap_new_req___ns1__searchSampleByParameterLogical(struct soap *soap) {
   struct __ns1__searchSampleByParameterLogical *_p =
-      soap_instantiate___ns1__searchSampleByParameterLogical(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate___ns1__searchSampleByParameterLogical(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByParameterLogical(soap, _p);
   }
@@ -29024,8 +29229,8 @@ soap_new_set___ns1__searchSampleByParameterLogical(
     struct soap *soap,
     ns1__searchSampleByParameterLogical *ns1__searchSampleByParameterLogical_) {
   struct __ns1__searchSampleByParameterLogical *_p =
-      soap_instantiate___ns1__searchSampleByParameterLogical(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate___ns1__searchSampleByParameterLogical(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByParameterLogical(soap, _p);
     _p->ns1__searchSampleByParameterLogical_ =
@@ -29094,15 +29299,15 @@ soap_instantiate___ns1__searchDatasetByParameterLogical(struct soap *, int,
 
 inline struct __ns1__searchDatasetByParameterLogical *
 soap_new___ns1__searchDatasetByParameterLogical(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchDatasetByParameterLogical(soap, n, NULL,
-                                                                 NULL, NULL);
+  return soap_instantiate___ns1__searchDatasetByParameterLogical(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatasetByParameterLogical *
 soap_new_req___ns1__searchDatasetByParameterLogical(struct soap *soap) {
   struct __ns1__searchDatasetByParameterLogical *_p =
-      soap_instantiate___ns1__searchDatasetByParameterLogical(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate___ns1__searchDatasetByParameterLogical(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByParameterLogical(soap, _p);
   }
@@ -29114,8 +29319,8 @@ soap_new_set___ns1__searchDatasetByParameterLogical(
     struct soap *soap, ns1__searchDatasetByParameterLogical *
                            ns1__searchDatasetByParameterLogical_) {
   struct __ns1__searchDatasetByParameterLogical *_p =
-      soap_instantiate___ns1__searchDatasetByParameterLogical(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate___ns1__searchDatasetByParameterLogical(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByParameterLogical(soap, _p);
     _p->ns1__searchDatasetByParameterLogical_ =
@@ -29187,15 +29392,15 @@ soap_instantiate___ns1__searchDatafileByParameterLogical(struct soap *, int,
 inline struct __ns1__searchDatafileByParameterLogical *
 soap_new___ns1__searchDatafileByParameterLogical(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate___ns1__searchDatafileByParameterLogical(soap, n, NULL,
-                                                                  NULL, NULL);
+  return soap_instantiate___ns1__searchDatafileByParameterLogical(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatafileByParameterLogical *
 soap_new_req___ns1__searchDatafileByParameterLogical(struct soap *soap) {
   struct __ns1__searchDatafileByParameterLogical *_p =
-      soap_instantiate___ns1__searchDatafileByParameterLogical(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate___ns1__searchDatafileByParameterLogical(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByParameterLogical(soap, _p);
   }
@@ -29207,8 +29412,8 @@ soap_new_set___ns1__searchDatafileByParameterLogical(
     struct soap *soap, ns1__searchDatafileByParameterLogical *
                            ns1__searchDatafileByParameterLogical_) {
   struct __ns1__searchDatafileByParameterLogical *_p =
-      soap_instantiate___ns1__searchDatafileByParameterLogical(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate___ns1__searchDatafileByParameterLogical(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByParameterLogical(soap, _p);
     _p->ns1__searchDatafileByParameterLogical_ =
@@ -29283,14 +29488,14 @@ inline struct __ns1__searchInvestigationByParameterLogical *
 soap_new___ns1__searchInvestigationByParameterLogical(struct soap *soap,
                                                       int n = -1) {
   return soap_instantiate___ns1__searchInvestigationByParameterLogical(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchInvestigationByParameterLogical *
 soap_new_req___ns1__searchInvestigationByParameterLogical(struct soap *soap) {
   struct __ns1__searchInvestigationByParameterLogical *_p =
       soap_instantiate___ns1__searchInvestigationByParameterLogical(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByParameterLogical(soap, _p);
   }
@@ -29303,7 +29508,7 @@ soap_new_set___ns1__searchInvestigationByParameterLogical(
                            ns1__searchInvestigationByParameterLogical_) {
   struct __ns1__searchInvestigationByParameterLogical *_p =
       soap_instantiate___ns1__searchInvestigationByParameterLogical(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByParameterLogical(soap, _p);
     _p->ns1__searchInvestigationByParameterLogical_ =
@@ -29378,14 +29583,14 @@ inline struct __ns1__searchDatafileByRestrictionLogical *
 soap_new___ns1__searchDatafileByRestrictionLogical(struct soap *soap,
                                                    int n = -1) {
   return soap_instantiate___ns1__searchDatafileByRestrictionLogical(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatafileByRestrictionLogical *
 soap_new_req___ns1__searchDatafileByRestrictionLogical(struct soap *soap) {
   struct __ns1__searchDatafileByRestrictionLogical *_p =
-      soap_instantiate___ns1__searchDatafileByRestrictionLogical(soap, -1, NULL,
-                                                                 NULL, NULL);
+      soap_instantiate___ns1__searchDatafileByRestrictionLogical(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByRestrictionLogical(soap, _p);
   }
@@ -29397,8 +29602,8 @@ soap_new_set___ns1__searchDatafileByRestrictionLogical(
     struct soap *soap, ns1__searchDatafileByRestrictionLogical *
                            ns1__searchDatafileByRestrictionLogical_) {
   struct __ns1__searchDatafileByRestrictionLogical *_p =
-      soap_instantiate___ns1__searchDatafileByRestrictionLogical(soap, -1, NULL,
-                                                                 NULL, NULL);
+      soap_instantiate___ns1__searchDatafileByRestrictionLogical(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByRestrictionLogical(soap, _p);
     _p->ns1__searchDatafileByRestrictionLogical_ =
@@ -29477,14 +29682,14 @@ inline struct __ns1__searchInvestigationByRestrictionLogical *
 soap_new___ns1__searchInvestigationByRestrictionLogical(struct soap *soap,
                                                         int n = -1) {
   return soap_instantiate___ns1__searchInvestigationByRestrictionLogical(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchInvestigationByRestrictionLogical *
 soap_new_req___ns1__searchInvestigationByRestrictionLogical(struct soap *soap) {
   struct __ns1__searchInvestigationByRestrictionLogical *_p =
       soap_instantiate___ns1__searchInvestigationByRestrictionLogical(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByRestrictionLogical(soap, _p);
   }
@@ -29497,7 +29702,7 @@ soap_new_set___ns1__searchInvestigationByRestrictionLogical(
                            ns1__searchInvestigationByRestrictionLogical_) {
   struct __ns1__searchInvestigationByRestrictionLogical *_p =
       soap_instantiate___ns1__searchInvestigationByRestrictionLogical(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByRestrictionLogical(soap, _p);
     _p->ns1__searchInvestigationByRestrictionLogical_ =
@@ -29572,14 +29777,14 @@ inline struct __ns1__searchDatasetByRestrictionLogical *
 soap_new___ns1__searchDatasetByRestrictionLogical(struct soap *soap,
                                                   int n = -1) {
   return soap_instantiate___ns1__searchDatasetByRestrictionLogical(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatasetByRestrictionLogical *
 soap_new_req___ns1__searchDatasetByRestrictionLogical(struct soap *soap) {
   struct __ns1__searchDatasetByRestrictionLogical *_p =
-      soap_instantiate___ns1__searchDatasetByRestrictionLogical(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate___ns1__searchDatasetByRestrictionLogical(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByRestrictionLogical(soap, _p);
   }
@@ -29591,8 +29796,8 @@ soap_new_set___ns1__searchDatasetByRestrictionLogical(
     struct soap *soap, ns1__searchDatasetByRestrictionLogical *
                            ns1__searchDatasetByRestrictionLogical_) {
   struct __ns1__searchDatasetByRestrictionLogical *_p =
-      soap_instantiate___ns1__searchDatasetByRestrictionLogical(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate___ns1__searchDatasetByRestrictionLogical(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByRestrictionLogical(soap, _p);
     _p->ns1__searchDatasetByRestrictionLogical_ =
@@ -29664,15 +29869,15 @@ soap_instantiate___ns1__searchSampleByRestrictionLogical(struct soap *, int,
 inline struct __ns1__searchSampleByRestrictionLogical *
 soap_new___ns1__searchSampleByRestrictionLogical(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate___ns1__searchSampleByRestrictionLogical(soap, n, NULL,
-                                                                  NULL, NULL);
+  return soap_instantiate___ns1__searchSampleByRestrictionLogical(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchSampleByRestrictionLogical *
 soap_new_req___ns1__searchSampleByRestrictionLogical(struct soap *soap) {
   struct __ns1__searchSampleByRestrictionLogical *_p =
-      soap_instantiate___ns1__searchSampleByRestrictionLogical(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate___ns1__searchSampleByRestrictionLogical(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByRestrictionLogical(soap, _p);
   }
@@ -29684,8 +29889,8 @@ soap_new_set___ns1__searchSampleByRestrictionLogical(
     struct soap *soap, ns1__searchSampleByRestrictionLogical *
                            ns1__searchSampleByRestrictionLogical_) {
   struct __ns1__searchSampleByRestrictionLogical *_p =
-      soap_instantiate___ns1__searchSampleByRestrictionLogical(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate___ns1__searchSampleByRestrictionLogical(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByRestrictionLogical(soap, _p);
     _p->ns1__searchSampleByRestrictionLogical_ =
@@ -29760,14 +29965,14 @@ inline struct __ns1__searchSampleByRestrictionComparison *
 soap_new___ns1__searchSampleByRestrictionComparison(struct soap *soap,
                                                     int n = -1) {
   return soap_instantiate___ns1__searchSampleByRestrictionComparison(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchSampleByRestrictionComparison *
 soap_new_req___ns1__searchSampleByRestrictionComparison(struct soap *soap) {
   struct __ns1__searchSampleByRestrictionComparison *_p =
       soap_instantiate___ns1__searchSampleByRestrictionComparison(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByRestrictionComparison(soap, _p);
   }
@@ -29780,7 +29985,7 @@ soap_new_set___ns1__searchSampleByRestrictionComparison(
                            ns1__searchSampleByRestrictionComparison_) {
   struct __ns1__searchSampleByRestrictionComparison *_p =
       soap_instantiate___ns1__searchSampleByRestrictionComparison(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByRestrictionComparison(soap, _p);
     _p->ns1__searchSampleByRestrictionComparison_ =
@@ -29855,14 +30060,14 @@ inline struct __ns1__searchDatafileByRestrictionComparison *
 soap_new___ns1__searchDatafileByRestrictionComparison(struct soap *soap,
                                                       int n = -1) {
   return soap_instantiate___ns1__searchDatafileByRestrictionComparison(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatafileByRestrictionComparison *
 soap_new_req___ns1__searchDatafileByRestrictionComparison(struct soap *soap) {
   struct __ns1__searchDatafileByRestrictionComparison *_p =
       soap_instantiate___ns1__searchDatafileByRestrictionComparison(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByRestrictionComparison(soap, _p);
   }
@@ -29875,7 +30080,7 @@ soap_new_set___ns1__searchDatafileByRestrictionComparison(
                            ns1__searchDatafileByRestrictionComparison_) {
   struct __ns1__searchDatafileByRestrictionComparison *_p =
       soap_instantiate___ns1__searchDatafileByRestrictionComparison(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByRestrictionComparison(soap, _p);
     _p->ns1__searchDatafileByRestrictionComparison_ =
@@ -29950,14 +30155,14 @@ inline struct __ns1__searchDatasetByRestrictionComparison *
 soap_new___ns1__searchDatasetByRestrictionComparison(struct soap *soap,
                                                      int n = -1) {
   return soap_instantiate___ns1__searchDatasetByRestrictionComparison(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatasetByRestrictionComparison *
 soap_new_req___ns1__searchDatasetByRestrictionComparison(struct soap *soap) {
   struct __ns1__searchDatasetByRestrictionComparison *_p =
       soap_instantiate___ns1__searchDatasetByRestrictionComparison(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByRestrictionComparison(soap, _p);
   }
@@ -29970,7 +30175,7 @@ soap_new_set___ns1__searchDatasetByRestrictionComparison(
                            ns1__searchDatasetByRestrictionComparison_) {
   struct __ns1__searchDatasetByRestrictionComparison *_p =
       soap_instantiate___ns1__searchDatasetByRestrictionComparison(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByRestrictionComparison(soap, _p);
     _p->ns1__searchDatasetByRestrictionComparison_ =
@@ -30052,7 +30257,7 @@ inline struct __ns1__searchInvestigationByRestrictionComparasion *
 soap_new___ns1__searchInvestigationByRestrictionComparasion(struct soap *soap,
                                                             int n = -1) {
   return soap_instantiate___ns1__searchInvestigationByRestrictionComparasion(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchInvestigationByRestrictionComparasion *
@@ -30060,7 +30265,7 @@ soap_new_req___ns1__searchInvestigationByRestrictionComparasion(
     struct soap *soap) {
   struct __ns1__searchInvestigationByRestrictionComparasion *_p =
       soap_instantiate___ns1__searchInvestigationByRestrictionComparasion(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByRestrictionComparasion(soap, _p);
   }
@@ -30073,7 +30278,7 @@ soap_new_set___ns1__searchInvestigationByRestrictionComparasion(
                            ns1__searchInvestigationByRestrictionComparasion_) {
   struct __ns1__searchInvestigationByRestrictionComparasion *_p =
       soap_instantiate___ns1__searchInvestigationByRestrictionComparasion(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByRestrictionComparasion(soap, _p);
     _p->ns1__searchInvestigationByRestrictionComparasion_ =
@@ -30142,15 +30347,15 @@ soap_instantiate___ns1__searchSampleByRestriction(struct soap *, int,
 
 inline struct __ns1__searchSampleByRestriction *
 soap_new___ns1__searchSampleByRestriction(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchSampleByRestriction(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate___ns1__searchSampleByRestriction(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline struct __ns1__searchSampleByRestriction *
 soap_new_req___ns1__searchSampleByRestriction(struct soap *soap) {
   struct __ns1__searchSampleByRestriction *_p =
-      soap_instantiate___ns1__searchSampleByRestriction(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__searchSampleByRestriction(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByRestriction(soap, _p);
   }
@@ -30162,8 +30367,8 @@ soap_new_set___ns1__searchSampleByRestriction(
     struct soap *soap,
     ns1__searchSampleByRestriction *ns1__searchSampleByRestriction_) {
   struct __ns1__searchSampleByRestriction *_p =
-      soap_instantiate___ns1__searchSampleByRestriction(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__searchSampleByRestriction(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByRestriction(soap, _p);
     _p->ns1__searchSampleByRestriction_ = ns1__searchSampleByRestriction_;
@@ -30230,15 +30435,15 @@ soap_instantiate___ns1__searchDatafileByRestriction(struct soap *, int,
 
 inline struct __ns1__searchDatafileByRestriction *
 soap_new___ns1__searchDatafileByRestriction(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchDatafileByRestriction(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate___ns1__searchDatafileByRestriction(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatafileByRestriction *
 soap_new_req___ns1__searchDatafileByRestriction(struct soap *soap) {
   struct __ns1__searchDatafileByRestriction *_p =
-      soap_instantiate___ns1__searchDatafileByRestriction(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__searchDatafileByRestriction(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByRestriction(soap, _p);
   }
@@ -30250,8 +30455,8 @@ soap_new_set___ns1__searchDatafileByRestriction(
     struct soap *soap,
     ns1__searchDatafileByRestriction *ns1__searchDatafileByRestriction_) {
   struct __ns1__searchDatafileByRestriction *_p =
-      soap_instantiate___ns1__searchDatafileByRestriction(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__searchDatafileByRestriction(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByRestriction(soap, _p);
     _p->ns1__searchDatafileByRestriction_ = ns1__searchDatafileByRestriction_;
@@ -30318,15 +30523,15 @@ soap_instantiate___ns1__searchDatasetByRestriction(struct soap *, int,
 
 inline struct __ns1__searchDatasetByRestriction *
 soap_new___ns1__searchDatasetByRestriction(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchDatasetByRestriction(soap, n, NULL, NULL,
-                                                            NULL);
+  return soap_instantiate___ns1__searchDatasetByRestriction(soap, n, nullptr,
+                                                            nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatasetByRestriction *
 soap_new_req___ns1__searchDatasetByRestriction(struct soap *soap) {
   struct __ns1__searchDatasetByRestriction *_p =
-      soap_instantiate___ns1__searchDatasetByRestriction(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate___ns1__searchDatasetByRestriction(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByRestriction(soap, _p);
   }
@@ -30338,8 +30543,8 @@ soap_new_set___ns1__searchDatasetByRestriction(
     struct soap *soap,
     ns1__searchDatasetByRestriction *ns1__searchDatasetByRestriction_) {
   struct __ns1__searchDatasetByRestriction *_p =
-      soap_instantiate___ns1__searchDatasetByRestriction(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate___ns1__searchDatasetByRestriction(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByRestriction(soap, _p);
     _p->ns1__searchDatasetByRestriction_ = ns1__searchDatasetByRestriction_;
@@ -30409,15 +30614,15 @@ soap_instantiate___ns1__searchInvestigationByRestriction(struct soap *, int,
 inline struct __ns1__searchInvestigationByRestriction *
 soap_new___ns1__searchInvestigationByRestriction(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate___ns1__searchInvestigationByRestriction(soap, n, NULL,
-                                                                  NULL, NULL);
+  return soap_instantiate___ns1__searchInvestigationByRestriction(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchInvestigationByRestriction *
 soap_new_req___ns1__searchInvestigationByRestriction(struct soap *soap) {
   struct __ns1__searchInvestigationByRestriction *_p =
-      soap_instantiate___ns1__searchInvestigationByRestriction(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate___ns1__searchInvestigationByRestriction(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByRestriction(soap, _p);
   }
@@ -30429,8 +30634,8 @@ soap_new_set___ns1__searchInvestigationByRestriction(
     struct soap *soap, ns1__searchInvestigationByRestriction *
                            ns1__searchInvestigationByRestriction_) {
   struct __ns1__searchInvestigationByRestriction *_p =
-      soap_instantiate___ns1__searchInvestigationByRestriction(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate___ns1__searchInvestigationByRestriction(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByRestriction(soap, _p);
     _p->ns1__searchInvestigationByRestriction_ =
@@ -30510,7 +30715,7 @@ inline struct __ns1__searchInvestigationByParameterRestriction *
 soap_new___ns1__searchInvestigationByParameterRestriction(struct soap *soap,
                                                           int n = -1) {
   return soap_instantiate___ns1__searchInvestigationByParameterRestriction(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchInvestigationByParameterRestriction *
@@ -30518,7 +30723,7 @@ soap_new_req___ns1__searchInvestigationByParameterRestriction(
     struct soap *soap) {
   struct __ns1__searchInvestigationByParameterRestriction *_p =
       soap_instantiate___ns1__searchInvestigationByParameterRestriction(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByParameterRestriction(soap, _p);
   }
@@ -30531,7 +30736,7 @@ soap_new_set___ns1__searchInvestigationByParameterRestriction(
                            ns1__searchInvestigationByParameterRestriction_) {
   struct __ns1__searchInvestigationByParameterRestriction *_p =
       soap_instantiate___ns1__searchInvestigationByParameterRestriction(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByParameterRestriction(soap, _p);
     _p->ns1__searchInvestigationByParameterRestriction_ =
@@ -30608,14 +30813,14 @@ inline struct __ns1__searchDatafileByParameterRestriction *
 soap_new___ns1__searchDatafileByParameterRestriction(struct soap *soap,
                                                      int n = -1) {
   return soap_instantiate___ns1__searchDatafileByParameterRestriction(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatafileByParameterRestriction *
 soap_new_req___ns1__searchDatafileByParameterRestriction(struct soap *soap) {
   struct __ns1__searchDatafileByParameterRestriction *_p =
       soap_instantiate___ns1__searchDatafileByParameterRestriction(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByParameterRestriction(soap, _p);
   }
@@ -30628,7 +30833,7 @@ soap_new_set___ns1__searchDatafileByParameterRestriction(
                            ns1__searchDatafileByParameterRestriction_) {
   struct __ns1__searchDatafileByParameterRestriction *_p =
       soap_instantiate___ns1__searchDatafileByParameterRestriction(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByParameterRestriction(soap, _p);
     _p->ns1__searchDatafileByParameterRestriction_ =
@@ -30703,14 +30908,14 @@ inline struct __ns1__searchSampleByParameterRestriction *
 soap_new___ns1__searchSampleByParameterRestriction(struct soap *soap,
                                                    int n = -1) {
   return soap_instantiate___ns1__searchSampleByParameterRestriction(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchSampleByParameterRestriction *
 soap_new_req___ns1__searchSampleByParameterRestriction(struct soap *soap) {
   struct __ns1__searchSampleByParameterRestriction *_p =
-      soap_instantiate___ns1__searchSampleByParameterRestriction(soap, -1, NULL,
-                                                                 NULL, NULL);
+      soap_instantiate___ns1__searchSampleByParameterRestriction(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByParameterRestriction(soap, _p);
   }
@@ -30722,8 +30927,8 @@ soap_new_set___ns1__searchSampleByParameterRestriction(
     struct soap *soap, ns1__searchSampleByParameterRestriction *
                            ns1__searchSampleByParameterRestriction_) {
   struct __ns1__searchSampleByParameterRestriction *_p =
-      soap_instantiate___ns1__searchSampleByParameterRestriction(soap, -1, NULL,
-                                                                 NULL, NULL);
+      soap_instantiate___ns1__searchSampleByParameterRestriction(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByParameterRestriction(soap, _p);
     _p->ns1__searchSampleByParameterRestriction_ =
@@ -30798,14 +31003,14 @@ inline struct __ns1__searchDatasetByParameterRestriction *
 soap_new___ns1__searchDatasetByParameterRestriction(struct soap *soap,
                                                     int n = -1) {
   return soap_instantiate___ns1__searchDatasetByParameterRestriction(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatasetByParameterRestriction *
 soap_new_req___ns1__searchDatasetByParameterRestriction(struct soap *soap) {
   struct __ns1__searchDatasetByParameterRestriction *_p =
       soap_instantiate___ns1__searchDatasetByParameterRestriction(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByParameterRestriction(soap, _p);
   }
@@ -30818,7 +31023,7 @@ soap_new_set___ns1__searchDatasetByParameterRestriction(
                            ns1__searchDatasetByParameterRestriction_) {
   struct __ns1__searchDatasetByParameterRestriction *_p =
       soap_instantiate___ns1__searchDatasetByParameterRestriction(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByParameterRestriction(soap, _p);
     _p->ns1__searchDatasetByParameterRestriction_ =
@@ -30888,13 +31093,15 @@ soap_instantiate___ns1__getParameterByUnits(struct soap *, int, const char *,
 
 inline struct __ns1__getParameterByUnits *
 soap_new___ns1__getParameterByUnits(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getParameterByUnits(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getParameterByUnits(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline struct __ns1__getParameterByUnits *
 soap_new_req___ns1__getParameterByUnits(struct soap *soap) {
   struct __ns1__getParameterByUnits *_p =
-      soap_instantiate___ns1__getParameterByUnits(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getParameterByUnits(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__getParameterByUnits(soap, _p);
   }
@@ -30905,7 +31112,8 @@ inline struct __ns1__getParameterByUnits *
 soap_new_set___ns1__getParameterByUnits(
     struct soap *soap, ns1__getParameterByUnits *ns1__getParameterByUnits_) {
   struct __ns1__getParameterByUnits *_p =
-      soap_instantiate___ns1__getParameterByUnits(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getParameterByUnits(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__getParameterByUnits(soap, _p);
     _p->ns1__getParameterByUnits_ = ns1__getParameterByUnits_;
@@ -30973,15 +31181,15 @@ soap_instantiate___ns1__getParameterByRestriction(struct soap *, int,
 
 inline struct __ns1__getParameterByRestriction *
 soap_new___ns1__getParameterByRestriction(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getParameterByRestriction(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate___ns1__getParameterByRestriction(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline struct __ns1__getParameterByRestriction *
 soap_new_req___ns1__getParameterByRestriction(struct soap *soap) {
   struct __ns1__getParameterByRestriction *_p =
-      soap_instantiate___ns1__getParameterByRestriction(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__getParameterByRestriction(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getParameterByRestriction(soap, _p);
   }
@@ -30993,8 +31201,8 @@ soap_new_set___ns1__getParameterByRestriction(
     struct soap *soap,
     ns1__getParameterByRestriction *ns1__getParameterByRestriction_) {
   struct __ns1__getParameterByRestriction *_p =
-      soap_instantiate___ns1__getParameterByRestriction(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__getParameterByRestriction(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getParameterByRestriction(soap, _p);
     _p->ns1__getParameterByRestriction_ = ns1__getParameterByRestriction_;
@@ -31062,13 +31270,15 @@ soap_instantiate___ns1__getParameterByName(struct soap *, int, const char *,
 
 inline struct __ns1__getParameterByName *
 soap_new___ns1__getParameterByName(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getParameterByName(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getParameterByName(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline struct __ns1__getParameterByName *
 soap_new_req___ns1__getParameterByName(struct soap *soap) {
   struct __ns1__getParameterByName *_p =
-      soap_instantiate___ns1__getParameterByName(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getParameterByName(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__getParameterByName(soap, _p);
   }
@@ -31078,7 +31288,8 @@ soap_new_req___ns1__getParameterByName(struct soap *soap) {
 inline struct __ns1__getParameterByName *soap_new_set___ns1__getParameterByName(
     struct soap *soap, ns1__getParameterByName *ns1__getParameterByName_) {
   struct __ns1__getParameterByName *_p =
-      soap_instantiate___ns1__getParameterByName(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getParameterByName(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__getParameterByName(soap, _p);
     _p->ns1__getParameterByName_ = ns1__getParameterByName_;
@@ -31146,15 +31357,15 @@ soap_instantiate___ns1__getParameterByNameUnits(struct soap *, int,
 
 inline struct __ns1__getParameterByNameUnits *
 soap_new___ns1__getParameterByNameUnits(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getParameterByNameUnits(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate___ns1__getParameterByNameUnits(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline struct __ns1__getParameterByNameUnits *
 soap_new_req___ns1__getParameterByNameUnits(struct soap *soap) {
   struct __ns1__getParameterByNameUnits *_p =
-      soap_instantiate___ns1__getParameterByNameUnits(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate___ns1__getParameterByNameUnits(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getParameterByNameUnits(soap, _p);
   }
@@ -31166,8 +31377,8 @@ soap_new_set___ns1__getParameterByNameUnits(
     struct soap *soap,
     ns1__getParameterByNameUnits *ns1__getParameterByNameUnits_) {
   struct __ns1__getParameterByNameUnits *_p =
-      soap_instantiate___ns1__getParameterByNameUnits(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate___ns1__getParameterByNameUnits(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getParameterByNameUnits(soap, _p);
     _p->ns1__getParameterByNameUnits_ = ns1__getParameterByNameUnits_;
@@ -31234,15 +31445,15 @@ soap_instantiate___ns1__searchSampleByParameter(struct soap *, int,
 
 inline struct __ns1__searchSampleByParameter *
 soap_new___ns1__searchSampleByParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchSampleByParameter(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate___ns1__searchSampleByParameter(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline struct __ns1__searchSampleByParameter *
 soap_new_req___ns1__searchSampleByParameter(struct soap *soap) {
   struct __ns1__searchSampleByParameter *_p =
-      soap_instantiate___ns1__searchSampleByParameter(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate___ns1__searchSampleByParameter(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByParameter(soap, _p);
   }
@@ -31254,8 +31465,8 @@ soap_new_set___ns1__searchSampleByParameter(
     struct soap *soap,
     ns1__searchSampleByParameter *ns1__searchSampleByParameter_) {
   struct __ns1__searchSampleByParameter *_p =
-      soap_instantiate___ns1__searchSampleByParameter(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate___ns1__searchSampleByParameter(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByParameter(soap, _p);
     _p->ns1__searchSampleByParameter_ = ns1__searchSampleByParameter_;
@@ -31322,15 +31533,15 @@ soap_instantiate___ns1__searchDatasetByParameter(struct soap *, int,
 
 inline struct __ns1__searchDatasetByParameter *
 soap_new___ns1__searchDatasetByParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchDatasetByParameter(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate___ns1__searchDatasetByParameter(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatasetByParameter *
 soap_new_req___ns1__searchDatasetByParameter(struct soap *soap) {
   struct __ns1__searchDatasetByParameter *_p =
-      soap_instantiate___ns1__searchDatasetByParameter(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate___ns1__searchDatasetByParameter(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByParameter(soap, _p);
   }
@@ -31342,8 +31553,8 @@ soap_new_set___ns1__searchDatasetByParameter(
     struct soap *soap,
     ns1__searchDatasetByParameter *ns1__searchDatasetByParameter_) {
   struct __ns1__searchDatasetByParameter *_p =
-      soap_instantiate___ns1__searchDatasetByParameter(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate___ns1__searchDatasetByParameter(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByParameter(soap, _p);
     _p->ns1__searchDatasetByParameter_ = ns1__searchDatasetByParameter_;
@@ -31410,15 +31621,15 @@ soap_instantiate___ns1__searchDatafileByParameter(struct soap *, int,
 
 inline struct __ns1__searchDatafileByParameter *
 soap_new___ns1__searchDatafileByParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchDatafileByParameter(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate___ns1__searchDatafileByParameter(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatafileByParameter *
 soap_new_req___ns1__searchDatafileByParameter(struct soap *soap) {
   struct __ns1__searchDatafileByParameter *_p =
-      soap_instantiate___ns1__searchDatafileByParameter(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__searchDatafileByParameter(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByParameter(soap, _p);
   }
@@ -31430,8 +31641,8 @@ soap_new_set___ns1__searchDatafileByParameter(
     struct soap *soap,
     ns1__searchDatafileByParameter *ns1__searchDatafileByParameter_) {
   struct __ns1__searchDatafileByParameter *_p =
-      soap_instantiate___ns1__searchDatafileByParameter(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__searchDatafileByParameter(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByParameter(soap, _p);
     _p->ns1__searchDatafileByParameter_ = ns1__searchDatafileByParameter_;
@@ -31498,15 +31709,15 @@ soap_instantiate___ns1__searchInvestigationByParameter(struct soap *, int,
 
 inline struct __ns1__searchInvestigationByParameter *
 soap_new___ns1__searchInvestigationByParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchInvestigationByParameter(soap, n, NULL,
-                                                                NULL, NULL);
+  return soap_instantiate___ns1__searchInvestigationByParameter(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchInvestigationByParameter *
 soap_new_req___ns1__searchInvestigationByParameter(struct soap *soap) {
   struct __ns1__searchInvestigationByParameter *_p =
-      soap_instantiate___ns1__searchInvestigationByParameter(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate___ns1__searchInvestigationByParameter(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByParameter(soap, _p);
   }
@@ -31518,8 +31729,8 @@ soap_new_set___ns1__searchInvestigationByParameter(
     struct soap *soap,
     ns1__searchInvestigationByParameter *ns1__searchInvestigationByParameter_) {
   struct __ns1__searchInvestigationByParameter *_p =
-      soap_instantiate___ns1__searchInvestigationByParameter(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate___ns1__searchInvestigationByParameter(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByParameter(soap, _p);
     _p->ns1__searchInvestigationByParameter_ =
@@ -31592,14 +31803,14 @@ inline struct __ns1__searchSampleByParameterComparison *
 soap_new___ns1__searchSampleByParameterComparison(struct soap *soap,
                                                   int n = -1) {
   return soap_instantiate___ns1__searchSampleByParameterComparison(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchSampleByParameterComparison *
 soap_new_req___ns1__searchSampleByParameterComparison(struct soap *soap) {
   struct __ns1__searchSampleByParameterComparison *_p =
-      soap_instantiate___ns1__searchSampleByParameterComparison(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate___ns1__searchSampleByParameterComparison(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByParameterComparison(soap, _p);
   }
@@ -31611,8 +31822,8 @@ soap_new_set___ns1__searchSampleByParameterComparison(
     struct soap *soap, ns1__searchSampleByParameterComparison *
                            ns1__searchSampleByParameterComparison_) {
   struct __ns1__searchSampleByParameterComparison *_p =
-      soap_instantiate___ns1__searchSampleByParameterComparison(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate___ns1__searchSampleByParameterComparison(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByParameterComparison(soap, _p);
     _p->ns1__searchSampleByParameterComparison_ =
@@ -31687,14 +31898,14 @@ inline struct __ns1__searchDatasetByParameterComparison *
 soap_new___ns1__searchDatasetByParameterComparison(struct soap *soap,
                                                    int n = -1) {
   return soap_instantiate___ns1__searchDatasetByParameterComparison(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatasetByParameterComparison *
 soap_new_req___ns1__searchDatasetByParameterComparison(struct soap *soap) {
   struct __ns1__searchDatasetByParameterComparison *_p =
-      soap_instantiate___ns1__searchDatasetByParameterComparison(soap, -1, NULL,
-                                                                 NULL, NULL);
+      soap_instantiate___ns1__searchDatasetByParameterComparison(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByParameterComparison(soap, _p);
   }
@@ -31706,8 +31917,8 @@ soap_new_set___ns1__searchDatasetByParameterComparison(
     struct soap *soap, ns1__searchDatasetByParameterComparison *
                            ns1__searchDatasetByParameterComparison_) {
   struct __ns1__searchDatasetByParameterComparison *_p =
-      soap_instantiate___ns1__searchDatasetByParameterComparison(soap, -1, NULL,
-                                                                 NULL, NULL);
+      soap_instantiate___ns1__searchDatasetByParameterComparison(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByParameterComparison(soap, _p);
     _p->ns1__searchDatasetByParameterComparison_ =
@@ -31782,14 +31993,14 @@ inline struct __ns1__searchDatafileByParameterComparison *
 soap_new___ns1__searchDatafileByParameterComparison(struct soap *soap,
                                                     int n = -1) {
   return soap_instantiate___ns1__searchDatafileByParameterComparison(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatafileByParameterComparison *
 soap_new_req___ns1__searchDatafileByParameterComparison(struct soap *soap) {
   struct __ns1__searchDatafileByParameterComparison *_p =
       soap_instantiate___ns1__searchDatafileByParameterComparison(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByParameterComparison(soap, _p);
   }
@@ -31802,7 +32013,7 @@ soap_new_set___ns1__searchDatafileByParameterComparison(
                            ns1__searchDatafileByParameterComparison_) {
   struct __ns1__searchDatafileByParameterComparison *_p =
       soap_instantiate___ns1__searchDatafileByParameterComparison(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByParameterComparison(soap, _p);
     _p->ns1__searchDatafileByParameterComparison_ =
@@ -31881,7 +32092,7 @@ inline struct __ns1__searchInvestigationByParameterComparison *
 soap_new___ns1__searchInvestigationByParameterComparison(struct soap *soap,
                                                          int n = -1) {
   return soap_instantiate___ns1__searchInvestigationByParameterComparison(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchInvestigationByParameterComparison *
@@ -31889,7 +32100,7 @@ soap_new_req___ns1__searchInvestigationByParameterComparison(
     struct soap *soap) {
   struct __ns1__searchInvestigationByParameterComparison *_p =
       soap_instantiate___ns1__searchInvestigationByParameterComparison(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByParameterComparison(soap, _p);
   }
@@ -31902,7 +32113,7 @@ soap_new_set___ns1__searchInvestigationByParameterComparison(
                            ns1__searchInvestigationByParameterComparison_) {
   struct __ns1__searchInvestigationByParameterComparison *_p =
       soap_instantiate___ns1__searchInvestigationByParameterComparison(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByParameterComparison(soap, _p);
     _p->ns1__searchInvestigationByParameterComparison_ =
@@ -31975,15 +32186,15 @@ soap_instantiate___ns1__searchSampleByParameterCondition(struct soap *, int,
 inline struct __ns1__searchSampleByParameterCondition *
 soap_new___ns1__searchSampleByParameterCondition(struct soap *soap,
                                                  int n = -1) {
-  return soap_instantiate___ns1__searchSampleByParameterCondition(soap, n, NULL,
-                                                                  NULL, NULL);
+  return soap_instantiate___ns1__searchSampleByParameterCondition(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchSampleByParameterCondition *
 soap_new_req___ns1__searchSampleByParameterCondition(struct soap *soap) {
   struct __ns1__searchSampleByParameterCondition *_p =
-      soap_instantiate___ns1__searchSampleByParameterCondition(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate___ns1__searchSampleByParameterCondition(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByParameterCondition(soap, _p);
   }
@@ -31995,8 +32206,8 @@ soap_new_set___ns1__searchSampleByParameterCondition(
     struct soap *soap, ns1__searchSampleByParameterCondition *
                            ns1__searchSampleByParameterCondition_) {
   struct __ns1__searchSampleByParameterCondition *_p =
-      soap_instantiate___ns1__searchSampleByParameterCondition(soap, -1, NULL,
-                                                               NULL, NULL);
+      soap_instantiate___ns1__searchSampleByParameterCondition(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSampleByParameterCondition(soap, _p);
     _p->ns1__searchSampleByParameterCondition_ =
@@ -32070,14 +32281,14 @@ inline struct __ns1__searchDatasetByParameterCondition *
 soap_new___ns1__searchDatasetByParameterCondition(struct soap *soap,
                                                   int n = -1) {
   return soap_instantiate___ns1__searchDatasetByParameterCondition(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatasetByParameterCondition *
 soap_new_req___ns1__searchDatasetByParameterCondition(struct soap *soap) {
   struct __ns1__searchDatasetByParameterCondition *_p =
-      soap_instantiate___ns1__searchDatasetByParameterCondition(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate___ns1__searchDatasetByParameterCondition(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByParameterCondition(soap, _p);
   }
@@ -32089,8 +32300,8 @@ soap_new_set___ns1__searchDatasetByParameterCondition(
     struct soap *soap, ns1__searchDatasetByParameterCondition *
                            ns1__searchDatasetByParameterCondition_) {
   struct __ns1__searchDatasetByParameterCondition *_p =
-      soap_instantiate___ns1__searchDatasetByParameterCondition(soap, -1, NULL,
-                                                                NULL, NULL);
+      soap_instantiate___ns1__searchDatasetByParameterCondition(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetByParameterCondition(soap, _p);
     _p->ns1__searchDatasetByParameterCondition_ =
@@ -32165,14 +32376,14 @@ inline struct __ns1__searchDatafileByParameterCondition *
 soap_new___ns1__searchDatafileByParameterCondition(struct soap *soap,
                                                    int n = -1) {
   return soap_instantiate___ns1__searchDatafileByParameterCondition(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatafileByParameterCondition *
 soap_new_req___ns1__searchDatafileByParameterCondition(struct soap *soap) {
   struct __ns1__searchDatafileByParameterCondition *_p =
-      soap_instantiate___ns1__searchDatafileByParameterCondition(soap, -1, NULL,
-                                                                 NULL, NULL);
+      soap_instantiate___ns1__searchDatafileByParameterCondition(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByParameterCondition(soap, _p);
   }
@@ -32184,8 +32395,8 @@ soap_new_set___ns1__searchDatafileByParameterCondition(
     struct soap *soap, ns1__searchDatafileByParameterCondition *
                            ns1__searchDatafileByParameterCondition_) {
   struct __ns1__searchDatafileByParameterCondition *_p =
-      soap_instantiate___ns1__searchDatafileByParameterCondition(soap, -1, NULL,
-                                                                 NULL, NULL);
+      soap_instantiate___ns1__searchDatafileByParameterCondition(
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchDatafileByParameterCondition(soap, _p);
     _p->ns1__searchDatafileByParameterCondition_ =
@@ -32264,14 +32475,14 @@ inline struct __ns1__searchInvestigationByParameterCondition *
 soap_new___ns1__searchInvestigationByParameterCondition(struct soap *soap,
                                                         int n = -1) {
   return soap_instantiate___ns1__searchInvestigationByParameterCondition(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchInvestigationByParameterCondition *
 soap_new_req___ns1__searchInvestigationByParameterCondition(struct soap *soap) {
   struct __ns1__searchInvestigationByParameterCondition *_p =
       soap_instantiate___ns1__searchInvestigationByParameterCondition(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByParameterCondition(soap, _p);
   }
@@ -32284,7 +32495,7 @@ soap_new_set___ns1__searchInvestigationByParameterCondition(
                            ns1__searchInvestigationByParameterCondition_) {
   struct __ns1__searchInvestigationByParameterCondition *_p =
       soap_instantiate___ns1__searchInvestigationByParameterCondition(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchInvestigationByParameterCondition(soap, _p);
     _p->ns1__searchInvestigationByParameterCondition_ =
@@ -32354,15 +32565,15 @@ soap_instantiate___ns1__getFacilityUserByFederalId(struct soap *, int,
 
 inline struct __ns1__getFacilityUserByFederalId *
 soap_new___ns1__getFacilityUserByFederalId(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getFacilityUserByFederalId(soap, n, NULL, NULL,
-                                                            NULL);
+  return soap_instantiate___ns1__getFacilityUserByFederalId(soap, n, nullptr,
+                                                            nullptr, nullptr);
 }
 
 inline struct __ns1__getFacilityUserByFederalId *
 soap_new_req___ns1__getFacilityUserByFederalId(struct soap *soap) {
   struct __ns1__getFacilityUserByFederalId *_p =
-      soap_instantiate___ns1__getFacilityUserByFederalId(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate___ns1__getFacilityUserByFederalId(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getFacilityUserByFederalId(soap, _p);
   }
@@ -32374,8 +32585,8 @@ soap_new_set___ns1__getFacilityUserByFederalId(
     struct soap *soap,
     ns1__getFacilityUserByFederalId *ns1__getFacilityUserByFederalId_) {
   struct __ns1__getFacilityUserByFederalId *_p =
-      soap_instantiate___ns1__getFacilityUserByFederalId(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate___ns1__getFacilityUserByFederalId(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getFacilityUserByFederalId(soap, _p);
     _p->ns1__getFacilityUserByFederalId_ = ns1__getFacilityUserByFederalId_;
@@ -32443,15 +32654,15 @@ soap_instantiate___ns1__getFacilityUserByFacilityUserId(struct soap *, int,
 
 inline struct __ns1__getFacilityUserByFacilityUserId *
 soap_new___ns1__getFacilityUserByFacilityUserId(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getFacilityUserByFacilityUserId(soap, n, NULL,
-                                                                 NULL, NULL);
+  return soap_instantiate___ns1__getFacilityUserByFacilityUserId(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__getFacilityUserByFacilityUserId *
 soap_new_req___ns1__getFacilityUserByFacilityUserId(struct soap *soap) {
   struct __ns1__getFacilityUserByFacilityUserId *_p =
-      soap_instantiate___ns1__getFacilityUserByFacilityUserId(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate___ns1__getFacilityUserByFacilityUserId(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getFacilityUserByFacilityUserId(soap, _p);
   }
@@ -32463,8 +32674,8 @@ soap_new_set___ns1__getFacilityUserByFacilityUserId(
     struct soap *soap, ns1__getFacilityUserByFacilityUserId *
                            ns1__getFacilityUserByFacilityUserId_) {
   struct __ns1__getFacilityUserByFacilityUserId *_p =
-      soap_instantiate___ns1__getFacilityUserByFacilityUserId(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate___ns1__getFacilityUserByFacilityUserId(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getFacilityUserByFacilityUserId(soap, _p);
     _p->ns1__getFacilityUserByFacilityUserId_ =
@@ -32533,13 +32744,15 @@ soap_instantiate___ns1__getICATAPIVersion(struct soap *, int, const char *,
 
 inline struct __ns1__getICATAPIVersion *
 soap_new___ns1__getICATAPIVersion(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getICATAPIVersion(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getICATAPIVersion(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline struct __ns1__getICATAPIVersion *
 soap_new_req___ns1__getICATAPIVersion(struct soap *soap) {
   struct __ns1__getICATAPIVersion *_p =
-      soap_instantiate___ns1__getICATAPIVersion(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getICATAPIVersion(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__getICATAPIVersion(soap, _p);
   }
@@ -32549,7 +32762,8 @@ soap_new_req___ns1__getICATAPIVersion(struct soap *soap) {
 inline struct __ns1__getICATAPIVersion *soap_new_set___ns1__getICATAPIVersion(
     struct soap *soap, ns1__getICATAPIVersion *ns1__getICATAPIVersion_) {
   struct __ns1__getICATAPIVersion *_p =
-      soap_instantiate___ns1__getICATAPIVersion(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getICATAPIVersion(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__getICATAPIVersion(soap, _p);
     _p->ns1__getICATAPIVersion_ = ns1__getICATAPIVersion_;
@@ -32617,15 +32831,15 @@ soap_instantiate___ns1__checkDatasetDownloadAccess(struct soap *, int,
 
 inline struct __ns1__checkDatasetDownloadAccess *
 soap_new___ns1__checkDatasetDownloadAccess(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__checkDatasetDownloadAccess(soap, n, NULL, NULL,
-                                                            NULL);
+  return soap_instantiate___ns1__checkDatasetDownloadAccess(soap, n, nullptr,
+                                                            nullptr, nullptr);
 }
 
 inline struct __ns1__checkDatasetDownloadAccess *
 soap_new_req___ns1__checkDatasetDownloadAccess(struct soap *soap) {
   struct __ns1__checkDatasetDownloadAccess *_p =
-      soap_instantiate___ns1__checkDatasetDownloadAccess(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate___ns1__checkDatasetDownloadAccess(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     soap_default___ns1__checkDatasetDownloadAccess(soap, _p);
   }
@@ -32637,8 +32851,8 @@ soap_new_set___ns1__checkDatasetDownloadAccess(
     struct soap *soap,
     ns1__checkDatasetDownloadAccess *ns1__checkDatasetDownloadAccess_) {
   struct __ns1__checkDatasetDownloadAccess *_p =
-      soap_instantiate___ns1__checkDatasetDownloadAccess(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate___ns1__checkDatasetDownloadAccess(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     soap_default___ns1__checkDatasetDownloadAccess(soap, _p);
     _p->ns1__checkDatasetDownloadAccess_ = ns1__checkDatasetDownloadAccess_;
@@ -32705,15 +32919,15 @@ soap_instantiate___ns1__checkDatafileDownloadAccess(struct soap *, int,
 
 inline struct __ns1__checkDatafileDownloadAccess *
 soap_new___ns1__checkDatafileDownloadAccess(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__checkDatafileDownloadAccess(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate___ns1__checkDatafileDownloadAccess(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline struct __ns1__checkDatafileDownloadAccess *
 soap_new_req___ns1__checkDatafileDownloadAccess(struct soap *soap) {
   struct __ns1__checkDatafileDownloadAccess *_p =
-      soap_instantiate___ns1__checkDatafileDownloadAccess(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__checkDatafileDownloadAccess(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__checkDatafileDownloadAccess(soap, _p);
   }
@@ -32725,8 +32939,8 @@ soap_new_set___ns1__checkDatafileDownloadAccess(
     struct soap *soap,
     ns1__checkDatafileDownloadAccess *ns1__checkDatafileDownloadAccess_) {
   struct __ns1__checkDatafileDownloadAccess *_p =
-      soap_instantiate___ns1__checkDatafileDownloadAccess(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__checkDatafileDownloadAccess(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__checkDatafileDownloadAccess(soap, _p);
     _p->ns1__checkDatafileDownloadAccess_ = ns1__checkDatafileDownloadAccess_;
@@ -32793,13 +33007,15 @@ soap_instantiate___ns1__downloadDatafiles(struct soap *, int, const char *,
 
 inline struct __ns1__downloadDatafiles *
 soap_new___ns1__downloadDatafiles(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__downloadDatafiles(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__downloadDatafiles(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline struct __ns1__downloadDatafiles *
 soap_new_req___ns1__downloadDatafiles(struct soap *soap) {
   struct __ns1__downloadDatafiles *_p =
-      soap_instantiate___ns1__downloadDatafiles(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__downloadDatafiles(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__downloadDatafiles(soap, _p);
   }
@@ -32809,7 +33025,8 @@ soap_new_req___ns1__downloadDatafiles(struct soap *soap) {
 inline struct __ns1__downloadDatafiles *soap_new_set___ns1__downloadDatafiles(
     struct soap *soap, ns1__downloadDatafiles *ns1__downloadDatafiles_) {
   struct __ns1__downloadDatafiles *_p =
-      soap_instantiate___ns1__downloadDatafiles(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__downloadDatafiles(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__downloadDatafiles(soap, _p);
     _p->ns1__downloadDatafiles_ = ns1__downloadDatafiles_;
@@ -32876,13 +33093,14 @@ soap_instantiate___ns1__downloadDataset(struct soap *, int, const char *,
 
 inline struct __ns1__downloadDataset *
 soap_new___ns1__downloadDataset(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__downloadDataset(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__downloadDataset(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline struct __ns1__downloadDataset *
 soap_new_req___ns1__downloadDataset(struct soap *soap) {
-  struct __ns1__downloadDataset *_p =
-      soap_instantiate___ns1__downloadDataset(soap, -1, NULL, NULL, NULL);
+  struct __ns1__downloadDataset *_p = soap_instantiate___ns1__downloadDataset(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__downloadDataset(soap, _p);
   }
@@ -32891,8 +33109,8 @@ soap_new_req___ns1__downloadDataset(struct soap *soap) {
 
 inline struct __ns1__downloadDataset *soap_new_set___ns1__downloadDataset(
     struct soap *soap, ns1__downloadDataset *ns1__downloadDataset_) {
-  struct __ns1__downloadDataset *_p =
-      soap_instantiate___ns1__downloadDataset(soap, -1, NULL, NULL, NULL);
+  struct __ns1__downloadDataset *_p = soap_instantiate___ns1__downloadDataset(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__downloadDataset(soap, _p);
     _p->ns1__downloadDataset_ = ns1__downloadDataset_;
@@ -32960,13 +33178,14 @@ soap_instantiate___ns1__downloadDatafile(struct soap *, int, const char *,
 
 inline struct __ns1__downloadDatafile *
 soap_new___ns1__downloadDatafile(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__downloadDatafile(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__downloadDatafile(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline struct __ns1__downloadDatafile *
 soap_new_req___ns1__downloadDatafile(struct soap *soap) {
-  struct __ns1__downloadDatafile *_p =
-      soap_instantiate___ns1__downloadDatafile(soap, -1, NULL, NULL, NULL);
+  struct __ns1__downloadDatafile *_p = soap_instantiate___ns1__downloadDatafile(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__downloadDatafile(soap, _p);
   }
@@ -32975,8 +33194,8 @@ soap_new_req___ns1__downloadDatafile(struct soap *soap) {
 
 inline struct __ns1__downloadDatafile *soap_new_set___ns1__downloadDatafile(
     struct soap *soap, ns1__downloadDatafile *ns1__downloadDatafile_) {
-  struct __ns1__downloadDatafile *_p =
-      soap_instantiate___ns1__downloadDatafile(soap, -1, NULL, NULL, NULL);
+  struct __ns1__downloadDatafile *_p = soap_instantiate___ns1__downloadDatafile(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__downloadDatafile(soap, _p);
     _p->ns1__downloadDatafile_ = ns1__downloadDatafile_;
@@ -33043,13 +33262,14 @@ soap_instantiate___ns1__ingestMetadata(struct soap *, int, const char *,
 
 inline struct __ns1__ingestMetadata *
 soap_new___ns1__ingestMetadata(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__ingestMetadata(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__ingestMetadata(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline struct __ns1__ingestMetadata *
 soap_new_req___ns1__ingestMetadata(struct soap *soap) {
-  struct __ns1__ingestMetadata *_p =
-      soap_instantiate___ns1__ingestMetadata(soap, -1, NULL, NULL, NULL);
+  struct __ns1__ingestMetadata *_p = soap_instantiate___ns1__ingestMetadata(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__ingestMetadata(soap, _p);
   }
@@ -33059,8 +33279,8 @@ soap_new_req___ns1__ingestMetadata(struct soap *soap) {
 inline struct __ns1__ingestMetadata *
 soap_new_set___ns1__ingestMetadata(struct soap *soap,
                                    ns1__ingestMetadata *ns1__ingestMetadata_) {
-  struct __ns1__ingestMetadata *_p =
-      soap_instantiate___ns1__ingestMetadata(soap, -1, NULL, NULL, NULL);
+  struct __ns1__ingestMetadata *_p = soap_instantiate___ns1__ingestMetadata(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__ingestMetadata(soap, _p);
     _p->ns1__ingestMetadata_ = ns1__ingestMetadata_;
@@ -33128,13 +33348,15 @@ soap_instantiate___ns1__updateAuthorisation(struct soap *, int, const char *,
 
 inline struct __ns1__updateAuthorisation *
 soap_new___ns1__updateAuthorisation(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__updateAuthorisation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__updateAuthorisation(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline struct __ns1__updateAuthorisation *
 soap_new_req___ns1__updateAuthorisation(struct soap *soap) {
   struct __ns1__updateAuthorisation *_p =
-      soap_instantiate___ns1__updateAuthorisation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__updateAuthorisation(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__updateAuthorisation(soap, _p);
   }
@@ -33145,7 +33367,8 @@ inline struct __ns1__updateAuthorisation *
 soap_new_set___ns1__updateAuthorisation(
     struct soap *soap, ns1__updateAuthorisation *ns1__updateAuthorisation_) {
   struct __ns1__updateAuthorisation *_p =
-      soap_instantiate___ns1__updateAuthorisation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__updateAuthorisation(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__updateAuthorisation(soap, _p);
     _p->ns1__updateAuthorisation_ = ns1__updateAuthorisation_;
@@ -33213,15 +33436,15 @@ soap_instantiate___ns1__updateAuthorisationResponse(struct soap *, int,
 
 inline struct __ns1__updateAuthorisationResponse *
 soap_new___ns1__updateAuthorisationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__updateAuthorisationResponse(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate___ns1__updateAuthorisationResponse(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline struct __ns1__updateAuthorisationResponse *
 soap_new_req___ns1__updateAuthorisationResponse(struct soap *soap) {
   struct __ns1__updateAuthorisationResponse *_p =
-      soap_instantiate___ns1__updateAuthorisationResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__updateAuthorisationResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__updateAuthorisationResponse(soap, _p);
   }
@@ -33233,8 +33456,8 @@ soap_new_set___ns1__updateAuthorisationResponse(
     struct soap *soap,
     ns1__updateAuthorisationResponse *ns1__updateAuthorisationResponse_) {
   struct __ns1__updateAuthorisationResponse *_p =
-      soap_instantiate___ns1__updateAuthorisationResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__updateAuthorisationResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__updateAuthorisationResponse(soap, _p);
     _p->ns1__updateAuthorisationResponse_ = ns1__updateAuthorisationResponse_;
@@ -33302,13 +33525,15 @@ soap_instantiate___ns1__removeAuthorisation(struct soap *, int, const char *,
 
 inline struct __ns1__removeAuthorisation *
 soap_new___ns1__removeAuthorisation(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeAuthorisation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__removeAuthorisation(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline struct __ns1__removeAuthorisation *
 soap_new_req___ns1__removeAuthorisation(struct soap *soap) {
   struct __ns1__removeAuthorisation *_p =
-      soap_instantiate___ns1__removeAuthorisation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeAuthorisation(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__removeAuthorisation(soap, _p);
   }
@@ -33319,7 +33544,8 @@ inline struct __ns1__removeAuthorisation *
 soap_new_set___ns1__removeAuthorisation(
     struct soap *soap, ns1__removeAuthorisation *ns1__removeAuthorisation_) {
   struct __ns1__removeAuthorisation *_p =
-      soap_instantiate___ns1__removeAuthorisation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeAuthorisation(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__removeAuthorisation(soap, _p);
     _p->ns1__removeAuthorisation_ = ns1__removeAuthorisation_;
@@ -33387,15 +33613,15 @@ soap_instantiate___ns1__removeAuthorisationResponse(struct soap *, int,
 
 inline struct __ns1__removeAuthorisationResponse *
 soap_new___ns1__removeAuthorisationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeAuthorisationResponse(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate___ns1__removeAuthorisationResponse(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline struct __ns1__removeAuthorisationResponse *
 soap_new_req___ns1__removeAuthorisationResponse(struct soap *soap) {
   struct __ns1__removeAuthorisationResponse *_p =
-      soap_instantiate___ns1__removeAuthorisationResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__removeAuthorisationResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeAuthorisationResponse(soap, _p);
   }
@@ -33407,8 +33633,8 @@ soap_new_set___ns1__removeAuthorisationResponse(
     struct soap *soap,
     ns1__removeAuthorisationResponse *ns1__removeAuthorisationResponse_) {
   struct __ns1__removeAuthorisationResponse *_p =
-      soap_instantiate___ns1__removeAuthorisationResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__removeAuthorisationResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeAuthorisationResponse(soap, _p);
     _p->ns1__removeAuthorisationResponse_ = ns1__removeAuthorisationResponse_;
@@ -33476,13 +33702,15 @@ soap_instantiate___ns1__deleteAuthorisation(struct soap *, int, const char *,
 
 inline struct __ns1__deleteAuthorisation *
 soap_new___ns1__deleteAuthorisation(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteAuthorisation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__deleteAuthorisation(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline struct __ns1__deleteAuthorisation *
 soap_new_req___ns1__deleteAuthorisation(struct soap *soap) {
   struct __ns1__deleteAuthorisation *_p =
-      soap_instantiate___ns1__deleteAuthorisation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteAuthorisation(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__deleteAuthorisation(soap, _p);
   }
@@ -33493,7 +33721,8 @@ inline struct __ns1__deleteAuthorisation *
 soap_new_set___ns1__deleteAuthorisation(
     struct soap *soap, ns1__deleteAuthorisation *ns1__deleteAuthorisation_) {
   struct __ns1__deleteAuthorisation *_p =
-      soap_instantiate___ns1__deleteAuthorisation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteAuthorisation(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__deleteAuthorisation(soap, _p);
     _p->ns1__deleteAuthorisation_ = ns1__deleteAuthorisation_;
@@ -33561,15 +33790,15 @@ soap_instantiate___ns1__deleteAuthorisationResponse(struct soap *, int,
 
 inline struct __ns1__deleteAuthorisationResponse *
 soap_new___ns1__deleteAuthorisationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteAuthorisationResponse(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate___ns1__deleteAuthorisationResponse(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline struct __ns1__deleteAuthorisationResponse *
 soap_new_req___ns1__deleteAuthorisationResponse(struct soap *soap) {
   struct __ns1__deleteAuthorisationResponse *_p =
-      soap_instantiate___ns1__deleteAuthorisationResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__deleteAuthorisationResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteAuthorisationResponse(soap, _p);
   }
@@ -33581,8 +33810,8 @@ soap_new_set___ns1__deleteAuthorisationResponse(
     struct soap *soap,
     ns1__deleteAuthorisationResponse *ns1__deleteAuthorisationResponse_) {
   struct __ns1__deleteAuthorisationResponse *_p =
-      soap_instantiate___ns1__deleteAuthorisationResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__deleteAuthorisationResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteAuthorisationResponse(soap, _p);
     _p->ns1__deleteAuthorisationResponse_ = ns1__deleteAuthorisationResponse_;
@@ -33649,13 +33878,14 @@ soap_instantiate___ns1__addAuthorisation(struct soap *, int, const char *,
 
 inline struct __ns1__addAuthorisation *
 soap_new___ns1__addAuthorisation(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__addAuthorisation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__addAuthorisation(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline struct __ns1__addAuthorisation *
 soap_new_req___ns1__addAuthorisation(struct soap *soap) {
-  struct __ns1__addAuthorisation *_p =
-      soap_instantiate___ns1__addAuthorisation(soap, -1, NULL, NULL, NULL);
+  struct __ns1__addAuthorisation *_p = soap_instantiate___ns1__addAuthorisation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__addAuthorisation(soap, _p);
   }
@@ -33664,8 +33894,8 @@ soap_new_req___ns1__addAuthorisation(struct soap *soap) {
 
 inline struct __ns1__addAuthorisation *soap_new_set___ns1__addAuthorisation(
     struct soap *soap, ns1__addAuthorisation *ns1__addAuthorisation_) {
-  struct __ns1__addAuthorisation *_p =
-      soap_instantiate___ns1__addAuthorisation(soap, -1, NULL, NULL, NULL);
+  struct __ns1__addAuthorisation *_p = soap_instantiate___ns1__addAuthorisation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__addAuthorisation(soap, _p);
     _p->ns1__addAuthorisation_ = ns1__addAuthorisation_;
@@ -33733,13 +33963,15 @@ soap_instantiate___ns1__getAuthorisations(struct soap *, int, const char *,
 
 inline struct __ns1__getAuthorisations *
 soap_new___ns1__getAuthorisations(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getAuthorisations(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getAuthorisations(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline struct __ns1__getAuthorisations *
 soap_new_req___ns1__getAuthorisations(struct soap *soap) {
   struct __ns1__getAuthorisations *_p =
-      soap_instantiate___ns1__getAuthorisations(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getAuthorisations(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__getAuthorisations(soap, _p);
   }
@@ -33749,7 +33981,8 @@ soap_new_req___ns1__getAuthorisations(struct soap *soap) {
 inline struct __ns1__getAuthorisations *soap_new_set___ns1__getAuthorisations(
     struct soap *soap, ns1__getAuthorisations *ns1__getAuthorisations_) {
   struct __ns1__getAuthorisations *_p =
-      soap_instantiate___ns1__getAuthorisations(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getAuthorisations(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__getAuthorisations(soap, _p);
     _p->ns1__getAuthorisations_ = ns1__getAuthorisations_;
@@ -33817,15 +34050,15 @@ soap_instantiate___ns1__removeDataFileParameter(struct soap *, int,
 
 inline struct __ns1__removeDataFileParameter *
 soap_new___ns1__removeDataFileParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeDataFileParameter(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate___ns1__removeDataFileParameter(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline struct __ns1__removeDataFileParameter *
 soap_new_req___ns1__removeDataFileParameter(struct soap *soap) {
   struct __ns1__removeDataFileParameter *_p =
-      soap_instantiate___ns1__removeDataFileParameter(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate___ns1__removeDataFileParameter(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeDataFileParameter(soap, _p);
   }
@@ -33837,8 +34070,8 @@ soap_new_set___ns1__removeDataFileParameter(
     struct soap *soap,
     ns1__removeDataFileParameter *ns1__removeDataFileParameter_) {
   struct __ns1__removeDataFileParameter *_p =
-      soap_instantiate___ns1__removeDataFileParameter(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate___ns1__removeDataFileParameter(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeDataFileParameter(soap, _p);
     _p->ns1__removeDataFileParameter_ = ns1__removeDataFileParameter_;
@@ -33906,15 +34139,15 @@ soap_instantiate___ns1__removeDataFileParameterResponse(struct soap *, int,
 
 inline struct __ns1__removeDataFileParameterResponse *
 soap_new___ns1__removeDataFileParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeDataFileParameterResponse(soap, n, NULL,
-                                                                 NULL, NULL);
+  return soap_instantiate___ns1__removeDataFileParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__removeDataFileParameterResponse *
 soap_new_req___ns1__removeDataFileParameterResponse(struct soap *soap) {
   struct __ns1__removeDataFileParameterResponse *_p =
-      soap_instantiate___ns1__removeDataFileParameterResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate___ns1__removeDataFileParameterResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeDataFileParameterResponse(soap, _p);
   }
@@ -33926,8 +34159,8 @@ soap_new_set___ns1__removeDataFileParameterResponse(
     struct soap *soap, ns1__removeDataFileParameterResponse *
                            ns1__removeDataFileParameterResponse_) {
   struct __ns1__removeDataFileParameterResponse *_p =
-      soap_instantiate___ns1__removeDataFileParameterResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate___ns1__removeDataFileParameterResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeDataFileParameterResponse(soap, _p);
     _p->ns1__removeDataFileParameterResponse_ =
@@ -33995,13 +34228,14 @@ soap_instantiate___ns1__removeDataFile(struct soap *, int, const char *,
 
 inline struct __ns1__removeDataFile *
 soap_new___ns1__removeDataFile(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeDataFile(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__removeDataFile(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline struct __ns1__removeDataFile *
 soap_new_req___ns1__removeDataFile(struct soap *soap) {
-  struct __ns1__removeDataFile *_p =
-      soap_instantiate___ns1__removeDataFile(soap, -1, NULL, NULL, NULL);
+  struct __ns1__removeDataFile *_p = soap_instantiate___ns1__removeDataFile(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeDataFile(soap, _p);
   }
@@ -34011,8 +34245,8 @@ soap_new_req___ns1__removeDataFile(struct soap *soap) {
 inline struct __ns1__removeDataFile *
 soap_new_set___ns1__removeDataFile(struct soap *soap,
                                    ns1__removeDataFile *ns1__removeDataFile_) {
-  struct __ns1__removeDataFile *_p =
-      soap_instantiate___ns1__removeDataFile(soap, -1, NULL, NULL, NULL);
+  struct __ns1__removeDataFile *_p = soap_instantiate___ns1__removeDataFile(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeDataFile(soap, _p);
     _p->ns1__removeDataFile_ = ns1__removeDataFile_;
@@ -34078,15 +34312,15 @@ soap_instantiate___ns1__removeDataFileResponse(struct soap *, int, const char *,
 
 inline struct __ns1__removeDataFileResponse *
 soap_new___ns1__removeDataFileResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeDataFileResponse(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate___ns1__removeDataFileResponse(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline struct __ns1__removeDataFileResponse *
 soap_new_req___ns1__removeDataFileResponse(struct soap *soap) {
   struct __ns1__removeDataFileResponse *_p =
-      soap_instantiate___ns1__removeDataFileResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__removeDataFileResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__removeDataFileResponse(soap, _p);
   }
@@ -34098,8 +34332,8 @@ soap_new_set___ns1__removeDataFileResponse(
     struct soap *soap,
     ns1__removeDataFileResponse *ns1__removeDataFileResponse_) {
   struct __ns1__removeDataFileResponse *_p =
-      soap_instantiate___ns1__removeDataFileResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__removeDataFileResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__removeDataFileResponse(soap, _p);
     _p->ns1__removeDataFileResponse_ = ns1__removeDataFileResponse_;
@@ -34166,15 +34400,15 @@ soap_instantiate___ns1__deleteDataFileParameter(struct soap *, int,
 
 inline struct __ns1__deleteDataFileParameter *
 soap_new___ns1__deleteDataFileParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteDataFileParameter(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate___ns1__deleteDataFileParameter(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline struct __ns1__deleteDataFileParameter *
 soap_new_req___ns1__deleteDataFileParameter(struct soap *soap) {
   struct __ns1__deleteDataFileParameter *_p =
-      soap_instantiate___ns1__deleteDataFileParameter(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate___ns1__deleteDataFileParameter(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteDataFileParameter(soap, _p);
   }
@@ -34186,8 +34420,8 @@ soap_new_set___ns1__deleteDataFileParameter(
     struct soap *soap,
     ns1__deleteDataFileParameter *ns1__deleteDataFileParameter_) {
   struct __ns1__deleteDataFileParameter *_p =
-      soap_instantiate___ns1__deleteDataFileParameter(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate___ns1__deleteDataFileParameter(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteDataFileParameter(soap, _p);
     _p->ns1__deleteDataFileParameter_ = ns1__deleteDataFileParameter_;
@@ -34255,15 +34489,15 @@ soap_instantiate___ns1__deleteDataFileParameterResponse(struct soap *, int,
 
 inline struct __ns1__deleteDataFileParameterResponse *
 soap_new___ns1__deleteDataFileParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteDataFileParameterResponse(soap, n, NULL,
-                                                                 NULL, NULL);
+  return soap_instantiate___ns1__deleteDataFileParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__deleteDataFileParameterResponse *
 soap_new_req___ns1__deleteDataFileParameterResponse(struct soap *soap) {
   struct __ns1__deleteDataFileParameterResponse *_p =
-      soap_instantiate___ns1__deleteDataFileParameterResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate___ns1__deleteDataFileParameterResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteDataFileParameterResponse(soap, _p);
   }
@@ -34275,8 +34509,8 @@ soap_new_set___ns1__deleteDataFileParameterResponse(
     struct soap *soap, ns1__deleteDataFileParameterResponse *
                            ns1__deleteDataFileParameterResponse_) {
   struct __ns1__deleteDataFileParameterResponse *_p =
-      soap_instantiate___ns1__deleteDataFileParameterResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate___ns1__deleteDataFileParameterResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteDataFileParameterResponse(soap, _p);
     _p->ns1__deleteDataFileParameterResponse_ =
@@ -34345,15 +34579,15 @@ soap_instantiate___ns1__modifyDataFileParameter(struct soap *, int,
 
 inline struct __ns1__modifyDataFileParameter *
 soap_new___ns1__modifyDataFileParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifyDataFileParameter(soap, n, NULL, NULL,
-                                                         NULL);
+  return soap_instantiate___ns1__modifyDataFileParameter(soap, n, nullptr,
+                                                         nullptr, nullptr);
 }
 
 inline struct __ns1__modifyDataFileParameter *
 soap_new_req___ns1__modifyDataFileParameter(struct soap *soap) {
   struct __ns1__modifyDataFileParameter *_p =
-      soap_instantiate___ns1__modifyDataFileParameter(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate___ns1__modifyDataFileParameter(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyDataFileParameter(soap, _p);
   }
@@ -34365,8 +34599,8 @@ soap_new_set___ns1__modifyDataFileParameter(
     struct soap *soap,
     ns1__modifyDataFileParameter *ns1__modifyDataFileParameter_) {
   struct __ns1__modifyDataFileParameter *_p =
-      soap_instantiate___ns1__modifyDataFileParameter(soap, -1, NULL, NULL,
-                                                      NULL);
+      soap_instantiate___ns1__modifyDataFileParameter(soap, -1, nullptr,
+                                                      nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyDataFileParameter(soap, _p);
     _p->ns1__modifyDataFileParameter_ = ns1__modifyDataFileParameter_;
@@ -34434,15 +34668,15 @@ soap_instantiate___ns1__modifyDataFileParameterResponse(struct soap *, int,
 
 inline struct __ns1__modifyDataFileParameterResponse *
 soap_new___ns1__modifyDataFileParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifyDataFileParameterResponse(soap, n, NULL,
-                                                                 NULL, NULL);
+  return soap_instantiate___ns1__modifyDataFileParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__modifyDataFileParameterResponse *
 soap_new_req___ns1__modifyDataFileParameterResponse(struct soap *soap) {
   struct __ns1__modifyDataFileParameterResponse *_p =
-      soap_instantiate___ns1__modifyDataFileParameterResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate___ns1__modifyDataFileParameterResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyDataFileParameterResponse(soap, _p);
   }
@@ -34454,8 +34688,8 @@ soap_new_set___ns1__modifyDataFileParameterResponse(
     struct soap *soap, ns1__modifyDataFileParameterResponse *
                            ns1__modifyDataFileParameterResponse_) {
   struct __ns1__modifyDataFileParameterResponse *_p =
-      soap_instantiate___ns1__modifyDataFileParameterResponse(soap, -1, NULL,
-                                                              NULL, NULL);
+      soap_instantiate___ns1__modifyDataFileParameterResponse(soap, -1, nullptr,
+                                                              nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyDataFileParameterResponse(soap, _p);
     _p->ns1__modifyDataFileParameterResponse_ =
@@ -34523,14 +34757,15 @@ soap_instantiate___ns1__addDataFileParameters(struct soap *, int, const char *,
 
 inline struct __ns1__addDataFileParameters *
 soap_new___ns1__addDataFileParameters(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__addDataFileParameters(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate___ns1__addDataFileParameters(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline struct __ns1__addDataFileParameters *
 soap_new_req___ns1__addDataFileParameters(struct soap *soap) {
   struct __ns1__addDataFileParameters *_p =
-      soap_instantiate___ns1__addDataFileParameters(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__addDataFileParameters(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__addDataFileParameters(soap, _p);
   }
@@ -34542,7 +34777,8 @@ soap_new_set___ns1__addDataFileParameters(
     struct soap *soap,
     ns1__addDataFileParameters *ns1__addDataFileParameters_) {
   struct __ns1__addDataFileParameters *_p =
-      soap_instantiate___ns1__addDataFileParameters(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__addDataFileParameters(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__addDataFileParameters(soap, _p);
     _p->ns1__addDataFileParameters_ = ns1__addDataFileParameters_;
@@ -34610,14 +34846,15 @@ soap_instantiate___ns1__addDataFileParameter(struct soap *, int, const char *,
 
 inline struct __ns1__addDataFileParameter *
 soap_new___ns1__addDataFileParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__addDataFileParameter(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate___ns1__addDataFileParameter(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline struct __ns1__addDataFileParameter *
 soap_new_req___ns1__addDataFileParameter(struct soap *soap) {
   struct __ns1__addDataFileParameter *_p =
-      soap_instantiate___ns1__addDataFileParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__addDataFileParameter(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     soap_default___ns1__addDataFileParameter(soap, _p);
   }
@@ -34628,7 +34865,8 @@ inline struct __ns1__addDataFileParameter *
 soap_new_set___ns1__addDataFileParameter(
     struct soap *soap, ns1__addDataFileParameter *ns1__addDataFileParameter_) {
   struct __ns1__addDataFileParameter *_p =
-      soap_instantiate___ns1__addDataFileParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__addDataFileParameter(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     soap_default___ns1__addDataFileParameter(soap, _p);
     _p->ns1__addDataFileParameter_ = ns1__addDataFileParameter_;
@@ -34695,13 +34933,14 @@ soap_instantiate___ns1__modifyDataFile(struct soap *, int, const char *,
 
 inline struct __ns1__modifyDataFile *
 soap_new___ns1__modifyDataFile(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifyDataFile(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__modifyDataFile(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline struct __ns1__modifyDataFile *
 soap_new_req___ns1__modifyDataFile(struct soap *soap) {
-  struct __ns1__modifyDataFile *_p =
-      soap_instantiate___ns1__modifyDataFile(soap, -1, NULL, NULL, NULL);
+  struct __ns1__modifyDataFile *_p = soap_instantiate___ns1__modifyDataFile(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyDataFile(soap, _p);
   }
@@ -34711,8 +34950,8 @@ soap_new_req___ns1__modifyDataFile(struct soap *soap) {
 inline struct __ns1__modifyDataFile *
 soap_new_set___ns1__modifyDataFile(struct soap *soap,
                                    ns1__modifyDataFile *ns1__modifyDataFile_) {
-  struct __ns1__modifyDataFile *_p =
-      soap_instantiate___ns1__modifyDataFile(soap, -1, NULL, NULL, NULL);
+  struct __ns1__modifyDataFile *_p = soap_instantiate___ns1__modifyDataFile(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyDataFile(soap, _p);
     _p->ns1__modifyDataFile_ = ns1__modifyDataFile_;
@@ -34778,15 +35017,15 @@ soap_instantiate___ns1__modifyDataFileResponse(struct soap *, int, const char *,
 
 inline struct __ns1__modifyDataFileResponse *
 soap_new___ns1__modifyDataFileResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifyDataFileResponse(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate___ns1__modifyDataFileResponse(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline struct __ns1__modifyDataFileResponse *
 soap_new_req___ns1__modifyDataFileResponse(struct soap *soap) {
   struct __ns1__modifyDataFileResponse *_p =
-      soap_instantiate___ns1__modifyDataFileResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__modifyDataFileResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__modifyDataFileResponse(soap, _p);
   }
@@ -34798,8 +35037,8 @@ soap_new_set___ns1__modifyDataFileResponse(
     struct soap *soap,
     ns1__modifyDataFileResponse *ns1__modifyDataFileResponse_) {
   struct __ns1__modifyDataFileResponse *_p =
-      soap_instantiate___ns1__modifyDataFileResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__modifyDataFileResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__modifyDataFileResponse(soap, _p);
     _p->ns1__modifyDataFileResponse_ = ns1__modifyDataFileResponse_;
@@ -34865,13 +35104,14 @@ soap_instantiate___ns1__deleteDataFile(struct soap *, int, const char *,
 
 inline struct __ns1__deleteDataFile *
 soap_new___ns1__deleteDataFile(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteDataFile(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__deleteDataFile(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline struct __ns1__deleteDataFile *
 soap_new_req___ns1__deleteDataFile(struct soap *soap) {
-  struct __ns1__deleteDataFile *_p =
-      soap_instantiate___ns1__deleteDataFile(soap, -1, NULL, NULL, NULL);
+  struct __ns1__deleteDataFile *_p = soap_instantiate___ns1__deleteDataFile(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteDataFile(soap, _p);
   }
@@ -34881,8 +35121,8 @@ soap_new_req___ns1__deleteDataFile(struct soap *soap) {
 inline struct __ns1__deleteDataFile *
 soap_new_set___ns1__deleteDataFile(struct soap *soap,
                                    ns1__deleteDataFile *ns1__deleteDataFile_) {
-  struct __ns1__deleteDataFile *_p =
-      soap_instantiate___ns1__deleteDataFile(soap, -1, NULL, NULL, NULL);
+  struct __ns1__deleteDataFile *_p = soap_instantiate___ns1__deleteDataFile(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteDataFile(soap, _p);
     _p->ns1__deleteDataFile_ = ns1__deleteDataFile_;
@@ -34948,15 +35188,15 @@ soap_instantiate___ns1__deleteDataFileResponse(struct soap *, int, const char *,
 
 inline struct __ns1__deleteDataFileResponse *
 soap_new___ns1__deleteDataFileResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteDataFileResponse(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate___ns1__deleteDataFileResponse(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline struct __ns1__deleteDataFileResponse *
 soap_new_req___ns1__deleteDataFileResponse(struct soap *soap) {
   struct __ns1__deleteDataFileResponse *_p =
-      soap_instantiate___ns1__deleteDataFileResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__deleteDataFileResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__deleteDataFileResponse(soap, _p);
   }
@@ -34968,8 +35208,8 @@ soap_new_set___ns1__deleteDataFileResponse(
     struct soap *soap,
     ns1__deleteDataFileResponse *ns1__deleteDataFileResponse_) {
   struct __ns1__deleteDataFileResponse *_p =
-      soap_instantiate___ns1__deleteDataFileResponse(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__deleteDataFileResponse(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__deleteDataFileResponse(soap, _p);
     _p->ns1__deleteDataFileResponse_ = ns1__deleteDataFileResponse_;
@@ -35035,13 +35275,14 @@ soap_instantiate___ns1__createDataFiles(struct soap *, int, const char *,
 
 inline struct __ns1__createDataFiles *
 soap_new___ns1__createDataFiles(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__createDataFiles(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__createDataFiles(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline struct __ns1__createDataFiles *
 soap_new_req___ns1__createDataFiles(struct soap *soap) {
-  struct __ns1__createDataFiles *_p =
-      soap_instantiate___ns1__createDataFiles(soap, -1, NULL, NULL, NULL);
+  struct __ns1__createDataFiles *_p = soap_instantiate___ns1__createDataFiles(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__createDataFiles(soap, _p);
   }
@@ -35050,8 +35291,8 @@ soap_new_req___ns1__createDataFiles(struct soap *soap) {
 
 inline struct __ns1__createDataFiles *soap_new_set___ns1__createDataFiles(
     struct soap *soap, ns1__createDataFiles *ns1__createDataFiles_) {
-  struct __ns1__createDataFiles *_p =
-      soap_instantiate___ns1__createDataFiles(soap, -1, NULL, NULL, NULL);
+  struct __ns1__createDataFiles *_p = soap_instantiate___ns1__createDataFiles(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__createDataFiles(soap, _p);
     _p->ns1__createDataFiles_ = ns1__createDataFiles_;
@@ -35118,13 +35359,14 @@ soap_instantiate___ns1__createDataFile(struct soap *, int, const char *,
 
 inline struct __ns1__createDataFile *
 soap_new___ns1__createDataFile(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__createDataFile(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__createDataFile(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline struct __ns1__createDataFile *
 soap_new_req___ns1__createDataFile(struct soap *soap) {
-  struct __ns1__createDataFile *_p =
-      soap_instantiate___ns1__createDataFile(soap, -1, NULL, NULL, NULL);
+  struct __ns1__createDataFile *_p = soap_instantiate___ns1__createDataFile(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__createDataFile(soap, _p);
   }
@@ -35134,8 +35376,8 @@ soap_new_req___ns1__createDataFile(struct soap *soap) {
 inline struct __ns1__createDataFile *
 soap_new_set___ns1__createDataFile(struct soap *soap,
                                    ns1__createDataFile *ns1__createDataFile_) {
-  struct __ns1__createDataFile *_p =
-      soap_instantiate___ns1__createDataFile(soap, -1, NULL, NULL, NULL);
+  struct __ns1__createDataFile *_p = soap_instantiate___ns1__createDataFile(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__createDataFile(soap, _p);
     _p->ns1__createDataFile_ = ns1__createDataFile_;
@@ -35198,13 +35440,14 @@ soap_instantiate___ns1__getDatafiles(struct soap *, int, const char *,
 
 inline struct __ns1__getDatafiles *
 soap_new___ns1__getDatafiles(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getDatafiles(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getDatafiles(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline struct __ns1__getDatafiles *
 soap_new_req___ns1__getDatafiles(struct soap *soap) {
   struct __ns1__getDatafiles *_p =
-      soap_instantiate___ns1__getDatafiles(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getDatafiles(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getDatafiles(soap, _p);
   }
@@ -35215,7 +35458,7 @@ inline struct __ns1__getDatafiles *
 soap_new_set___ns1__getDatafiles(struct soap *soap,
                                  ns1__getDatafiles *ns1__getDatafiles_) {
   struct __ns1__getDatafiles *_p =
-      soap_instantiate___ns1__getDatafiles(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getDatafiles(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getDatafiles(soap, _p);
     _p->ns1__getDatafiles_ = ns1__getDatafiles_;
@@ -35278,13 +35521,14 @@ soap_instantiate___ns1__getDatafile(struct soap *, int, const char *,
 
 inline struct __ns1__getDatafile *soap_new___ns1__getDatafile(struct soap *soap,
                                                               int n = -1) {
-  return soap_instantiate___ns1__getDatafile(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getDatafile(soap, n, nullptr, nullptr,
+                                             nullptr);
 }
 
 inline struct __ns1__getDatafile *
 soap_new_req___ns1__getDatafile(struct soap *soap) {
   struct __ns1__getDatafile *_p =
-      soap_instantiate___ns1__getDatafile(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getDatafile(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getDatafile(soap, _p);
   }
@@ -35295,7 +35539,7 @@ inline struct __ns1__getDatafile *
 soap_new_set___ns1__getDatafile(struct soap *soap,
                                 ns1__getDatafile *ns1__getDatafile_) {
   struct __ns1__getDatafile *_p =
-      soap_instantiate___ns1__getDatafile(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getDatafile(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getDatafile(soap, _p);
     _p->ns1__getDatafile_ = ns1__getDatafile_;
@@ -35361,15 +35605,15 @@ soap_instantiate___ns1__removeDataSetParameter(struct soap *, int, const char *,
 
 inline struct __ns1__removeDataSetParameter *
 soap_new___ns1__removeDataSetParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeDataSetParameter(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate___ns1__removeDataSetParameter(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline struct __ns1__removeDataSetParameter *
 soap_new_req___ns1__removeDataSetParameter(struct soap *soap) {
   struct __ns1__removeDataSetParameter *_p =
-      soap_instantiate___ns1__removeDataSetParameter(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__removeDataSetParameter(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__removeDataSetParameter(soap, _p);
   }
@@ -35381,8 +35625,8 @@ soap_new_set___ns1__removeDataSetParameter(
     struct soap *soap,
     ns1__removeDataSetParameter *ns1__removeDataSetParameter_) {
   struct __ns1__removeDataSetParameter *_p =
-      soap_instantiate___ns1__removeDataSetParameter(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__removeDataSetParameter(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__removeDataSetParameter(soap, _p);
     _p->ns1__removeDataSetParameter_ = ns1__removeDataSetParameter_;
@@ -35449,15 +35693,15 @@ soap_instantiate___ns1__removeDataSetParameterResponse(struct soap *, int,
 
 inline struct __ns1__removeDataSetParameterResponse *
 soap_new___ns1__removeDataSetParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeDataSetParameterResponse(soap, n, NULL,
-                                                                NULL, NULL);
+  return soap_instantiate___ns1__removeDataSetParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__removeDataSetParameterResponse *
 soap_new_req___ns1__removeDataSetParameterResponse(struct soap *soap) {
   struct __ns1__removeDataSetParameterResponse *_p =
-      soap_instantiate___ns1__removeDataSetParameterResponse(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate___ns1__removeDataSetParameterResponse(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeDataSetParameterResponse(soap, _p);
   }
@@ -35469,8 +35713,8 @@ soap_new_set___ns1__removeDataSetParameterResponse(
     struct soap *soap,
     ns1__removeDataSetParameterResponse *ns1__removeDataSetParameterResponse_) {
   struct __ns1__removeDataSetParameterResponse *_p =
-      soap_instantiate___ns1__removeDataSetParameterResponse(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate___ns1__removeDataSetParameterResponse(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeDataSetParameterResponse(soap, _p);
     _p->ns1__removeDataSetParameterResponse_ =
@@ -35536,13 +35780,14 @@ soap_instantiate___ns1__removeDataSet(struct soap *, int, const char *,
 
 inline struct __ns1__removeDataSet *
 soap_new___ns1__removeDataSet(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeDataSet(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__removeDataSet(soap, n, nullptr, nullptr,
+                                               nullptr);
 }
 
 inline struct __ns1__removeDataSet *
 soap_new_req___ns1__removeDataSet(struct soap *soap) {
-  struct __ns1__removeDataSet *_p =
-      soap_instantiate___ns1__removeDataSet(soap, -1, NULL, NULL, NULL);
+  struct __ns1__removeDataSet *_p = soap_instantiate___ns1__removeDataSet(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeDataSet(soap, _p);
   }
@@ -35552,8 +35797,8 @@ soap_new_req___ns1__removeDataSet(struct soap *soap) {
 inline struct __ns1__removeDataSet *
 soap_new_set___ns1__removeDataSet(struct soap *soap,
                                   ns1__removeDataSet *ns1__removeDataSet_) {
-  struct __ns1__removeDataSet *_p =
-      soap_instantiate___ns1__removeDataSet(soap, -1, NULL, NULL, NULL);
+  struct __ns1__removeDataSet *_p = soap_instantiate___ns1__removeDataSet(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeDataSet(soap, _p);
     _p->ns1__removeDataSet_ = ns1__removeDataSet_;
@@ -35619,14 +35864,15 @@ soap_instantiate___ns1__removeDataSetResponse(struct soap *, int, const char *,
 
 inline struct __ns1__removeDataSetResponse *
 soap_new___ns1__removeDataSetResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeDataSetResponse(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate___ns1__removeDataSetResponse(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline struct __ns1__removeDataSetResponse *
 soap_new_req___ns1__removeDataSetResponse(struct soap *soap) {
   struct __ns1__removeDataSetResponse *_p =
-      soap_instantiate___ns1__removeDataSetResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeDataSetResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__removeDataSetResponse(soap, _p);
   }
@@ -35638,7 +35884,8 @@ soap_new_set___ns1__removeDataSetResponse(
     struct soap *soap,
     ns1__removeDataSetResponse *ns1__removeDataSetResponse_) {
   struct __ns1__removeDataSetResponse *_p =
-      soap_instantiate___ns1__removeDataSetResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeDataSetResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__removeDataSetResponse(soap, _p);
     _p->ns1__removeDataSetResponse_ = ns1__removeDataSetResponse_;
@@ -35706,14 +35953,15 @@ soap_instantiate___ns1__addDataSetParameters(struct soap *, int, const char *,
 
 inline struct __ns1__addDataSetParameters *
 soap_new___ns1__addDataSetParameters(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__addDataSetParameters(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate___ns1__addDataSetParameters(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline struct __ns1__addDataSetParameters *
 soap_new_req___ns1__addDataSetParameters(struct soap *soap) {
   struct __ns1__addDataSetParameters *_p =
-      soap_instantiate___ns1__addDataSetParameters(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__addDataSetParameters(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     soap_default___ns1__addDataSetParameters(soap, _p);
   }
@@ -35724,7 +35972,8 @@ inline struct __ns1__addDataSetParameters *
 soap_new_set___ns1__addDataSetParameters(
     struct soap *soap, ns1__addDataSetParameters *ns1__addDataSetParameters_) {
   struct __ns1__addDataSetParameters *_p =
-      soap_instantiate___ns1__addDataSetParameters(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__addDataSetParameters(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     soap_default___ns1__addDataSetParameters(soap, _p);
     _p->ns1__addDataSetParameters_ = ns1__addDataSetParameters_;
@@ -35793,13 +36042,15 @@ soap_instantiate___ns1__addDataSetParameter(struct soap *, int, const char *,
 
 inline struct __ns1__addDataSetParameter *
 soap_new___ns1__addDataSetParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__addDataSetParameter(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__addDataSetParameter(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline struct __ns1__addDataSetParameter *
 soap_new_req___ns1__addDataSetParameter(struct soap *soap) {
   struct __ns1__addDataSetParameter *_p =
-      soap_instantiate___ns1__addDataSetParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__addDataSetParameter(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__addDataSetParameter(soap, _p);
   }
@@ -35810,7 +36061,8 @@ inline struct __ns1__addDataSetParameter *
 soap_new_set___ns1__addDataSetParameter(
     struct soap *soap, ns1__addDataSetParameter *ns1__addDataSetParameter_) {
   struct __ns1__addDataSetParameter *_p =
-      soap_instantiate___ns1__addDataSetParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__addDataSetParameter(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__addDataSetParameter(soap, _p);
     _p->ns1__addDataSetParameter_ = ns1__addDataSetParameter_;
@@ -35878,13 +36130,14 @@ soap_instantiate___ns1__setDataSetSample(struct soap *, int, const char *,
 
 inline struct __ns1__setDataSetSample *
 soap_new___ns1__setDataSetSample(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__setDataSetSample(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__setDataSetSample(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline struct __ns1__setDataSetSample *
 soap_new_req___ns1__setDataSetSample(struct soap *soap) {
-  struct __ns1__setDataSetSample *_p =
-      soap_instantiate___ns1__setDataSetSample(soap, -1, NULL, NULL, NULL);
+  struct __ns1__setDataSetSample *_p = soap_instantiate___ns1__setDataSetSample(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__setDataSetSample(soap, _p);
   }
@@ -35893,8 +36146,8 @@ soap_new_req___ns1__setDataSetSample(struct soap *soap) {
 
 inline struct __ns1__setDataSetSample *soap_new_set___ns1__setDataSetSample(
     struct soap *soap, ns1__setDataSetSample *ns1__setDataSetSample_) {
-  struct __ns1__setDataSetSample *_p =
-      soap_instantiate___ns1__setDataSetSample(soap, -1, NULL, NULL, NULL);
+  struct __ns1__setDataSetSample *_p = soap_instantiate___ns1__setDataSetSample(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__setDataSetSample(soap, _p);
     _p->ns1__setDataSetSample_ = ns1__setDataSetSample_;
@@ -35962,15 +36215,15 @@ soap_instantiate___ns1__setDataSetSampleResponse(struct soap *, int,
 
 inline struct __ns1__setDataSetSampleResponse *
 soap_new___ns1__setDataSetSampleResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__setDataSetSampleResponse(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate___ns1__setDataSetSampleResponse(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline struct __ns1__setDataSetSampleResponse *
 soap_new_req___ns1__setDataSetSampleResponse(struct soap *soap) {
   struct __ns1__setDataSetSampleResponse *_p =
-      soap_instantiate___ns1__setDataSetSampleResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate___ns1__setDataSetSampleResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     soap_default___ns1__setDataSetSampleResponse(soap, _p);
   }
@@ -35982,8 +36235,8 @@ soap_new_set___ns1__setDataSetSampleResponse(
     struct soap *soap,
     ns1__setDataSetSampleResponse *ns1__setDataSetSampleResponse_) {
   struct __ns1__setDataSetSampleResponse *_p =
-      soap_instantiate___ns1__setDataSetSampleResponse(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate___ns1__setDataSetSampleResponse(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     soap_default___ns1__setDataSetSampleResponse(soap, _p);
     _p->ns1__setDataSetSampleResponse_ = ns1__setDataSetSampleResponse_;
@@ -36049,15 +36302,15 @@ soap_instantiate___ns1__modifyDataSetParameter(struct soap *, int, const char *,
 
 inline struct __ns1__modifyDataSetParameter *
 soap_new___ns1__modifyDataSetParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifyDataSetParameter(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate___ns1__modifyDataSetParameter(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline struct __ns1__modifyDataSetParameter *
 soap_new_req___ns1__modifyDataSetParameter(struct soap *soap) {
   struct __ns1__modifyDataSetParameter *_p =
-      soap_instantiate___ns1__modifyDataSetParameter(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__modifyDataSetParameter(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__modifyDataSetParameter(soap, _p);
   }
@@ -36069,8 +36322,8 @@ soap_new_set___ns1__modifyDataSetParameter(
     struct soap *soap,
     ns1__modifyDataSetParameter *ns1__modifyDataSetParameter_) {
   struct __ns1__modifyDataSetParameter *_p =
-      soap_instantiate___ns1__modifyDataSetParameter(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__modifyDataSetParameter(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__modifyDataSetParameter(soap, _p);
     _p->ns1__modifyDataSetParameter_ = ns1__modifyDataSetParameter_;
@@ -36137,15 +36390,15 @@ soap_instantiate___ns1__modifyDataSetParameterResponse(struct soap *, int,
 
 inline struct __ns1__modifyDataSetParameterResponse *
 soap_new___ns1__modifyDataSetParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifyDataSetParameterResponse(soap, n, NULL,
-                                                                NULL, NULL);
+  return soap_instantiate___ns1__modifyDataSetParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__modifyDataSetParameterResponse *
 soap_new_req___ns1__modifyDataSetParameterResponse(struct soap *soap) {
   struct __ns1__modifyDataSetParameterResponse *_p =
-      soap_instantiate___ns1__modifyDataSetParameterResponse(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate___ns1__modifyDataSetParameterResponse(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyDataSetParameterResponse(soap, _p);
   }
@@ -36157,8 +36410,8 @@ soap_new_set___ns1__modifyDataSetParameterResponse(
     struct soap *soap,
     ns1__modifyDataSetParameterResponse *ns1__modifyDataSetParameterResponse_) {
   struct __ns1__modifyDataSetParameterResponse *_p =
-      soap_instantiate___ns1__modifyDataSetParameterResponse(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate___ns1__modifyDataSetParameterResponse(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyDataSetParameterResponse(soap, _p);
     _p->ns1__modifyDataSetParameterResponse_ =
@@ -36224,13 +36477,14 @@ soap_instantiate___ns1__modifyDataSet(struct soap *, int, const char *,
 
 inline struct __ns1__modifyDataSet *
 soap_new___ns1__modifyDataSet(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifyDataSet(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__modifyDataSet(soap, n, nullptr, nullptr,
+                                               nullptr);
 }
 
 inline struct __ns1__modifyDataSet *
 soap_new_req___ns1__modifyDataSet(struct soap *soap) {
-  struct __ns1__modifyDataSet *_p =
-      soap_instantiate___ns1__modifyDataSet(soap, -1, NULL, NULL, NULL);
+  struct __ns1__modifyDataSet *_p = soap_instantiate___ns1__modifyDataSet(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyDataSet(soap, _p);
   }
@@ -36240,8 +36494,8 @@ soap_new_req___ns1__modifyDataSet(struct soap *soap) {
 inline struct __ns1__modifyDataSet *
 soap_new_set___ns1__modifyDataSet(struct soap *soap,
                                   ns1__modifyDataSet *ns1__modifyDataSet_) {
-  struct __ns1__modifyDataSet *_p =
-      soap_instantiate___ns1__modifyDataSet(soap, -1, NULL, NULL, NULL);
+  struct __ns1__modifyDataSet *_p = soap_instantiate___ns1__modifyDataSet(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyDataSet(soap, _p);
     _p->ns1__modifyDataSet_ = ns1__modifyDataSet_;
@@ -36307,14 +36561,15 @@ soap_instantiate___ns1__modifyDataSetResponse(struct soap *, int, const char *,
 
 inline struct __ns1__modifyDataSetResponse *
 soap_new___ns1__modifyDataSetResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifyDataSetResponse(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate___ns1__modifyDataSetResponse(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline struct __ns1__modifyDataSetResponse *
 soap_new_req___ns1__modifyDataSetResponse(struct soap *soap) {
   struct __ns1__modifyDataSetResponse *_p =
-      soap_instantiate___ns1__modifyDataSetResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__modifyDataSetResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__modifyDataSetResponse(soap, _p);
   }
@@ -36326,7 +36581,8 @@ soap_new_set___ns1__modifyDataSetResponse(
     struct soap *soap,
     ns1__modifyDataSetResponse *ns1__modifyDataSetResponse_) {
   struct __ns1__modifyDataSetResponse *_p =
-      soap_instantiate___ns1__modifyDataSetResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__modifyDataSetResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__modifyDataSetResponse(soap, _p);
     _p->ns1__modifyDataSetResponse_ = ns1__modifyDataSetResponse_;
@@ -36392,15 +36648,15 @@ soap_instantiate___ns1__deleteDataSetParameter(struct soap *, int, const char *,
 
 inline struct __ns1__deleteDataSetParameter *
 soap_new___ns1__deleteDataSetParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteDataSetParameter(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate___ns1__deleteDataSetParameter(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline struct __ns1__deleteDataSetParameter *
 soap_new_req___ns1__deleteDataSetParameter(struct soap *soap) {
   struct __ns1__deleteDataSetParameter *_p =
-      soap_instantiate___ns1__deleteDataSetParameter(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__deleteDataSetParameter(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__deleteDataSetParameter(soap, _p);
   }
@@ -36412,8 +36668,8 @@ soap_new_set___ns1__deleteDataSetParameter(
     struct soap *soap,
     ns1__deleteDataSetParameter *ns1__deleteDataSetParameter_) {
   struct __ns1__deleteDataSetParameter *_p =
-      soap_instantiate___ns1__deleteDataSetParameter(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__deleteDataSetParameter(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__deleteDataSetParameter(soap, _p);
     _p->ns1__deleteDataSetParameter_ = ns1__deleteDataSetParameter_;
@@ -36480,15 +36736,15 @@ soap_instantiate___ns1__deleteDataSetParameterResponse(struct soap *, int,
 
 inline struct __ns1__deleteDataSetParameterResponse *
 soap_new___ns1__deleteDataSetParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteDataSetParameterResponse(soap, n, NULL,
-                                                                NULL, NULL);
+  return soap_instantiate___ns1__deleteDataSetParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__deleteDataSetParameterResponse *
 soap_new_req___ns1__deleteDataSetParameterResponse(struct soap *soap) {
   struct __ns1__deleteDataSetParameterResponse *_p =
-      soap_instantiate___ns1__deleteDataSetParameterResponse(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate___ns1__deleteDataSetParameterResponse(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteDataSetParameterResponse(soap, _p);
   }
@@ -36500,8 +36756,8 @@ soap_new_set___ns1__deleteDataSetParameterResponse(
     struct soap *soap,
     ns1__deleteDataSetParameterResponse *ns1__deleteDataSetParameterResponse_) {
   struct __ns1__deleteDataSetParameterResponse *_p =
-      soap_instantiate___ns1__deleteDataSetParameterResponse(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate___ns1__deleteDataSetParameterResponse(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteDataSetParameterResponse(soap, _p);
     _p->ns1__deleteDataSetParameterResponse_ =
@@ -36567,13 +36823,14 @@ soap_instantiate___ns1__deleteDataSet(struct soap *, int, const char *,
 
 inline struct __ns1__deleteDataSet *
 soap_new___ns1__deleteDataSet(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteDataSet(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__deleteDataSet(soap, n, nullptr, nullptr,
+                                               nullptr);
 }
 
 inline struct __ns1__deleteDataSet *
 soap_new_req___ns1__deleteDataSet(struct soap *soap) {
-  struct __ns1__deleteDataSet *_p =
-      soap_instantiate___ns1__deleteDataSet(soap, -1, NULL, NULL, NULL);
+  struct __ns1__deleteDataSet *_p = soap_instantiate___ns1__deleteDataSet(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteDataSet(soap, _p);
   }
@@ -36583,8 +36840,8 @@ soap_new_req___ns1__deleteDataSet(struct soap *soap) {
 inline struct __ns1__deleteDataSet *
 soap_new_set___ns1__deleteDataSet(struct soap *soap,
                                   ns1__deleteDataSet *ns1__deleteDataSet_) {
-  struct __ns1__deleteDataSet *_p =
-      soap_instantiate___ns1__deleteDataSet(soap, -1, NULL, NULL, NULL);
+  struct __ns1__deleteDataSet *_p = soap_instantiate___ns1__deleteDataSet(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteDataSet(soap, _p);
     _p->ns1__deleteDataSet_ = ns1__deleteDataSet_;
@@ -36650,14 +36907,15 @@ soap_instantiate___ns1__deleteDataSetResponse(struct soap *, int, const char *,
 
 inline struct __ns1__deleteDataSetResponse *
 soap_new___ns1__deleteDataSetResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteDataSetResponse(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate___ns1__deleteDataSetResponse(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline struct __ns1__deleteDataSetResponse *
 soap_new_req___ns1__deleteDataSetResponse(struct soap *soap) {
   struct __ns1__deleteDataSetResponse *_p =
-      soap_instantiate___ns1__deleteDataSetResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteDataSetResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__deleteDataSetResponse(soap, _p);
   }
@@ -36669,7 +36927,8 @@ soap_new_set___ns1__deleteDataSetResponse(
     struct soap *soap,
     ns1__deleteDataSetResponse *ns1__deleteDataSetResponse_) {
   struct __ns1__deleteDataSetResponse *_p =
-      soap_instantiate___ns1__deleteDataSetResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteDataSetResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__deleteDataSetResponse(soap, _p);
     _p->ns1__deleteDataSetResponse_ = ns1__deleteDataSetResponse_;
@@ -36735,13 +36994,14 @@ soap_instantiate___ns1__createDataSets(struct soap *, int, const char *,
 
 inline struct __ns1__createDataSets *
 soap_new___ns1__createDataSets(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__createDataSets(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__createDataSets(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline struct __ns1__createDataSets *
 soap_new_req___ns1__createDataSets(struct soap *soap) {
-  struct __ns1__createDataSets *_p =
-      soap_instantiate___ns1__createDataSets(soap, -1, NULL, NULL, NULL);
+  struct __ns1__createDataSets *_p = soap_instantiate___ns1__createDataSets(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__createDataSets(soap, _p);
   }
@@ -36751,8 +37011,8 @@ soap_new_req___ns1__createDataSets(struct soap *soap) {
 inline struct __ns1__createDataSets *
 soap_new_set___ns1__createDataSets(struct soap *soap,
                                    ns1__createDataSets *ns1__createDataSets_) {
-  struct __ns1__createDataSets *_p =
-      soap_instantiate___ns1__createDataSets(soap, -1, NULL, NULL, NULL);
+  struct __ns1__createDataSets *_p = soap_instantiate___ns1__createDataSets(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__createDataSets(soap, _p);
     _p->ns1__createDataSets_ = ns1__createDataSets_;
@@ -36817,13 +37077,14 @@ soap_instantiate___ns1__createDataSet(struct soap *, int, const char *,
 
 inline struct __ns1__createDataSet *
 soap_new___ns1__createDataSet(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__createDataSet(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__createDataSet(soap, n, nullptr, nullptr,
+                                               nullptr);
 }
 
 inline struct __ns1__createDataSet *
 soap_new_req___ns1__createDataSet(struct soap *soap) {
-  struct __ns1__createDataSet *_p =
-      soap_instantiate___ns1__createDataSet(soap, -1, NULL, NULL, NULL);
+  struct __ns1__createDataSet *_p = soap_instantiate___ns1__createDataSet(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__createDataSet(soap, _p);
   }
@@ -36833,8 +37094,8 @@ soap_new_req___ns1__createDataSet(struct soap *soap) {
 inline struct __ns1__createDataSet *
 soap_new_set___ns1__createDataSet(struct soap *soap,
                                   ns1__createDataSet *ns1__createDataSet_) {
-  struct __ns1__createDataSet *_p =
-      soap_instantiate___ns1__createDataSet(soap, -1, NULL, NULL, NULL);
+  struct __ns1__createDataSet *_p = soap_instantiate___ns1__createDataSet(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__createDataSet(soap, _p);
     _p->ns1__createDataSet_ = ns1__createDataSet_;
@@ -36897,13 +37158,14 @@ soap_instantiate___ns1__getDatasets(struct soap *, int, const char *,
 
 inline struct __ns1__getDatasets *soap_new___ns1__getDatasets(struct soap *soap,
                                                               int n = -1) {
-  return soap_instantiate___ns1__getDatasets(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getDatasets(soap, n, nullptr, nullptr,
+                                             nullptr);
 }
 
 inline struct __ns1__getDatasets *
 soap_new_req___ns1__getDatasets(struct soap *soap) {
   struct __ns1__getDatasets *_p =
-      soap_instantiate___ns1__getDatasets(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getDatasets(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getDatasets(soap, _p);
   }
@@ -36914,7 +37176,7 @@ inline struct __ns1__getDatasets *
 soap_new_set___ns1__getDatasets(struct soap *soap,
                                 ns1__getDatasets *ns1__getDatasets_) {
   struct __ns1__getDatasets *_p =
-      soap_instantiate___ns1__getDatasets(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getDatasets(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getDatasets(soap, _p);
     _p->ns1__getDatasets_ = ns1__getDatasets_;
@@ -36982,13 +37244,15 @@ soap_instantiate___ns1__getDatasetIncludes(struct soap *, int, const char *,
 
 inline struct __ns1__getDatasetIncludes *
 soap_new___ns1__getDatasetIncludes(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getDatasetIncludes(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getDatasetIncludes(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline struct __ns1__getDatasetIncludes *
 soap_new_req___ns1__getDatasetIncludes(struct soap *soap) {
   struct __ns1__getDatasetIncludes *_p =
-      soap_instantiate___ns1__getDatasetIncludes(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getDatasetIncludes(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__getDatasetIncludes(soap, _p);
   }
@@ -36998,7 +37262,8 @@ soap_new_req___ns1__getDatasetIncludes(struct soap *soap) {
 inline struct __ns1__getDatasetIncludes *soap_new_set___ns1__getDatasetIncludes(
     struct soap *soap, ns1__getDatasetIncludes *ns1__getDatasetIncludes_) {
   struct __ns1__getDatasetIncludes *_p =
-      soap_instantiate___ns1__getDatasetIncludes(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getDatasetIncludes(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__getDatasetIncludes(soap, _p);
     _p->ns1__getDatasetIncludes_ = ns1__getDatasetIncludes_;
@@ -37062,13 +37327,13 @@ soap_instantiate___ns1__getDataset(struct soap *, int, const char *,
 
 inline struct __ns1__getDataset *soap_new___ns1__getDataset(struct soap *soap,
                                                             int n = -1) {
-  return soap_instantiate___ns1__getDataset(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getDataset(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__getDataset *
 soap_new_req___ns1__getDataset(struct soap *soap) {
   struct __ns1__getDataset *_p =
-      soap_instantiate___ns1__getDataset(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getDataset(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getDataset(soap, _p);
   }
@@ -37079,7 +37344,7 @@ inline struct __ns1__getDataset *
 soap_new_set___ns1__getDataset(struct soap *soap,
                                ns1__getDataset *ns1__getDataset_) {
   struct __ns1__getDataset *_p =
-      soap_instantiate___ns1__getDataset(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getDataset(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getDataset(soap, _p);
     _p->ns1__getDataset_ = ns1__getDataset_;
@@ -37145,14 +37410,15 @@ soap_instantiate___ns1__removeSampleParameter(struct soap *, int, const char *,
 
 inline struct __ns1__removeSampleParameter *
 soap_new___ns1__removeSampleParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeSampleParameter(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate___ns1__removeSampleParameter(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline struct __ns1__removeSampleParameter *
 soap_new_req___ns1__removeSampleParameter(struct soap *soap) {
   struct __ns1__removeSampleParameter *_p =
-      soap_instantiate___ns1__removeSampleParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeSampleParameter(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__removeSampleParameter(soap, _p);
   }
@@ -37164,7 +37430,8 @@ soap_new_set___ns1__removeSampleParameter(
     struct soap *soap,
     ns1__removeSampleParameter *ns1__removeSampleParameter_) {
   struct __ns1__removeSampleParameter *_p =
-      soap_instantiate___ns1__removeSampleParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeSampleParameter(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__removeSampleParameter(soap, _p);
     _p->ns1__removeSampleParameter_ = ns1__removeSampleParameter_;
@@ -37231,15 +37498,15 @@ soap_instantiate___ns1__removeSampleParameterResponse(struct soap *, int,
 
 inline struct __ns1__removeSampleParameterResponse *
 soap_new___ns1__removeSampleParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeSampleParameterResponse(soap, n, NULL,
-                                                               NULL, NULL);
+  return soap_instantiate___ns1__removeSampleParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__removeSampleParameterResponse *
 soap_new_req___ns1__removeSampleParameterResponse(struct soap *soap) {
   struct __ns1__removeSampleParameterResponse *_p =
-      soap_instantiate___ns1__removeSampleParameterResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate___ns1__removeSampleParameterResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeSampleParameterResponse(soap, _p);
   }
@@ -37251,8 +37518,8 @@ soap_new_set___ns1__removeSampleParameterResponse(
     struct soap *soap,
     ns1__removeSampleParameterResponse *ns1__removeSampleParameterResponse_) {
   struct __ns1__removeSampleParameterResponse *_p =
-      soap_instantiate___ns1__removeSampleParameterResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate___ns1__removeSampleParameterResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeSampleParameterResponse(soap, _p);
     _p->ns1__removeSampleParameterResponse_ =
@@ -37316,13 +37583,14 @@ soap_instantiate___ns1__removeSample(struct soap *, int, const char *,
 
 inline struct __ns1__removeSample *
 soap_new___ns1__removeSample(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeSample(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__removeSample(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline struct __ns1__removeSample *
 soap_new_req___ns1__removeSample(struct soap *soap) {
   struct __ns1__removeSample *_p =
-      soap_instantiate___ns1__removeSample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeSample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeSample(soap, _p);
   }
@@ -37333,7 +37601,7 @@ inline struct __ns1__removeSample *
 soap_new_set___ns1__removeSample(struct soap *soap,
                                  ns1__removeSample *ns1__removeSample_) {
   struct __ns1__removeSample *_p =
-      soap_instantiate___ns1__removeSample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeSample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeSample(soap, _p);
     _p->ns1__removeSample_ = ns1__removeSample_;
@@ -37401,14 +37669,15 @@ soap_instantiate___ns1__removeSampleResponse(struct soap *, int, const char *,
 
 inline struct __ns1__removeSampleResponse *
 soap_new___ns1__removeSampleResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeSampleResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate___ns1__removeSampleResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline struct __ns1__removeSampleResponse *
 soap_new_req___ns1__removeSampleResponse(struct soap *soap) {
   struct __ns1__removeSampleResponse *_p =
-      soap_instantiate___ns1__removeSampleResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeSampleResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     soap_default___ns1__removeSampleResponse(soap, _p);
   }
@@ -37419,7 +37688,8 @@ inline struct __ns1__removeSampleResponse *
 soap_new_set___ns1__removeSampleResponse(
     struct soap *soap, ns1__removeSampleResponse *ns1__removeSampleResponse_) {
   struct __ns1__removeSampleResponse *_p =
-      soap_instantiate___ns1__removeSampleResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeSampleResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     soap_default___ns1__removeSampleResponse(soap, _p);
     _p->ns1__removeSampleResponse_ = ns1__removeSampleResponse_;
@@ -37487,13 +37757,15 @@ soap_instantiate___ns1__removePublication(struct soap *, int, const char *,
 
 inline struct __ns1__removePublication *
 soap_new___ns1__removePublication(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removePublication(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__removePublication(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline struct __ns1__removePublication *
 soap_new_req___ns1__removePublication(struct soap *soap) {
   struct __ns1__removePublication *_p =
-      soap_instantiate___ns1__removePublication(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removePublication(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__removePublication(soap, _p);
   }
@@ -37503,7 +37775,8 @@ soap_new_req___ns1__removePublication(struct soap *soap) {
 inline struct __ns1__removePublication *soap_new_set___ns1__removePublication(
     struct soap *soap, ns1__removePublication *ns1__removePublication_) {
   struct __ns1__removePublication *_p =
-      soap_instantiate___ns1__removePublication(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removePublication(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__removePublication(soap, _p);
     _p->ns1__removePublication_ = ns1__removePublication_;
@@ -37571,15 +37844,15 @@ soap_instantiate___ns1__removePublicationResponse(struct soap *, int,
 
 inline struct __ns1__removePublicationResponse *
 soap_new___ns1__removePublicationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removePublicationResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate___ns1__removePublicationResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline struct __ns1__removePublicationResponse *
 soap_new_req___ns1__removePublicationResponse(struct soap *soap) {
   struct __ns1__removePublicationResponse *_p =
-      soap_instantiate___ns1__removePublicationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__removePublicationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removePublicationResponse(soap, _p);
   }
@@ -37591,8 +37864,8 @@ soap_new_set___ns1__removePublicationResponse(
     struct soap *soap,
     ns1__removePublicationResponse *ns1__removePublicationResponse_) {
   struct __ns1__removePublicationResponse *_p =
-      soap_instantiate___ns1__removePublicationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__removePublicationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removePublicationResponse(soap, _p);
     _p->ns1__removePublicationResponse_ = ns1__removePublicationResponse_;
@@ -37660,13 +37933,15 @@ soap_instantiate___ns1__removeInvestigator(struct soap *, int, const char *,
 
 inline struct __ns1__removeInvestigator *
 soap_new___ns1__removeInvestigator(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeInvestigator(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__removeInvestigator(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline struct __ns1__removeInvestigator *
 soap_new_req___ns1__removeInvestigator(struct soap *soap) {
   struct __ns1__removeInvestigator *_p =
-      soap_instantiate___ns1__removeInvestigator(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeInvestigator(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__removeInvestigator(soap, _p);
   }
@@ -37676,7 +37951,8 @@ soap_new_req___ns1__removeInvestigator(struct soap *soap) {
 inline struct __ns1__removeInvestigator *soap_new_set___ns1__removeInvestigator(
     struct soap *soap, ns1__removeInvestigator *ns1__removeInvestigator_) {
   struct __ns1__removeInvestigator *_p =
-      soap_instantiate___ns1__removeInvestigator(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeInvestigator(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__removeInvestigator(soap, _p);
     _p->ns1__removeInvestigator_ = ns1__removeInvestigator_;
@@ -37744,15 +38020,15 @@ soap_instantiate___ns1__removeInvestigatorResponse(struct soap *, int,
 
 inline struct __ns1__removeInvestigatorResponse *
 soap_new___ns1__removeInvestigatorResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeInvestigatorResponse(soap, n, NULL, NULL,
-                                                            NULL);
+  return soap_instantiate___ns1__removeInvestigatorResponse(soap, n, nullptr,
+                                                            nullptr, nullptr);
 }
 
 inline struct __ns1__removeInvestigatorResponse *
 soap_new_req___ns1__removeInvestigatorResponse(struct soap *soap) {
   struct __ns1__removeInvestigatorResponse *_p =
-      soap_instantiate___ns1__removeInvestigatorResponse(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate___ns1__removeInvestigatorResponse(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeInvestigatorResponse(soap, _p);
   }
@@ -37764,8 +38040,8 @@ soap_new_set___ns1__removeInvestigatorResponse(
     struct soap *soap,
     ns1__removeInvestigatorResponse *ns1__removeInvestigatorResponse_) {
   struct __ns1__removeInvestigatorResponse *_p =
-      soap_instantiate___ns1__removeInvestigatorResponse(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate___ns1__removeInvestigatorResponse(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeInvestigatorResponse(soap, _p);
     _p->ns1__removeInvestigatorResponse_ = ns1__removeInvestigatorResponse_;
@@ -37830,13 +38106,14 @@ soap_instantiate___ns1__removeKeyword(struct soap *, int, const char *,
 
 inline struct __ns1__removeKeyword *
 soap_new___ns1__removeKeyword(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeKeyword(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__removeKeyword(soap, n, nullptr, nullptr,
+                                               nullptr);
 }
 
 inline struct __ns1__removeKeyword *
 soap_new_req___ns1__removeKeyword(struct soap *soap) {
-  struct __ns1__removeKeyword *_p =
-      soap_instantiate___ns1__removeKeyword(soap, -1, NULL, NULL, NULL);
+  struct __ns1__removeKeyword *_p = soap_instantiate___ns1__removeKeyword(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeKeyword(soap, _p);
   }
@@ -37846,8 +38123,8 @@ soap_new_req___ns1__removeKeyword(struct soap *soap) {
 inline struct __ns1__removeKeyword *
 soap_new_set___ns1__removeKeyword(struct soap *soap,
                                   ns1__removeKeyword *ns1__removeKeyword_) {
-  struct __ns1__removeKeyword *_p =
-      soap_instantiate___ns1__removeKeyword(soap, -1, NULL, NULL, NULL);
+  struct __ns1__removeKeyword *_p = soap_instantiate___ns1__removeKeyword(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeKeyword(soap, _p);
     _p->ns1__removeKeyword_ = ns1__removeKeyword_;
@@ -37913,14 +38190,15 @@ soap_instantiate___ns1__removeKeywordResponse(struct soap *, int, const char *,
 
 inline struct __ns1__removeKeywordResponse *
 soap_new___ns1__removeKeywordResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeKeywordResponse(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate___ns1__removeKeywordResponse(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline struct __ns1__removeKeywordResponse *
 soap_new_req___ns1__removeKeywordResponse(struct soap *soap) {
   struct __ns1__removeKeywordResponse *_p =
-      soap_instantiate___ns1__removeKeywordResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeKeywordResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__removeKeywordResponse(soap, _p);
   }
@@ -37932,7 +38210,8 @@ soap_new_set___ns1__removeKeywordResponse(
     struct soap *soap,
     ns1__removeKeywordResponse *ns1__removeKeywordResponse_) {
   struct __ns1__removeKeywordResponse *_p =
-      soap_instantiate___ns1__removeKeywordResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeKeywordResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__removeKeywordResponse(soap, _p);
     _p->ns1__removeKeywordResponse_ = ns1__removeKeywordResponse_;
@@ -37998,14 +38277,15 @@ soap_instantiate___ns1__modifySampleParameter(struct soap *, int, const char *,
 
 inline struct __ns1__modifySampleParameter *
 soap_new___ns1__modifySampleParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifySampleParameter(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate___ns1__modifySampleParameter(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline struct __ns1__modifySampleParameter *
 soap_new_req___ns1__modifySampleParameter(struct soap *soap) {
   struct __ns1__modifySampleParameter *_p =
-      soap_instantiate___ns1__modifySampleParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__modifySampleParameter(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__modifySampleParameter(soap, _p);
   }
@@ -38017,7 +38297,8 @@ soap_new_set___ns1__modifySampleParameter(
     struct soap *soap,
     ns1__modifySampleParameter *ns1__modifySampleParameter_) {
   struct __ns1__modifySampleParameter *_p =
-      soap_instantiate___ns1__modifySampleParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__modifySampleParameter(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__modifySampleParameter(soap, _p);
     _p->ns1__modifySampleParameter_ = ns1__modifySampleParameter_;
@@ -38084,15 +38365,15 @@ soap_instantiate___ns1__modifySampleParameterResponse(struct soap *, int,
 
 inline struct __ns1__modifySampleParameterResponse *
 soap_new___ns1__modifySampleParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifySampleParameterResponse(soap, n, NULL,
-                                                               NULL, NULL);
+  return soap_instantiate___ns1__modifySampleParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__modifySampleParameterResponse *
 soap_new_req___ns1__modifySampleParameterResponse(struct soap *soap) {
   struct __ns1__modifySampleParameterResponse *_p =
-      soap_instantiate___ns1__modifySampleParameterResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate___ns1__modifySampleParameterResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifySampleParameterResponse(soap, _p);
   }
@@ -38104,8 +38385,8 @@ soap_new_set___ns1__modifySampleParameterResponse(
     struct soap *soap,
     ns1__modifySampleParameterResponse *ns1__modifySampleParameterResponse_) {
   struct __ns1__modifySampleParameterResponse *_p =
-      soap_instantiate___ns1__modifySampleParameterResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate___ns1__modifySampleParameterResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifySampleParameterResponse(soap, _p);
     _p->ns1__modifySampleParameterResponse_ =
@@ -38173,13 +38454,15 @@ soap_instantiate___ns1__modifyPublication(struct soap *, int, const char *,
 
 inline struct __ns1__modifyPublication *
 soap_new___ns1__modifyPublication(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifyPublication(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__modifyPublication(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline struct __ns1__modifyPublication *
 soap_new_req___ns1__modifyPublication(struct soap *soap) {
   struct __ns1__modifyPublication *_p =
-      soap_instantiate___ns1__modifyPublication(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__modifyPublication(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__modifyPublication(soap, _p);
   }
@@ -38189,7 +38472,8 @@ soap_new_req___ns1__modifyPublication(struct soap *soap) {
 inline struct __ns1__modifyPublication *soap_new_set___ns1__modifyPublication(
     struct soap *soap, ns1__modifyPublication *ns1__modifyPublication_) {
   struct __ns1__modifyPublication *_p =
-      soap_instantiate___ns1__modifyPublication(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__modifyPublication(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__modifyPublication(soap, _p);
     _p->ns1__modifyPublication_ = ns1__modifyPublication_;
@@ -38257,15 +38541,15 @@ soap_instantiate___ns1__modifyPublicationResponse(struct soap *, int,
 
 inline struct __ns1__modifyPublicationResponse *
 soap_new___ns1__modifyPublicationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifyPublicationResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate___ns1__modifyPublicationResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline struct __ns1__modifyPublicationResponse *
 soap_new_req___ns1__modifyPublicationResponse(struct soap *soap) {
   struct __ns1__modifyPublicationResponse *_p =
-      soap_instantiate___ns1__modifyPublicationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__modifyPublicationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyPublicationResponse(soap, _p);
   }
@@ -38277,8 +38561,8 @@ soap_new_set___ns1__modifyPublicationResponse(
     struct soap *soap,
     ns1__modifyPublicationResponse *ns1__modifyPublicationResponse_) {
   struct __ns1__modifyPublicationResponse *_p =
-      soap_instantiate___ns1__modifyPublicationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__modifyPublicationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyPublicationResponse(soap, _p);
     _p->ns1__modifyPublicationResponse_ = ns1__modifyPublicationResponse_;
@@ -38341,13 +38625,14 @@ soap_instantiate___ns1__modifySample(struct soap *, int, const char *,
 
 inline struct __ns1__modifySample *
 soap_new___ns1__modifySample(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifySample(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__modifySample(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline struct __ns1__modifySample *
 soap_new_req___ns1__modifySample(struct soap *soap) {
   struct __ns1__modifySample *_p =
-      soap_instantiate___ns1__modifySample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__modifySample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifySample(soap, _p);
   }
@@ -38358,7 +38643,7 @@ inline struct __ns1__modifySample *
 soap_new_set___ns1__modifySample(struct soap *soap,
                                  ns1__modifySample *ns1__modifySample_) {
   struct __ns1__modifySample *_p =
-      soap_instantiate___ns1__modifySample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__modifySample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifySample(soap, _p);
     _p->ns1__modifySample_ = ns1__modifySample_;
@@ -38426,14 +38711,15 @@ soap_instantiate___ns1__modifySampleResponse(struct soap *, int, const char *,
 
 inline struct __ns1__modifySampleResponse *
 soap_new___ns1__modifySampleResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifySampleResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate___ns1__modifySampleResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline struct __ns1__modifySampleResponse *
 soap_new_req___ns1__modifySampleResponse(struct soap *soap) {
   struct __ns1__modifySampleResponse *_p =
-      soap_instantiate___ns1__modifySampleResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__modifySampleResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     soap_default___ns1__modifySampleResponse(soap, _p);
   }
@@ -38444,7 +38730,8 @@ inline struct __ns1__modifySampleResponse *
 soap_new_set___ns1__modifySampleResponse(
     struct soap *soap, ns1__modifySampleResponse *ns1__modifySampleResponse_) {
   struct __ns1__modifySampleResponse *_p =
-      soap_instantiate___ns1__modifySampleResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__modifySampleResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     soap_default___ns1__modifySampleResponse(soap, _p);
     _p->ns1__modifySampleResponse_ = ns1__modifySampleResponse_;
@@ -38513,13 +38800,15 @@ soap_instantiate___ns1__modifyInvestigator(struct soap *, int, const char *,
 
 inline struct __ns1__modifyInvestigator *
 soap_new___ns1__modifyInvestigator(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifyInvestigator(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__modifyInvestigator(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline struct __ns1__modifyInvestigator *
 soap_new_req___ns1__modifyInvestigator(struct soap *soap) {
   struct __ns1__modifyInvestigator *_p =
-      soap_instantiate___ns1__modifyInvestigator(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__modifyInvestigator(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__modifyInvestigator(soap, _p);
   }
@@ -38529,7 +38818,8 @@ soap_new_req___ns1__modifyInvestigator(struct soap *soap) {
 inline struct __ns1__modifyInvestigator *soap_new_set___ns1__modifyInvestigator(
     struct soap *soap, ns1__modifyInvestigator *ns1__modifyInvestigator_) {
   struct __ns1__modifyInvestigator *_p =
-      soap_instantiate___ns1__modifyInvestigator(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__modifyInvestigator(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__modifyInvestigator(soap, _p);
     _p->ns1__modifyInvestigator_ = ns1__modifyInvestigator_;
@@ -38597,15 +38887,15 @@ soap_instantiate___ns1__modifyInvestigatorResponse(struct soap *, int,
 
 inline struct __ns1__modifyInvestigatorResponse *
 soap_new___ns1__modifyInvestigatorResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifyInvestigatorResponse(soap, n, NULL, NULL,
-                                                            NULL);
+  return soap_instantiate___ns1__modifyInvestigatorResponse(soap, n, nullptr,
+                                                            nullptr, nullptr);
 }
 
 inline struct __ns1__modifyInvestigatorResponse *
 soap_new_req___ns1__modifyInvestigatorResponse(struct soap *soap) {
   struct __ns1__modifyInvestigatorResponse *_p =
-      soap_instantiate___ns1__modifyInvestigatorResponse(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate___ns1__modifyInvestigatorResponse(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyInvestigatorResponse(soap, _p);
   }
@@ -38617,8 +38907,8 @@ soap_new_set___ns1__modifyInvestigatorResponse(
     struct soap *soap,
     ns1__modifyInvestigatorResponse *ns1__modifyInvestigatorResponse_) {
   struct __ns1__modifyInvestigatorResponse *_p =
-      soap_instantiate___ns1__modifyInvestigatorResponse(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate___ns1__modifyInvestigatorResponse(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyInvestigatorResponse(soap, _p);
     _p->ns1__modifyInvestigatorResponse_ = ns1__modifyInvestigatorResponse_;
@@ -38686,13 +38976,15 @@ soap_instantiate___ns1__modifyInvestigation(struct soap *, int, const char *,
 
 inline struct __ns1__modifyInvestigation *
 soap_new___ns1__modifyInvestigation(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifyInvestigation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__modifyInvestigation(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline struct __ns1__modifyInvestigation *
 soap_new_req___ns1__modifyInvestigation(struct soap *soap) {
   struct __ns1__modifyInvestigation *_p =
-      soap_instantiate___ns1__modifyInvestigation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__modifyInvestigation(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__modifyInvestigation(soap, _p);
   }
@@ -38703,7 +38995,8 @@ inline struct __ns1__modifyInvestigation *
 soap_new_set___ns1__modifyInvestigation(
     struct soap *soap, ns1__modifyInvestigation *ns1__modifyInvestigation_) {
   struct __ns1__modifyInvestigation *_p =
-      soap_instantiate___ns1__modifyInvestigation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__modifyInvestigation(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__modifyInvestigation(soap, _p);
     _p->ns1__modifyInvestigation_ = ns1__modifyInvestigation_;
@@ -38771,15 +39064,15 @@ soap_instantiate___ns1__modifyInvestigationResponse(struct soap *, int,
 
 inline struct __ns1__modifyInvestigationResponse *
 soap_new___ns1__modifyInvestigationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__modifyInvestigationResponse(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate___ns1__modifyInvestigationResponse(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline struct __ns1__modifyInvestigationResponse *
 soap_new_req___ns1__modifyInvestigationResponse(struct soap *soap) {
   struct __ns1__modifyInvestigationResponse *_p =
-      soap_instantiate___ns1__modifyInvestigationResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__modifyInvestigationResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyInvestigationResponse(soap, _p);
   }
@@ -38791,8 +39084,8 @@ soap_new_set___ns1__modifyInvestigationResponse(
     struct soap *soap,
     ns1__modifyInvestigationResponse *ns1__modifyInvestigationResponse_) {
   struct __ns1__modifyInvestigationResponse *_p =
-      soap_instantiate___ns1__modifyInvestigationResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__modifyInvestigationResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__modifyInvestigationResponse(soap, _p);
     _p->ns1__modifyInvestigationResponse_ = ns1__modifyInvestigationResponse_;
@@ -38858,14 +39151,15 @@ soap_instantiate___ns1__deleteSampleParameter(struct soap *, int, const char *,
 
 inline struct __ns1__deleteSampleParameter *
 soap_new___ns1__deleteSampleParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteSampleParameter(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate___ns1__deleteSampleParameter(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline struct __ns1__deleteSampleParameter *
 soap_new_req___ns1__deleteSampleParameter(struct soap *soap) {
   struct __ns1__deleteSampleParameter *_p =
-      soap_instantiate___ns1__deleteSampleParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteSampleParameter(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__deleteSampleParameter(soap, _p);
   }
@@ -38877,7 +39171,8 @@ soap_new_set___ns1__deleteSampleParameter(
     struct soap *soap,
     ns1__deleteSampleParameter *ns1__deleteSampleParameter_) {
   struct __ns1__deleteSampleParameter *_p =
-      soap_instantiate___ns1__deleteSampleParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteSampleParameter(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__deleteSampleParameter(soap, _p);
     _p->ns1__deleteSampleParameter_ = ns1__deleteSampleParameter_;
@@ -38944,15 +39239,15 @@ soap_instantiate___ns1__deleteSampleParameterResponse(struct soap *, int,
 
 inline struct __ns1__deleteSampleParameterResponse *
 soap_new___ns1__deleteSampleParameterResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteSampleParameterResponse(soap, n, NULL,
-                                                               NULL, NULL);
+  return soap_instantiate___ns1__deleteSampleParameterResponse(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__deleteSampleParameterResponse *
 soap_new_req___ns1__deleteSampleParameterResponse(struct soap *soap) {
   struct __ns1__deleteSampleParameterResponse *_p =
-      soap_instantiate___ns1__deleteSampleParameterResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate___ns1__deleteSampleParameterResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteSampleParameterResponse(soap, _p);
   }
@@ -38964,8 +39259,8 @@ soap_new_set___ns1__deleteSampleParameterResponse(
     struct soap *soap,
     ns1__deleteSampleParameterResponse *ns1__deleteSampleParameterResponse_) {
   struct __ns1__deleteSampleParameterResponse *_p =
-      soap_instantiate___ns1__deleteSampleParameterResponse(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate___ns1__deleteSampleParameterResponse(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteSampleParameterResponse(soap, _p);
     _p->ns1__deleteSampleParameterResponse_ =
@@ -39029,13 +39324,14 @@ soap_instantiate___ns1__deleteSample(struct soap *, int, const char *,
 
 inline struct __ns1__deleteSample *
 soap_new___ns1__deleteSample(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteSample(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__deleteSample(soap, n, nullptr, nullptr,
+                                              nullptr);
 }
 
 inline struct __ns1__deleteSample *
 soap_new_req___ns1__deleteSample(struct soap *soap) {
   struct __ns1__deleteSample *_p =
-      soap_instantiate___ns1__deleteSample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteSample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteSample(soap, _p);
   }
@@ -39046,7 +39342,7 @@ inline struct __ns1__deleteSample *
 soap_new_set___ns1__deleteSample(struct soap *soap,
                                  ns1__deleteSample *ns1__deleteSample_) {
   struct __ns1__deleteSample *_p =
-      soap_instantiate___ns1__deleteSample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteSample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteSample(soap, _p);
     _p->ns1__deleteSample_ = ns1__deleteSample_;
@@ -39114,14 +39410,15 @@ soap_instantiate___ns1__deleteSampleResponse(struct soap *, int, const char *,
 
 inline struct __ns1__deleteSampleResponse *
 soap_new___ns1__deleteSampleResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteSampleResponse(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate___ns1__deleteSampleResponse(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline struct __ns1__deleteSampleResponse *
 soap_new_req___ns1__deleteSampleResponse(struct soap *soap) {
   struct __ns1__deleteSampleResponse *_p =
-      soap_instantiate___ns1__deleteSampleResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteSampleResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     soap_default___ns1__deleteSampleResponse(soap, _p);
   }
@@ -39132,7 +39429,8 @@ inline struct __ns1__deleteSampleResponse *
 soap_new_set___ns1__deleteSampleResponse(
     struct soap *soap, ns1__deleteSampleResponse *ns1__deleteSampleResponse_) {
   struct __ns1__deleteSampleResponse *_p =
-      soap_instantiate___ns1__deleteSampleResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteSampleResponse(soap, -1, nullptr, nullptr,
+                                                   nullptr);
   if (_p) {
     soap_default___ns1__deleteSampleResponse(soap, _p);
     _p->ns1__deleteSampleResponse_ = ns1__deleteSampleResponse_;
@@ -39200,13 +39498,15 @@ soap_instantiate___ns1__deletePublication(struct soap *, int, const char *,
 
 inline struct __ns1__deletePublication *
 soap_new___ns1__deletePublication(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deletePublication(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__deletePublication(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline struct __ns1__deletePublication *
 soap_new_req___ns1__deletePublication(struct soap *soap) {
   struct __ns1__deletePublication *_p =
-      soap_instantiate___ns1__deletePublication(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deletePublication(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__deletePublication(soap, _p);
   }
@@ -39216,7 +39516,8 @@ soap_new_req___ns1__deletePublication(struct soap *soap) {
 inline struct __ns1__deletePublication *soap_new_set___ns1__deletePublication(
     struct soap *soap, ns1__deletePublication *ns1__deletePublication_) {
   struct __ns1__deletePublication *_p =
-      soap_instantiate___ns1__deletePublication(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deletePublication(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__deletePublication(soap, _p);
     _p->ns1__deletePublication_ = ns1__deletePublication_;
@@ -39284,15 +39585,15 @@ soap_instantiate___ns1__deletePublicationResponse(struct soap *, int,
 
 inline struct __ns1__deletePublicationResponse *
 soap_new___ns1__deletePublicationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deletePublicationResponse(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate___ns1__deletePublicationResponse(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline struct __ns1__deletePublicationResponse *
 soap_new_req___ns1__deletePublicationResponse(struct soap *soap) {
   struct __ns1__deletePublicationResponse *_p =
-      soap_instantiate___ns1__deletePublicationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__deletePublicationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deletePublicationResponse(soap, _p);
   }
@@ -39304,8 +39605,8 @@ soap_new_set___ns1__deletePublicationResponse(
     struct soap *soap,
     ns1__deletePublicationResponse *ns1__deletePublicationResponse_) {
   struct __ns1__deletePublicationResponse *_p =
-      soap_instantiate___ns1__deletePublicationResponse(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__deletePublicationResponse(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deletePublicationResponse(soap, _p);
     _p->ns1__deletePublicationResponse_ = ns1__deletePublicationResponse_;
@@ -39370,13 +39671,14 @@ soap_instantiate___ns1__deleteKeyword(struct soap *, int, const char *,
 
 inline struct __ns1__deleteKeyword *
 soap_new___ns1__deleteKeyword(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteKeyword(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__deleteKeyword(soap, n, nullptr, nullptr,
+                                               nullptr);
 }
 
 inline struct __ns1__deleteKeyword *
 soap_new_req___ns1__deleteKeyword(struct soap *soap) {
-  struct __ns1__deleteKeyword *_p =
-      soap_instantiate___ns1__deleteKeyword(soap, -1, NULL, NULL, NULL);
+  struct __ns1__deleteKeyword *_p = soap_instantiate___ns1__deleteKeyword(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteKeyword(soap, _p);
   }
@@ -39386,8 +39688,8 @@ soap_new_req___ns1__deleteKeyword(struct soap *soap) {
 inline struct __ns1__deleteKeyword *
 soap_new_set___ns1__deleteKeyword(struct soap *soap,
                                   ns1__deleteKeyword *ns1__deleteKeyword_) {
-  struct __ns1__deleteKeyword *_p =
-      soap_instantiate___ns1__deleteKeyword(soap, -1, NULL, NULL, NULL);
+  struct __ns1__deleteKeyword *_p = soap_instantiate___ns1__deleteKeyword(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteKeyword(soap, _p);
     _p->ns1__deleteKeyword_ = ns1__deleteKeyword_;
@@ -39453,14 +39755,15 @@ soap_instantiate___ns1__deleteKeywordResponse(struct soap *, int, const char *,
 
 inline struct __ns1__deleteKeywordResponse *
 soap_new___ns1__deleteKeywordResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteKeywordResponse(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate___ns1__deleteKeywordResponse(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline struct __ns1__deleteKeywordResponse *
 soap_new_req___ns1__deleteKeywordResponse(struct soap *soap) {
   struct __ns1__deleteKeywordResponse *_p =
-      soap_instantiate___ns1__deleteKeywordResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteKeywordResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__deleteKeywordResponse(soap, _p);
   }
@@ -39472,7 +39775,8 @@ soap_new_set___ns1__deleteKeywordResponse(
     struct soap *soap,
     ns1__deleteKeywordResponse *ns1__deleteKeywordResponse_) {
   struct __ns1__deleteKeywordResponse *_p =
-      soap_instantiate___ns1__deleteKeywordResponse(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteKeywordResponse(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__deleteKeywordResponse(soap, _p);
     _p->ns1__deleteKeywordResponse_ = ns1__deleteKeywordResponse_;
@@ -39540,13 +39844,15 @@ soap_instantiate___ns1__deleteInvestigator(struct soap *, int, const char *,
 
 inline struct __ns1__deleteInvestigator *
 soap_new___ns1__deleteInvestigator(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteInvestigator(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__deleteInvestigator(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline struct __ns1__deleteInvestigator *
 soap_new_req___ns1__deleteInvestigator(struct soap *soap) {
   struct __ns1__deleteInvestigator *_p =
-      soap_instantiate___ns1__deleteInvestigator(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteInvestigator(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__deleteInvestigator(soap, _p);
   }
@@ -39556,7 +39862,8 @@ soap_new_req___ns1__deleteInvestigator(struct soap *soap) {
 inline struct __ns1__deleteInvestigator *soap_new_set___ns1__deleteInvestigator(
     struct soap *soap, ns1__deleteInvestigator *ns1__deleteInvestigator_) {
   struct __ns1__deleteInvestigator *_p =
-      soap_instantiate___ns1__deleteInvestigator(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteInvestigator(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__deleteInvestigator(soap, _p);
     _p->ns1__deleteInvestigator_ = ns1__deleteInvestigator_;
@@ -39624,15 +39931,15 @@ soap_instantiate___ns1__deleteInvestigatorResponse(struct soap *, int,
 
 inline struct __ns1__deleteInvestigatorResponse *
 soap_new___ns1__deleteInvestigatorResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteInvestigatorResponse(soap, n, NULL, NULL,
-                                                            NULL);
+  return soap_instantiate___ns1__deleteInvestigatorResponse(soap, n, nullptr,
+                                                            nullptr, nullptr);
 }
 
 inline struct __ns1__deleteInvestigatorResponse *
 soap_new_req___ns1__deleteInvestigatorResponse(struct soap *soap) {
   struct __ns1__deleteInvestigatorResponse *_p =
-      soap_instantiate___ns1__deleteInvestigatorResponse(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate___ns1__deleteInvestigatorResponse(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteInvestigatorResponse(soap, _p);
   }
@@ -39644,8 +39951,8 @@ soap_new_set___ns1__deleteInvestigatorResponse(
     struct soap *soap,
     ns1__deleteInvestigatorResponse *ns1__deleteInvestigatorResponse_) {
   struct __ns1__deleteInvestigatorResponse *_p =
-      soap_instantiate___ns1__deleteInvestigatorResponse(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate___ns1__deleteInvestigatorResponse(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteInvestigatorResponse(soap, _p);
     _p->ns1__deleteInvestigatorResponse_ = ns1__deleteInvestigatorResponse_;
@@ -39713,13 +40020,15 @@ soap_instantiate___ns1__addSampleParameter(struct soap *, int, const char *,
 
 inline struct __ns1__addSampleParameter *
 soap_new___ns1__addSampleParameter(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__addSampleParameter(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__addSampleParameter(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline struct __ns1__addSampleParameter *
 soap_new_req___ns1__addSampleParameter(struct soap *soap) {
   struct __ns1__addSampleParameter *_p =
-      soap_instantiate___ns1__addSampleParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__addSampleParameter(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__addSampleParameter(soap, _p);
   }
@@ -39729,7 +40038,8 @@ soap_new_req___ns1__addSampleParameter(struct soap *soap) {
 inline struct __ns1__addSampleParameter *soap_new_set___ns1__addSampleParameter(
     struct soap *soap, ns1__addSampleParameter *ns1__addSampleParameter_) {
   struct __ns1__addSampleParameter *_p =
-      soap_instantiate___ns1__addSampleParameter(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__addSampleParameter(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__addSampleParameter(soap, _p);
     _p->ns1__addSampleParameter_ = ns1__addSampleParameter_;
@@ -39796,13 +40106,14 @@ soap_instantiate___ns1__addPublication(struct soap *, int, const char *,
 
 inline struct __ns1__addPublication *
 soap_new___ns1__addPublication(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__addPublication(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__addPublication(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline struct __ns1__addPublication *
 soap_new_req___ns1__addPublication(struct soap *soap) {
-  struct __ns1__addPublication *_p =
-      soap_instantiate___ns1__addPublication(soap, -1, NULL, NULL, NULL);
+  struct __ns1__addPublication *_p = soap_instantiate___ns1__addPublication(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__addPublication(soap, _p);
   }
@@ -39812,8 +40123,8 @@ soap_new_req___ns1__addPublication(struct soap *soap) {
 inline struct __ns1__addPublication *
 soap_new_set___ns1__addPublication(struct soap *soap,
                                    ns1__addPublication *ns1__addPublication_) {
-  struct __ns1__addPublication *_p =
-      soap_instantiate___ns1__addPublication(soap, -1, NULL, NULL, NULL);
+  struct __ns1__addPublication *_p = soap_instantiate___ns1__addPublication(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__addPublication(soap, _p);
     _p->ns1__addPublication_ = ns1__addPublication_;
@@ -39875,13 +40186,13 @@ soap_instantiate___ns1__addSample(struct soap *, int, const char *,
 
 inline struct __ns1__addSample *soap_new___ns1__addSample(struct soap *soap,
                                                           int n = -1) {
-  return soap_instantiate___ns1__addSample(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__addSample(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__addSample *
 soap_new_req___ns1__addSample(struct soap *soap) {
   struct __ns1__addSample *_p =
-      soap_instantiate___ns1__addSample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__addSample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__addSample(soap, _p);
   }
@@ -39892,7 +40203,7 @@ inline struct __ns1__addSample *
 soap_new_set___ns1__addSample(struct soap *soap,
                               ns1__addSample *ns1__addSample_) {
   struct __ns1__addSample *_p =
-      soap_instantiate___ns1__addSample(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__addSample(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__addSample(soap, _p);
     _p->ns1__addSample_ = ns1__addSample_;
@@ -39958,13 +40269,14 @@ soap_instantiate___ns1__addInvestigator(struct soap *, int, const char *,
 
 inline struct __ns1__addInvestigator *
 soap_new___ns1__addInvestigator(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__addInvestigator(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__addInvestigator(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline struct __ns1__addInvestigator *
 soap_new_req___ns1__addInvestigator(struct soap *soap) {
-  struct __ns1__addInvestigator *_p =
-      soap_instantiate___ns1__addInvestigator(soap, -1, NULL, NULL, NULL);
+  struct __ns1__addInvestigator *_p = soap_instantiate___ns1__addInvestigator(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__addInvestigator(soap, _p);
   }
@@ -39973,8 +40285,8 @@ soap_new_req___ns1__addInvestigator(struct soap *soap) {
 
 inline struct __ns1__addInvestigator *soap_new_set___ns1__addInvestigator(
     struct soap *soap, ns1__addInvestigator *ns1__addInvestigator_) {
-  struct __ns1__addInvestigator *_p =
-      soap_instantiate___ns1__addInvestigator(soap, -1, NULL, NULL, NULL);
+  struct __ns1__addInvestigator *_p = soap_instantiate___ns1__addInvestigator(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__addInvestigator(soap, _p);
     _p->ns1__addInvestigator_ = ns1__addInvestigator_;
@@ -40038,13 +40350,13 @@ soap_instantiate___ns1__addKeyword(struct soap *, int, const char *,
 
 inline struct __ns1__addKeyword *soap_new___ns1__addKeyword(struct soap *soap,
                                                             int n = -1) {
-  return soap_instantiate___ns1__addKeyword(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__addKeyword(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__addKeyword *
 soap_new_req___ns1__addKeyword(struct soap *soap) {
   struct __ns1__addKeyword *_p =
-      soap_instantiate___ns1__addKeyword(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__addKeyword(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__addKeyword(soap, _p);
   }
@@ -40055,7 +40367,7 @@ inline struct __ns1__addKeyword *
 soap_new_set___ns1__addKeyword(struct soap *soap,
                                ns1__addKeyword *ns1__addKeyword_) {
   struct __ns1__addKeyword *_p =
-      soap_instantiate___ns1__addKeyword(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__addKeyword(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__addKeyword(soap, _p);
     _p->ns1__addKeyword_ = ns1__addKeyword_;
@@ -40123,13 +40435,15 @@ soap_instantiate___ns1__removeInvestigation(struct soap *, int, const char *,
 
 inline struct __ns1__removeInvestigation *
 soap_new___ns1__removeInvestigation(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeInvestigation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__removeInvestigation(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline struct __ns1__removeInvestigation *
 soap_new_req___ns1__removeInvestigation(struct soap *soap) {
   struct __ns1__removeInvestigation *_p =
-      soap_instantiate___ns1__removeInvestigation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeInvestigation(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__removeInvestigation(soap, _p);
   }
@@ -40140,7 +40454,8 @@ inline struct __ns1__removeInvestigation *
 soap_new_set___ns1__removeInvestigation(
     struct soap *soap, ns1__removeInvestigation *ns1__removeInvestigation_) {
   struct __ns1__removeInvestigation *_p =
-      soap_instantiate___ns1__removeInvestigation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__removeInvestigation(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__removeInvestigation(soap, _p);
     _p->ns1__removeInvestigation_ = ns1__removeInvestigation_;
@@ -40208,15 +40523,15 @@ soap_instantiate___ns1__removeInvestigationResponse(struct soap *, int,
 
 inline struct __ns1__removeInvestigationResponse *
 soap_new___ns1__removeInvestigationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__removeInvestigationResponse(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate___ns1__removeInvestigationResponse(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline struct __ns1__removeInvestigationResponse *
 soap_new_req___ns1__removeInvestigationResponse(struct soap *soap) {
   struct __ns1__removeInvestigationResponse *_p =
-      soap_instantiate___ns1__removeInvestigationResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__removeInvestigationResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeInvestigationResponse(soap, _p);
   }
@@ -40228,8 +40543,8 @@ soap_new_set___ns1__removeInvestigationResponse(
     struct soap *soap,
     ns1__removeInvestigationResponse *ns1__removeInvestigationResponse_) {
   struct __ns1__removeInvestigationResponse *_p =
-      soap_instantiate___ns1__removeInvestigationResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__removeInvestigationResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__removeInvestigationResponse(soap, _p);
     _p->ns1__removeInvestigationResponse_ = ns1__removeInvestigationResponse_;
@@ -40297,13 +40612,15 @@ soap_instantiate___ns1__deleteInvestigation(struct soap *, int, const char *,
 
 inline struct __ns1__deleteInvestigation *
 soap_new___ns1__deleteInvestigation(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteInvestigation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__deleteInvestigation(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline struct __ns1__deleteInvestigation *
 soap_new_req___ns1__deleteInvestigation(struct soap *soap) {
   struct __ns1__deleteInvestigation *_p =
-      soap_instantiate___ns1__deleteInvestigation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteInvestigation(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__deleteInvestigation(soap, _p);
   }
@@ -40314,7 +40631,8 @@ inline struct __ns1__deleteInvestigation *
 soap_new_set___ns1__deleteInvestigation(
     struct soap *soap, ns1__deleteInvestigation *ns1__deleteInvestigation_) {
   struct __ns1__deleteInvestigation *_p =
-      soap_instantiate___ns1__deleteInvestigation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__deleteInvestigation(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__deleteInvestigation(soap, _p);
     _p->ns1__deleteInvestigation_ = ns1__deleteInvestigation_;
@@ -40382,15 +40700,15 @@ soap_instantiate___ns1__deleteInvestigationResponse(struct soap *, int,
 
 inline struct __ns1__deleteInvestigationResponse *
 soap_new___ns1__deleteInvestigationResponse(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__deleteInvestigationResponse(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate___ns1__deleteInvestigationResponse(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline struct __ns1__deleteInvestigationResponse *
 soap_new_req___ns1__deleteInvestigationResponse(struct soap *soap) {
   struct __ns1__deleteInvestigationResponse *_p =
-      soap_instantiate___ns1__deleteInvestigationResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__deleteInvestigationResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteInvestigationResponse(soap, _p);
   }
@@ -40402,8 +40720,8 @@ soap_new_set___ns1__deleteInvestigationResponse(
     struct soap *soap,
     ns1__deleteInvestigationResponse *ns1__deleteInvestigationResponse_) {
   struct __ns1__deleteInvestigationResponse *_p =
-      soap_instantiate___ns1__deleteInvestigationResponse(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__deleteInvestigationResponse(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__deleteInvestigationResponse(soap, _p);
     _p->ns1__deleteInvestigationResponse_ = ns1__deleteInvestigationResponse_;
@@ -40471,13 +40789,15 @@ soap_instantiate___ns1__createInvestigation(struct soap *, int, const char *,
 
 inline struct __ns1__createInvestigation *
 soap_new___ns1__createInvestigation(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__createInvestigation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__createInvestigation(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline struct __ns1__createInvestigation *
 soap_new_req___ns1__createInvestigation(struct soap *soap) {
   struct __ns1__createInvestigation *_p =
-      soap_instantiate___ns1__createInvestigation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__createInvestigation(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__createInvestigation(soap, _p);
   }
@@ -40488,7 +40808,8 @@ inline struct __ns1__createInvestigation *
 soap_new_set___ns1__createInvestigation(
     struct soap *soap, ns1__createInvestigation *ns1__createInvestigation_) {
   struct __ns1__createInvestigation *_p =
-      soap_instantiate___ns1__createInvestigation(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__createInvestigation(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__createInvestigation(soap, _p);
     _p->ns1__createInvestigation_ = ns1__createInvestigation_;
@@ -40556,15 +40877,15 @@ soap_instantiate___ns1__getInvestigationsIncludes(struct soap *, int,
 
 inline struct __ns1__getInvestigationsIncludes *
 soap_new___ns1__getInvestigationsIncludes(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getInvestigationsIncludes(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate___ns1__getInvestigationsIncludes(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline struct __ns1__getInvestigationsIncludes *
 soap_new_req___ns1__getInvestigationsIncludes(struct soap *soap) {
   struct __ns1__getInvestigationsIncludes *_p =
-      soap_instantiate___ns1__getInvestigationsIncludes(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__getInvestigationsIncludes(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getInvestigationsIncludes(soap, _p);
   }
@@ -40576,8 +40897,8 @@ soap_new_set___ns1__getInvestigationsIncludes(
     struct soap *soap,
     ns1__getInvestigationsIncludes *ns1__getInvestigationsIncludes_) {
   struct __ns1__getInvestigationsIncludes *_p =
-      soap_instantiate___ns1__getInvestigationsIncludes(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__getInvestigationsIncludes(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getInvestigationsIncludes(soap, _p);
     _p->ns1__getInvestigationsIncludes_ = ns1__getInvestigationsIncludes_;
@@ -40644,13 +40965,15 @@ soap_instantiate___ns1__getInvestigations(struct soap *, int, const char *,
 
 inline struct __ns1__getInvestigations *
 soap_new___ns1__getInvestigations(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getInvestigations(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getInvestigations(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline struct __ns1__getInvestigations *
 soap_new_req___ns1__getInvestigations(struct soap *soap) {
   struct __ns1__getInvestigations *_p =
-      soap_instantiate___ns1__getInvestigations(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getInvestigations(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__getInvestigations(soap, _p);
   }
@@ -40660,7 +40983,8 @@ soap_new_req___ns1__getInvestigations(struct soap *soap) {
 inline struct __ns1__getInvestigations *soap_new_set___ns1__getInvestigations(
     struct soap *soap, ns1__getInvestigations *ns1__getInvestigations_) {
   struct __ns1__getInvestigations *_p =
-      soap_instantiate___ns1__getInvestigations(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getInvestigations(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__getInvestigations(soap, _p);
     _p->ns1__getInvestigations_ = ns1__getInvestigations_;
@@ -40728,15 +41052,15 @@ soap_instantiate___ns1__getInvestigationIncludes(struct soap *, int,
 
 inline struct __ns1__getInvestigationIncludes *
 soap_new___ns1__getInvestigationIncludes(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getInvestigationIncludes(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate___ns1__getInvestigationIncludes(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline struct __ns1__getInvestigationIncludes *
 soap_new_req___ns1__getInvestigationIncludes(struct soap *soap) {
   struct __ns1__getInvestigationIncludes *_p =
-      soap_instantiate___ns1__getInvestigationIncludes(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate___ns1__getInvestigationIncludes(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getInvestigationIncludes(soap, _p);
   }
@@ -40748,8 +41072,8 @@ soap_new_set___ns1__getInvestigationIncludes(
     struct soap *soap,
     ns1__getInvestigationIncludes *ns1__getInvestigationIncludes_) {
   struct __ns1__getInvestigationIncludes *_p =
-      soap_instantiate___ns1__getInvestigationIncludes(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate___ns1__getInvestigationIncludes(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getInvestigationIncludes(soap, _p);
     _p->ns1__getInvestigationIncludes_ = ns1__getInvestigationIncludes_;
@@ -40816,13 +41140,14 @@ soap_instantiate___ns1__getInvestigation(struct soap *, int, const char *,
 
 inline struct __ns1__getInvestigation *
 soap_new___ns1__getInvestigation(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getInvestigation(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getInvestigation(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline struct __ns1__getInvestigation *
 soap_new_req___ns1__getInvestigation(struct soap *soap) {
-  struct __ns1__getInvestigation *_p =
-      soap_instantiate___ns1__getInvestigation(soap, -1, NULL, NULL, NULL);
+  struct __ns1__getInvestigation *_p = soap_instantiate___ns1__getInvestigation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getInvestigation(soap, _p);
   }
@@ -40831,8 +41156,8 @@ soap_new_req___ns1__getInvestigation(struct soap *soap) {
 
 inline struct __ns1__getInvestigation *soap_new_set___ns1__getInvestigation(
     struct soap *soap, ns1__getInvestigation *ns1__getInvestigation_) {
-  struct __ns1__getInvestigation *_p =
-      soap_instantiate___ns1__getInvestigation(soap, -1, NULL, NULL, NULL);
+  struct __ns1__getInvestigation *_p = soap_instantiate___ns1__getInvestigation(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getInvestigation(soap, _p);
     _p->ns1__getInvestigation_ = ns1__getInvestigation_;
@@ -40901,13 +41226,15 @@ soap_instantiate___ns1__listDatafileFormats(struct soap *, int, const char *,
 
 inline struct __ns1__listDatafileFormats *
 soap_new___ns1__listDatafileFormats(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__listDatafileFormats(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__listDatafileFormats(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline struct __ns1__listDatafileFormats *
 soap_new_req___ns1__listDatafileFormats(struct soap *soap) {
   struct __ns1__listDatafileFormats *_p =
-      soap_instantiate___ns1__listDatafileFormats(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__listDatafileFormats(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__listDatafileFormats(soap, _p);
   }
@@ -40918,7 +41245,8 @@ inline struct __ns1__listDatafileFormats *
 soap_new_set___ns1__listDatafileFormats(
     struct soap *soap, ns1__listDatafileFormats *ns1__listDatafileFormats_) {
   struct __ns1__listDatafileFormats *_p =
-      soap_instantiate___ns1__listDatafileFormats(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__listDatafileFormats(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__listDatafileFormats(soap, _p);
     _p->ns1__listDatafileFormats_ = ns1__listDatafileFormats_;
@@ -40986,15 +41314,15 @@ soap_instantiate___ns1__searchByRunNumberPagination(struct soap *, int,
 
 inline struct __ns1__searchByRunNumberPagination *
 soap_new___ns1__searchByRunNumberPagination(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchByRunNumberPagination(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate___ns1__searchByRunNumberPagination(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline struct __ns1__searchByRunNumberPagination *
 soap_new_req___ns1__searchByRunNumberPagination(struct soap *soap) {
   struct __ns1__searchByRunNumberPagination *_p =
-      soap_instantiate___ns1__searchByRunNumberPagination(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__searchByRunNumberPagination(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchByRunNumberPagination(soap, _p);
   }
@@ -41006,8 +41334,8 @@ soap_new_set___ns1__searchByRunNumberPagination(
     struct soap *soap,
     ns1__searchByRunNumberPagination *ns1__searchByRunNumberPagination_) {
   struct __ns1__searchByRunNumberPagination *_p =
-      soap_instantiate___ns1__searchByRunNumberPagination(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__searchByRunNumberPagination(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchByRunNumberPagination(soap, _p);
     _p->ns1__searchByRunNumberPagination_ = ns1__searchByRunNumberPagination_;
@@ -41074,13 +41402,15 @@ soap_instantiate___ns1__searchByRunNumber(struct soap *, int, const char *,
 
 inline struct __ns1__searchByRunNumber *
 soap_new___ns1__searchByRunNumber(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchByRunNumber(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__searchByRunNumber(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline struct __ns1__searchByRunNumber *
 soap_new_req___ns1__searchByRunNumber(struct soap *soap) {
   struct __ns1__searchByRunNumber *_p =
-      soap_instantiate___ns1__searchByRunNumber(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__searchByRunNumber(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__searchByRunNumber(soap, _p);
   }
@@ -41090,7 +41420,8 @@ soap_new_req___ns1__searchByRunNumber(struct soap *soap) {
 inline struct __ns1__searchByRunNumber *soap_new_set___ns1__searchByRunNumber(
     struct soap *soap, ns1__searchByRunNumber *ns1__searchByRunNumber_) {
   struct __ns1__searchByRunNumber *_p =
-      soap_instantiate___ns1__searchByRunNumber(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__searchByRunNumber(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__searchByRunNumber(soap, _p);
     _p->ns1__searchByRunNumber_ = ns1__searchByRunNumber_;
@@ -41158,13 +41489,15 @@ soap_instantiate___ns1__listDatasetStatus(struct soap *, int, const char *,
 
 inline struct __ns1__listDatasetStatus *
 soap_new___ns1__listDatasetStatus(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__listDatasetStatus(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__listDatasetStatus(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline struct __ns1__listDatasetStatus *
 soap_new_req___ns1__listDatasetStatus(struct soap *soap) {
   struct __ns1__listDatasetStatus *_p =
-      soap_instantiate___ns1__listDatasetStatus(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__listDatasetStatus(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__listDatasetStatus(soap, _p);
   }
@@ -41174,7 +41507,8 @@ soap_new_req___ns1__listDatasetStatus(struct soap *soap) {
 inline struct __ns1__listDatasetStatus *soap_new_set___ns1__listDatasetStatus(
     struct soap *soap, ns1__listDatasetStatus *ns1__listDatasetStatus_) {
   struct __ns1__listDatasetStatus *_p =
-      soap_instantiate___ns1__listDatasetStatus(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__listDatasetStatus(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__listDatasetStatus(soap, _p);
     _p->ns1__listDatasetStatus_ = ns1__listDatasetStatus_;
@@ -41242,13 +41576,14 @@ soap_instantiate___ns1__listDatasetTypes(struct soap *, int, const char *,
 
 inline struct __ns1__listDatasetTypes *
 soap_new___ns1__listDatasetTypes(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__listDatasetTypes(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__listDatasetTypes(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline struct __ns1__listDatasetTypes *
 soap_new_req___ns1__listDatasetTypes(struct soap *soap) {
-  struct __ns1__listDatasetTypes *_p =
-      soap_instantiate___ns1__listDatasetTypes(soap, -1, NULL, NULL, NULL);
+  struct __ns1__listDatasetTypes *_p = soap_instantiate___ns1__listDatasetTypes(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__listDatasetTypes(soap, _p);
   }
@@ -41257,8 +41592,8 @@ soap_new_req___ns1__listDatasetTypes(struct soap *soap) {
 
 inline struct __ns1__listDatasetTypes *soap_new_set___ns1__listDatasetTypes(
     struct soap *soap, ns1__listDatasetTypes *ns1__listDatasetTypes_) {
-  struct __ns1__listDatasetTypes *_p =
-      soap_instantiate___ns1__listDatasetTypes(soap, -1, NULL, NULL, NULL);
+  struct __ns1__listDatasetTypes *_p = soap_instantiate___ns1__listDatasetTypes(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__listDatasetTypes(soap, _p);
     _p->ns1__listDatasetTypes_ = ns1__listDatasetTypes_;
@@ -41325,15 +41660,15 @@ soap_instantiate___ns1__searchDatasetsBySample(struct soap *, int, const char *,
 
 inline struct __ns1__searchDatasetsBySample *
 soap_new___ns1__searchDatasetsBySample(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchDatasetsBySample(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate___ns1__searchDatasetsBySample(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline struct __ns1__searchDatasetsBySample *
 soap_new_req___ns1__searchDatasetsBySample(struct soap *soap) {
   struct __ns1__searchDatasetsBySample *_p =
-      soap_instantiate___ns1__searchDatasetsBySample(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__searchDatasetsBySample(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetsBySample(soap, _p);
   }
@@ -41345,8 +41680,8 @@ soap_new_set___ns1__searchDatasetsBySample(
     struct soap *soap,
     ns1__searchDatasetsBySample *ns1__searchDatasetsBySample_) {
   struct __ns1__searchDatasetsBySample *_p =
-      soap_instantiate___ns1__searchDatasetsBySample(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__searchDatasetsBySample(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__searchDatasetsBySample(soap, _p);
     _p->ns1__searchDatasetsBySample_ = ns1__searchDatasetsBySample_;
@@ -41413,15 +41748,15 @@ soap_instantiate___ns1__searchSamplesBySampleName(struct soap *, int,
 
 inline struct __ns1__searchSamplesBySampleName *
 soap_new___ns1__searchSamplesBySampleName(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchSamplesBySampleName(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate___ns1__searchSamplesBySampleName(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline struct __ns1__searchSamplesBySampleName *
 soap_new_req___ns1__searchSamplesBySampleName(struct soap *soap) {
   struct __ns1__searchSamplesBySampleName *_p =
-      soap_instantiate___ns1__searchSamplesBySampleName(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__searchSamplesBySampleName(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSamplesBySampleName(soap, _p);
   }
@@ -41433,8 +41768,8 @@ soap_new_set___ns1__searchSamplesBySampleName(
     struct soap *soap,
     ns1__searchSamplesBySampleName *ns1__searchSamplesBySampleName_) {
   struct __ns1__searchSamplesBySampleName *_p =
-      soap_instantiate___ns1__searchSamplesBySampleName(soap, -1, NULL, NULL,
-                                                        NULL);
+      soap_instantiate___ns1__searchSamplesBySampleName(soap, -1, nullptr,
+                                                        nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchSamplesBySampleName(soap, _p);
     _p->ns1__searchSamplesBySampleName_ = ns1__searchSamplesBySampleName_;
@@ -41500,15 +41835,15 @@ soap_instantiate___ns1__listInvestigationTypes(struct soap *, int, const char *,
 
 inline struct __ns1__listInvestigationTypes *
 soap_new___ns1__listInvestigationTypes(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__listInvestigationTypes(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate___ns1__listInvestigationTypes(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline struct __ns1__listInvestigationTypes *
 soap_new_req___ns1__listInvestigationTypes(struct soap *soap) {
   struct __ns1__listInvestigationTypes *_p =
-      soap_instantiate___ns1__listInvestigationTypes(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__listInvestigationTypes(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__listInvestigationTypes(soap, _p);
   }
@@ -41520,8 +41855,8 @@ soap_new_set___ns1__listInvestigationTypes(
     struct soap *soap,
     ns1__listInvestigationTypes *ns1__listInvestigationTypes_) {
   struct __ns1__listInvestigationTypes *_p =
-      soap_instantiate___ns1__listInvestigationTypes(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__listInvestigationTypes(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__listInvestigationTypes(soap, _p);
     _p->ns1__listInvestigationTypes_ = ns1__listInvestigationTypes_;
@@ -41587,15 +41922,15 @@ soap_instantiate___ns1__getInstrumentsWithData(struct soap *, int, const char *,
 
 inline struct __ns1__getInstrumentsWithData *
 soap_new___ns1__getInstrumentsWithData(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getInstrumentsWithData(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate___ns1__getInstrumentsWithData(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline struct __ns1__getInstrumentsWithData *
 soap_new_req___ns1__getInstrumentsWithData(struct soap *soap) {
   struct __ns1__getInstrumentsWithData *_p =
-      soap_instantiate___ns1__getInstrumentsWithData(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__getInstrumentsWithData(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__getInstrumentsWithData(soap, _p);
   }
@@ -41607,8 +41942,8 @@ soap_new_set___ns1__getInstrumentsWithData(
     struct soap *soap,
     ns1__getInstrumentsWithData *ns1__getInstrumentsWithData_) {
   struct __ns1__getInstrumentsWithData *_p =
-      soap_instantiate___ns1__getInstrumentsWithData(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__getInstrumentsWithData(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__getInstrumentsWithData(soap, _p);
     _p->ns1__getInstrumentsWithData_ = ns1__getInstrumentsWithData_;
@@ -41682,14 +42017,14 @@ inline struct __ns1__getFacilityCyclesWithDataForInstrument *
 soap_new___ns1__getFacilityCyclesWithDataForInstrument(struct soap *soap,
                                                        int n = -1) {
   return soap_instantiate___ns1__getFacilityCyclesWithDataForInstrument(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__getFacilityCyclesWithDataForInstrument *
 soap_new_req___ns1__getFacilityCyclesWithDataForInstrument(struct soap *soap) {
   struct __ns1__getFacilityCyclesWithDataForInstrument *_p =
       soap_instantiate___ns1__getFacilityCyclesWithDataForInstrument(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getFacilityCyclesWithDataForInstrument(soap, _p);
   }
@@ -41702,7 +42037,7 @@ soap_new_set___ns1__getFacilityCyclesWithDataForInstrument(
                            ns1__getFacilityCyclesWithDataForInstrument_) {
   struct __ns1__getFacilityCyclesWithDataForInstrument *_p =
       soap_instantiate___ns1__getFacilityCyclesWithDataForInstrument(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getFacilityCyclesWithDataForInstrument(soap, _p);
     _p->ns1__getFacilityCyclesWithDataForInstrument_ =
@@ -41773,13 +42108,15 @@ soap_instantiate___ns1__listFacilityCycles(struct soap *, int, const char *,
 
 inline struct __ns1__listFacilityCycles *
 soap_new___ns1__listFacilityCycles(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__listFacilityCycles(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__listFacilityCycles(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline struct __ns1__listFacilityCycles *
 soap_new_req___ns1__listFacilityCycles(struct soap *soap) {
   struct __ns1__listFacilityCycles *_p =
-      soap_instantiate___ns1__listFacilityCycles(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__listFacilityCycles(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__listFacilityCycles(soap, _p);
   }
@@ -41789,7 +42126,8 @@ soap_new_req___ns1__listFacilityCycles(struct soap *soap) {
 inline struct __ns1__listFacilityCycles *soap_new_set___ns1__listFacilityCycles(
     struct soap *soap, ns1__listFacilityCycles *ns1__listFacilityCycles_) {
   struct __ns1__listFacilityCycles *_p =
-      soap_instantiate___ns1__listFacilityCycles(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__listFacilityCycles(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__listFacilityCycles(soap, _p);
     _p->ns1__listFacilityCycles_ = ns1__listFacilityCycles_;
@@ -41856,13 +42194,14 @@ soap_instantiate___ns1__listParameters(struct soap *, int, const char *,
 
 inline struct __ns1__listParameters *
 soap_new___ns1__listParameters(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__listParameters(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__listParameters(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline struct __ns1__listParameters *
 soap_new_req___ns1__listParameters(struct soap *soap) {
-  struct __ns1__listParameters *_p =
-      soap_instantiate___ns1__listParameters(soap, -1, NULL, NULL, NULL);
+  struct __ns1__listParameters *_p = soap_instantiate___ns1__listParameters(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__listParameters(soap, _p);
   }
@@ -41872,8 +42211,8 @@ soap_new_req___ns1__listParameters(struct soap *soap) {
 inline struct __ns1__listParameters *
 soap_new_set___ns1__listParameters(struct soap *soap,
                                    ns1__listParameters *ns1__listParameters_) {
-  struct __ns1__listParameters *_p =
-      soap_instantiate___ns1__listParameters(soap, -1, NULL, NULL, NULL);
+  struct __ns1__listParameters *_p = soap_instantiate___ns1__listParameters(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__listParameters(soap, _p);
     _p->ns1__listParameters_ = ns1__listParameters_;
@@ -41935,13 +42274,13 @@ soap_instantiate___ns1__listRoles(struct soap *, int, const char *,
 
 inline struct __ns1__listRoles *soap_new___ns1__listRoles(struct soap *soap,
                                                           int n = -1) {
-  return soap_instantiate___ns1__listRoles(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__listRoles(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__listRoles *
 soap_new_req___ns1__listRoles(struct soap *soap) {
   struct __ns1__listRoles *_p =
-      soap_instantiate___ns1__listRoles(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__listRoles(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__listRoles(soap, _p);
   }
@@ -41952,7 +42291,7 @@ inline struct __ns1__listRoles *
 soap_new_set___ns1__listRoles(struct soap *soap,
                               ns1__listRoles *ns1__listRoles_) {
   struct __ns1__listRoles *_p =
-      soap_instantiate___ns1__listRoles(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__listRoles(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__listRoles(soap, _p);
     _p->ns1__listRoles_ = ns1__listRoles_;
@@ -42019,13 +42358,15 @@ soap_instantiate___ns1__getAllInstruments(struct soap *, int, const char *,
 
 inline struct __ns1__getAllInstruments *
 soap_new___ns1__getAllInstruments(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getAllInstruments(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getAllInstruments(soap, n, nullptr, nullptr,
+                                                   nullptr);
 }
 
 inline struct __ns1__getAllInstruments *
 soap_new_req___ns1__getAllInstruments(struct soap *soap) {
   struct __ns1__getAllInstruments *_p =
-      soap_instantiate___ns1__getAllInstruments(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getAllInstruments(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__getAllInstruments(soap, _p);
   }
@@ -42035,7 +42376,8 @@ soap_new_req___ns1__getAllInstruments(struct soap *soap) {
 inline struct __ns1__getAllInstruments *soap_new_set___ns1__getAllInstruments(
     struct soap *soap, ns1__getAllInstruments *ns1__getAllInstruments_) {
   struct __ns1__getAllInstruments *_p =
-      soap_instantiate___ns1__getAllInstruments(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getAllInstruments(soap, -1, nullptr, nullptr,
+                                                nullptr);
   if (_p) {
     soap_default___ns1__getAllInstruments(soap, _p);
     _p->ns1__getAllInstruments_ = ns1__getAllInstruments_;
@@ -42102,13 +42444,14 @@ soap_instantiate___ns1__listInstruments(struct soap *, int, const char *,
 
 inline struct __ns1__listInstruments *
 soap_new___ns1__listInstruments(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__listInstruments(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__listInstruments(soap, n, nullptr, nullptr,
+                                                 nullptr);
 }
 
 inline struct __ns1__listInstruments *
 soap_new_req___ns1__listInstruments(struct soap *soap) {
-  struct __ns1__listInstruments *_p =
-      soap_instantiate___ns1__listInstruments(soap, -1, NULL, NULL, NULL);
+  struct __ns1__listInstruments *_p = soap_instantiate___ns1__listInstruments(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__listInstruments(soap, _p);
   }
@@ -42117,8 +42460,8 @@ soap_new_req___ns1__listInstruments(struct soap *soap) {
 
 inline struct __ns1__listInstruments *soap_new_set___ns1__listInstruments(
     struct soap *soap, ns1__listInstruments *ns1__listInstruments_) {
-  struct __ns1__listInstruments *_p =
-      soap_instantiate___ns1__listInstruments(soap, -1, NULL, NULL, NULL);
+  struct __ns1__listInstruments *_p = soap_instantiate___ns1__listInstruments(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__listInstruments(soap, _p);
     _p->ns1__listInstruments_ = ns1__listInstruments_;
@@ -42186,15 +42529,15 @@ soap_instantiate___ns1__searchByUserSurnamePagination(struct soap *, int,
 
 inline struct __ns1__searchByUserSurnamePagination *
 soap_new___ns1__searchByUserSurnamePagination(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchByUserSurnamePagination(soap, n, NULL,
-                                                               NULL, NULL);
+  return soap_instantiate___ns1__searchByUserSurnamePagination(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__searchByUserSurnamePagination *
 soap_new_req___ns1__searchByUserSurnamePagination(struct soap *soap) {
   struct __ns1__searchByUserSurnamePagination *_p =
-      soap_instantiate___ns1__searchByUserSurnamePagination(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate___ns1__searchByUserSurnamePagination(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchByUserSurnamePagination(soap, _p);
   }
@@ -42206,8 +42549,8 @@ soap_new_set___ns1__searchByUserSurnamePagination(
     struct soap *soap,
     ns1__searchByUserSurnamePagination *ns1__searchByUserSurnamePagination_) {
   struct __ns1__searchByUserSurnamePagination *_p =
-      soap_instantiate___ns1__searchByUserSurnamePagination(soap, -1, NULL,
-                                                            NULL, NULL);
+      soap_instantiate___ns1__searchByUserSurnamePagination(soap, -1, nullptr,
+                                                            nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchByUserSurnamePagination(soap, _p);
     _p->ns1__searchByUserSurnamePagination_ =
@@ -42276,13 +42619,15 @@ soap_instantiate___ns1__searchByUserSurname(struct soap *, int, const char *,
 
 inline struct __ns1__searchByUserSurname *
 soap_new___ns1__searchByUserSurname(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchByUserSurname(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__searchByUserSurname(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline struct __ns1__searchByUserSurname *
 soap_new_req___ns1__searchByUserSurname(struct soap *soap) {
   struct __ns1__searchByUserSurname *_p =
-      soap_instantiate___ns1__searchByUserSurname(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__searchByUserSurname(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__searchByUserSurname(soap, _p);
   }
@@ -42293,7 +42638,8 @@ inline struct __ns1__searchByUserSurname *
 soap_new_set___ns1__searchByUserSurname(
     struct soap *soap, ns1__searchByUserSurname *ns1__searchByUserSurname_) {
   struct __ns1__searchByUserSurname *_p =
-      soap_instantiate___ns1__searchByUserSurname(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__searchByUserSurname(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__searchByUserSurname(soap, _p);
     _p->ns1__searchByUserSurname_ = ns1__searchByUserSurname_;
@@ -42361,15 +42707,15 @@ soap_instantiate___ns1__searchByUserIDPagination(struct soap *, int,
 
 inline struct __ns1__searchByUserIDPagination *
 soap_new___ns1__searchByUserIDPagination(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchByUserIDPagination(soap, n, NULL, NULL,
-                                                          NULL);
+  return soap_instantiate___ns1__searchByUserIDPagination(soap, n, nullptr,
+                                                          nullptr, nullptr);
 }
 
 inline struct __ns1__searchByUserIDPagination *
 soap_new_req___ns1__searchByUserIDPagination(struct soap *soap) {
   struct __ns1__searchByUserIDPagination *_p =
-      soap_instantiate___ns1__searchByUserIDPagination(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate___ns1__searchByUserIDPagination(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchByUserIDPagination(soap, _p);
   }
@@ -42381,8 +42727,8 @@ soap_new_set___ns1__searchByUserIDPagination(
     struct soap *soap,
     ns1__searchByUserIDPagination *ns1__searchByUserIDPagination_) {
   struct __ns1__searchByUserIDPagination *_p =
-      soap_instantiate___ns1__searchByUserIDPagination(soap, -1, NULL, NULL,
-                                                       NULL);
+      soap_instantiate___ns1__searchByUserIDPagination(soap, -1, nullptr,
+                                                       nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchByUserIDPagination(soap, _p);
     _p->ns1__searchByUserIDPagination_ = ns1__searchByUserIDPagination_;
@@ -42448,13 +42794,14 @@ soap_instantiate___ns1__searchByUserID(struct soap *, int, const char *,
 
 inline struct __ns1__searchByUserID *
 soap_new___ns1__searchByUserID(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchByUserID(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__searchByUserID(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline struct __ns1__searchByUserID *
 soap_new_req___ns1__searchByUserID(struct soap *soap) {
-  struct __ns1__searchByUserID *_p =
-      soap_instantiate___ns1__searchByUserID(soap, -1, NULL, NULL, NULL);
+  struct __ns1__searchByUserID *_p = soap_instantiate___ns1__searchByUserID(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchByUserID(soap, _p);
   }
@@ -42464,8 +42811,8 @@ soap_new_req___ns1__searchByUserID(struct soap *soap) {
 inline struct __ns1__searchByUserID *
 soap_new_set___ns1__searchByUserID(struct soap *soap,
                                    ns1__searchByUserID *ns1__searchByUserID_) {
-  struct __ns1__searchByUserID *_p =
-      soap_instantiate___ns1__searchByUserID(soap, -1, NULL, NULL, NULL);
+  struct __ns1__searchByUserID *_p = soap_instantiate___ns1__searchByUserID(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchByUserID(soap, _p);
     _p->ns1__searchByUserID_ = ns1__searchByUserID_;
@@ -42538,14 +42885,14 @@ inline struct __ns1__getMyInvestigationsIncludesPagination *
 soap_new___ns1__getMyInvestigationsIncludesPagination(struct soap *soap,
                                                       int n = -1) {
   return soap_instantiate___ns1__getMyInvestigationsIncludesPagination(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__getMyInvestigationsIncludesPagination *
 soap_new_req___ns1__getMyInvestigationsIncludesPagination(struct soap *soap) {
   struct __ns1__getMyInvestigationsIncludesPagination *_p =
       soap_instantiate___ns1__getMyInvestigationsIncludesPagination(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getMyInvestigationsIncludesPagination(soap, _p);
   }
@@ -42558,7 +42905,7 @@ soap_new_set___ns1__getMyInvestigationsIncludesPagination(
                            ns1__getMyInvestigationsIncludesPagination_) {
   struct __ns1__getMyInvestigationsIncludesPagination *_p =
       soap_instantiate___ns1__getMyInvestigationsIncludesPagination(
-          soap, -1, NULL, NULL, NULL);
+          soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getMyInvestigationsIncludesPagination(soap, _p);
     _p->ns1__getMyInvestigationsIncludesPagination_ =
@@ -42627,15 +42974,15 @@ soap_instantiate___ns1__getMyInvestigationsIncludes(struct soap *, int,
 
 inline struct __ns1__getMyInvestigationsIncludes *
 soap_new___ns1__getMyInvestigationsIncludes(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getMyInvestigationsIncludes(soap, n, NULL,
-                                                             NULL, NULL);
+  return soap_instantiate___ns1__getMyInvestigationsIncludes(soap, n, nullptr,
+                                                             nullptr, nullptr);
 }
 
 inline struct __ns1__getMyInvestigationsIncludes *
 soap_new_req___ns1__getMyInvestigationsIncludes(struct soap *soap) {
   struct __ns1__getMyInvestigationsIncludes *_p =
-      soap_instantiate___ns1__getMyInvestigationsIncludes(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__getMyInvestigationsIncludes(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getMyInvestigationsIncludes(soap, _p);
   }
@@ -42647,8 +42994,8 @@ soap_new_set___ns1__getMyInvestigationsIncludes(
     struct soap *soap,
     ns1__getMyInvestigationsIncludes *ns1__getMyInvestigationsIncludes_) {
   struct __ns1__getMyInvestigationsIncludes *_p =
-      soap_instantiate___ns1__getMyInvestigationsIncludes(soap, -1, NULL, NULL,
-                                                          NULL);
+      soap_instantiate___ns1__getMyInvestigationsIncludes(soap, -1, nullptr,
+                                                          nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getMyInvestigationsIncludes(soap, _p);
     _p->ns1__getMyInvestigationsIncludes_ = ns1__getMyInvestigationsIncludes_;
@@ -42716,13 +43063,15 @@ soap_instantiate___ns1__getMyInvestigations(struct soap *, int, const char *,
 
 inline struct __ns1__getMyInvestigations *
 soap_new___ns1__getMyInvestigations(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getMyInvestigations(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getMyInvestigations(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline struct __ns1__getMyInvestigations *
 soap_new_req___ns1__getMyInvestigations(struct soap *soap) {
   struct __ns1__getMyInvestigations *_p =
-      soap_instantiate___ns1__getMyInvestigations(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getMyInvestigations(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__getMyInvestigations(soap, _p);
   }
@@ -42733,7 +43082,8 @@ inline struct __ns1__getMyInvestigations *
 soap_new_set___ns1__getMyInvestigations(
     struct soap *soap, ns1__getMyInvestigations *ns1__getMyInvestigations_) {
   struct __ns1__getMyInvestigations *_p =
-      soap_instantiate___ns1__getMyInvestigations(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getMyInvestigations(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__getMyInvestigations(soap, _p);
     _p->ns1__getMyInvestigations_ = ns1__getMyInvestigations_;
@@ -42802,13 +43152,15 @@ soap_instantiate___ns1__searchByKeywordsAll(struct soap *, int, const char *,
 
 inline struct __ns1__searchByKeywordsAll *
 soap_new___ns1__searchByKeywordsAll(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchByKeywordsAll(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__searchByKeywordsAll(soap, n, nullptr, nullptr,
+                                                     nullptr);
 }
 
 inline struct __ns1__searchByKeywordsAll *
 soap_new_req___ns1__searchByKeywordsAll(struct soap *soap) {
   struct __ns1__searchByKeywordsAll *_p =
-      soap_instantiate___ns1__searchByKeywordsAll(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__searchByKeywordsAll(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__searchByKeywordsAll(soap, _p);
   }
@@ -42819,7 +43171,8 @@ inline struct __ns1__searchByKeywordsAll *
 soap_new_set___ns1__searchByKeywordsAll(
     struct soap *soap, ns1__searchByKeywordsAll *ns1__searchByKeywordsAll_) {
   struct __ns1__searchByKeywordsAll *_p =
-      soap_instantiate___ns1__searchByKeywordsAll(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__searchByKeywordsAll(soap, -1, nullptr, nullptr,
+                                                  nullptr);
   if (_p) {
     soap_default___ns1__searchByKeywordsAll(soap, _p);
     _p->ns1__searchByKeywordsAll_ = ns1__searchByKeywordsAll_;
@@ -42887,13 +43240,14 @@ soap_instantiate___ns1__searchByKeywords(struct soap *, int, const char *,
 
 inline struct __ns1__searchByKeywords *
 soap_new___ns1__searchByKeywords(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchByKeywords(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__searchByKeywords(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline struct __ns1__searchByKeywords *
 soap_new_req___ns1__searchByKeywords(struct soap *soap) {
-  struct __ns1__searchByKeywords *_p =
-      soap_instantiate___ns1__searchByKeywords(soap, -1, NULL, NULL, NULL);
+  struct __ns1__searchByKeywords *_p = soap_instantiate___ns1__searchByKeywords(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchByKeywords(soap, _p);
   }
@@ -42902,8 +43256,8 @@ soap_new_req___ns1__searchByKeywords(struct soap *soap) {
 
 inline struct __ns1__searchByKeywords *soap_new_set___ns1__searchByKeywords(
     struct soap *soap, ns1__searchByKeywords *ns1__searchByKeywords_) {
-  struct __ns1__searchByKeywords *_p =
-      soap_instantiate___ns1__searchByKeywords(soap, -1, NULL, NULL, NULL);
+  struct __ns1__searchByKeywords *_p = soap_instantiate___ns1__searchByKeywords(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchByKeywords(soap, _p);
     _p->ns1__searchByKeywords_ = ns1__searchByKeywords_;
@@ -42971,15 +43325,15 @@ soap_instantiate___ns1__searchByAdvancedPagination(struct soap *, int,
 
 inline struct __ns1__searchByAdvancedPagination *
 soap_new___ns1__searchByAdvancedPagination(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchByAdvancedPagination(soap, n, NULL, NULL,
-                                                            NULL);
+  return soap_instantiate___ns1__searchByAdvancedPagination(soap, n, nullptr,
+                                                            nullptr, nullptr);
 }
 
 inline struct __ns1__searchByAdvancedPagination *
 soap_new_req___ns1__searchByAdvancedPagination(struct soap *soap) {
   struct __ns1__searchByAdvancedPagination *_p =
-      soap_instantiate___ns1__searchByAdvancedPagination(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate___ns1__searchByAdvancedPagination(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchByAdvancedPagination(soap, _p);
   }
@@ -42991,8 +43345,8 @@ soap_new_set___ns1__searchByAdvancedPagination(
     struct soap *soap,
     ns1__searchByAdvancedPagination *ns1__searchByAdvancedPagination_) {
   struct __ns1__searchByAdvancedPagination *_p =
-      soap_instantiate___ns1__searchByAdvancedPagination(soap, -1, NULL, NULL,
-                                                         NULL);
+      soap_instantiate___ns1__searchByAdvancedPagination(soap, -1, nullptr,
+                                                         nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchByAdvancedPagination(soap, _p);
     _p->ns1__searchByAdvancedPagination_ = ns1__searchByAdvancedPagination_;
@@ -43059,13 +43413,14 @@ soap_instantiate___ns1__searchByAdvanced(struct soap *, int, const char *,
 
 inline struct __ns1__searchByAdvanced *
 soap_new___ns1__searchByAdvanced(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__searchByAdvanced(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__searchByAdvanced(soap, n, nullptr, nullptr,
+                                                  nullptr);
 }
 
 inline struct __ns1__searchByAdvanced *
 soap_new_req___ns1__searchByAdvanced(struct soap *soap) {
-  struct __ns1__searchByAdvanced *_p =
-      soap_instantiate___ns1__searchByAdvanced(soap, -1, NULL, NULL, NULL);
+  struct __ns1__searchByAdvanced *_p = soap_instantiate___ns1__searchByAdvanced(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchByAdvanced(soap, _p);
   }
@@ -43074,8 +43429,8 @@ soap_new_req___ns1__searchByAdvanced(struct soap *soap) {
 
 inline struct __ns1__searchByAdvanced *soap_new_set___ns1__searchByAdvanced(
     struct soap *soap, ns1__searchByAdvanced *ns1__searchByAdvanced_) {
-  struct __ns1__searchByAdvanced *_p =
-      soap_instantiate___ns1__searchByAdvanced(soap, -1, NULL, NULL, NULL);
+  struct __ns1__searchByAdvanced *_p = soap_instantiate___ns1__searchByAdvanced(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__searchByAdvanced(soap, _p);
     _p->ns1__searchByAdvanced_ = ns1__searchByAdvanced_;
@@ -43142,13 +43497,14 @@ soap_instantiate___ns1__getAllKeywords(struct soap *, int, const char *,
 
 inline struct __ns1__getAllKeywords *
 soap_new___ns1__getAllKeywords(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getAllKeywords(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getAllKeywords(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline struct __ns1__getAllKeywords *
 soap_new_req___ns1__getAllKeywords(struct soap *soap) {
-  struct __ns1__getAllKeywords *_p =
-      soap_instantiate___ns1__getAllKeywords(soap, -1, NULL, NULL, NULL);
+  struct __ns1__getAllKeywords *_p = soap_instantiate___ns1__getAllKeywords(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getAllKeywords(soap, _p);
   }
@@ -43158,8 +43514,8 @@ soap_new_req___ns1__getAllKeywords(struct soap *soap) {
 inline struct __ns1__getAllKeywords *
 soap_new_set___ns1__getAllKeywords(struct soap *soap,
                                    ns1__getAllKeywords *ns1__getAllKeywords_) {
-  struct __ns1__getAllKeywords *_p =
-      soap_instantiate___ns1__getAllKeywords(soap, -1, NULL, NULL, NULL);
+  struct __ns1__getAllKeywords *_p = soap_instantiate___ns1__getAllKeywords(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getAllKeywords(soap, _p);
     _p->ns1__getAllKeywords_ = ns1__getAllKeywords_;
@@ -43225,15 +43581,15 @@ soap_instantiate___ns1__getKeywordsForUserType(struct soap *, int, const char *,
 
 inline struct __ns1__getKeywordsForUserType *
 soap_new___ns1__getKeywordsForUserType(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getKeywordsForUserType(soap, n, NULL, NULL,
-                                                        NULL);
+  return soap_instantiate___ns1__getKeywordsForUserType(soap, n, nullptr,
+                                                        nullptr, nullptr);
 }
 
 inline struct __ns1__getKeywordsForUserType *
 soap_new_req___ns1__getKeywordsForUserType(struct soap *soap) {
   struct __ns1__getKeywordsForUserType *_p =
-      soap_instantiate___ns1__getKeywordsForUserType(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__getKeywordsForUserType(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__getKeywordsForUserType(soap, _p);
   }
@@ -43245,8 +43601,8 @@ soap_new_set___ns1__getKeywordsForUserType(
     struct soap *soap,
     ns1__getKeywordsForUserType *ns1__getKeywordsForUserType_) {
   struct __ns1__getKeywordsForUserType *_p =
-      soap_instantiate___ns1__getKeywordsForUserType(soap, -1, NULL, NULL,
-                                                     NULL);
+      soap_instantiate___ns1__getKeywordsForUserType(soap, -1, nullptr, nullptr,
+                                                     nullptr);
   if (_p) {
     soap_default___ns1__getKeywordsForUserType(soap, _p);
     _p->ns1__getKeywordsForUserType_ = ns1__getKeywordsForUserType_;
@@ -43312,14 +43668,15 @@ soap_instantiate___ns1__getKeywordsForUserMax(struct soap *, int, const char *,
 
 inline struct __ns1__getKeywordsForUserMax *
 soap_new___ns1__getKeywordsForUserMax(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getKeywordsForUserMax(soap, n, NULL, NULL,
-                                                       NULL);
+  return soap_instantiate___ns1__getKeywordsForUserMax(soap, n, nullptr,
+                                                       nullptr, nullptr);
 }
 
 inline struct __ns1__getKeywordsForUserMax *
 soap_new_req___ns1__getKeywordsForUserMax(struct soap *soap) {
   struct __ns1__getKeywordsForUserMax *_p =
-      soap_instantiate___ns1__getKeywordsForUserMax(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getKeywordsForUserMax(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__getKeywordsForUserMax(soap, _p);
   }
@@ -43331,7 +43688,8 @@ soap_new_set___ns1__getKeywordsForUserMax(
     struct soap *soap,
     ns1__getKeywordsForUserMax *ns1__getKeywordsForUserMax_) {
   struct __ns1__getKeywordsForUserMax *_p =
-      soap_instantiate___ns1__getKeywordsForUserMax(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getKeywordsForUserMax(soap, -1, nullptr, nullptr,
+                                                    nullptr);
   if (_p) {
     soap_default___ns1__getKeywordsForUserMax(soap, _p);
     _p->ns1__getKeywordsForUserMax_ = ns1__getKeywordsForUserMax_;
@@ -43398,15 +43756,15 @@ soap_instantiate___ns1__getKeywordsForUserStartWithMax(struct soap *, int,
 
 inline struct __ns1__getKeywordsForUserStartWithMax *
 soap_new___ns1__getKeywordsForUserStartWithMax(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getKeywordsForUserStartWithMax(soap, n, NULL,
-                                                                NULL, NULL);
+  return soap_instantiate___ns1__getKeywordsForUserStartWithMax(
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__getKeywordsForUserStartWithMax *
 soap_new_req___ns1__getKeywordsForUserStartWithMax(struct soap *soap) {
   struct __ns1__getKeywordsForUserStartWithMax *_p =
-      soap_instantiate___ns1__getKeywordsForUserStartWithMax(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate___ns1__getKeywordsForUserStartWithMax(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getKeywordsForUserStartWithMax(soap, _p);
   }
@@ -43418,8 +43776,8 @@ soap_new_set___ns1__getKeywordsForUserStartWithMax(
     struct soap *soap,
     ns1__getKeywordsForUserStartWithMax *ns1__getKeywordsForUserStartWithMax_) {
   struct __ns1__getKeywordsForUserStartWithMax *_p =
-      soap_instantiate___ns1__getKeywordsForUserStartWithMax(soap, -1, NULL,
-                                                             NULL, NULL);
+      soap_instantiate___ns1__getKeywordsForUserStartWithMax(soap, -1, nullptr,
+                                                             nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getKeywordsForUserStartWithMax(soap, _p);
     _p->ns1__getKeywordsForUserStartWithMax_ =
@@ -43488,13 +43846,15 @@ soap_instantiate___ns1__getKeywordsForUser(struct soap *, int, const char *,
 
 inline struct __ns1__getKeywordsForUser *
 soap_new___ns1__getKeywordsForUser(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getKeywordsForUser(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getKeywordsForUser(soap, n, nullptr, nullptr,
+                                                    nullptr);
 }
 
 inline struct __ns1__getKeywordsForUser *
 soap_new_req___ns1__getKeywordsForUser(struct soap *soap) {
   struct __ns1__getKeywordsForUser *_p =
-      soap_instantiate___ns1__getKeywordsForUser(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getKeywordsForUser(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__getKeywordsForUser(soap, _p);
   }
@@ -43504,7 +43864,8 @@ soap_new_req___ns1__getKeywordsForUser(struct soap *soap) {
 inline struct __ns1__getKeywordsForUser *soap_new_set___ns1__getKeywordsForUser(
     struct soap *soap, ns1__getKeywordsForUser *ns1__getKeywordsForUser_) {
   struct __ns1__getKeywordsForUser *_p =
-      soap_instantiate___ns1__getKeywordsForUser(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__getKeywordsForUser(soap, -1, nullptr, nullptr,
+                                                 nullptr);
   if (_p) {
     soap_default___ns1__getKeywordsForUser(soap, _p);
     _p->ns1__getKeywordsForUser_ = ns1__getKeywordsForUser_;
@@ -43571,13 +43932,14 @@ soap_instantiate___ns1__isSessionValid(struct soap *, int, const char *,
 
 inline struct __ns1__isSessionValid *
 soap_new___ns1__isSessionValid(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__isSessionValid(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__isSessionValid(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline struct __ns1__isSessionValid *
 soap_new_req___ns1__isSessionValid(struct soap *soap) {
-  struct __ns1__isSessionValid *_p =
-      soap_instantiate___ns1__isSessionValid(soap, -1, NULL, NULL, NULL);
+  struct __ns1__isSessionValid *_p = soap_instantiate___ns1__isSessionValid(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__isSessionValid(soap, _p);
   }
@@ -43587,8 +43949,8 @@ soap_new_req___ns1__isSessionValid(struct soap *soap) {
 inline struct __ns1__isSessionValid *
 soap_new_set___ns1__isSessionValid(struct soap *soap,
                                    ns1__isSessionValid *ns1__isSessionValid_) {
-  struct __ns1__isSessionValid *_p =
-      soap_instantiate___ns1__isSessionValid(soap, -1, NULL, NULL, NULL);
+  struct __ns1__isSessionValid *_p = soap_instantiate___ns1__isSessionValid(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__isSessionValid(soap, _p);
     _p->ns1__isSessionValid_ = ns1__isSessionValid_;
@@ -43654,13 +44016,14 @@ soap_instantiate___ns1__getUserDetails(struct soap *, int, const char *,
 
 inline struct __ns1__getUserDetails *
 soap_new___ns1__getUserDetails(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__getUserDetails(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__getUserDetails(soap, n, nullptr, nullptr,
+                                                nullptr);
 }
 
 inline struct __ns1__getUserDetails *
 soap_new_req___ns1__getUserDetails(struct soap *soap) {
-  struct __ns1__getUserDetails *_p =
-      soap_instantiate___ns1__getUserDetails(soap, -1, NULL, NULL, NULL);
+  struct __ns1__getUserDetails *_p = soap_instantiate___ns1__getUserDetails(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getUserDetails(soap, _p);
   }
@@ -43670,8 +44033,8 @@ soap_new_req___ns1__getUserDetails(struct soap *soap) {
 inline struct __ns1__getUserDetails *
 soap_new_set___ns1__getUserDetails(struct soap *soap,
                                    ns3__getUserDetails *ns1__getUserDetails) {
-  struct __ns1__getUserDetails *_p =
-      soap_instantiate___ns1__getUserDetails(soap, -1, NULL, NULL, NULL);
+  struct __ns1__getUserDetails *_p = soap_instantiate___ns1__getUserDetails(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__getUserDetails(soap, _p);
     _p->ns1__getUserDetails = ns1__getUserDetails;
@@ -43733,12 +44096,12 @@ soap_instantiate___ns1__logout(struct soap *, int, const char *, const char *,
 
 inline struct __ns1__logout *soap_new___ns1__logout(struct soap *soap,
                                                     int n = -1) {
-  return soap_instantiate___ns1__logout(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__logout(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__logout *soap_new_req___ns1__logout(struct soap *soap) {
   struct __ns1__logout *_p =
-      soap_instantiate___ns1__logout(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__logout(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__logout(soap, _p);
   }
@@ -43748,7 +44111,7 @@ inline struct __ns1__logout *soap_new_req___ns1__logout(struct soap *soap) {
 inline struct __ns1__logout *
 soap_new_set___ns1__logout(struct soap *soap, ns1__logout *ns1__logout_) {
   struct __ns1__logout *_p =
-      soap_instantiate___ns1__logout(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__logout(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__logout(soap, _p);
     _p->ns1__logout_ = ns1__logout_;
@@ -43813,13 +44176,14 @@ soap_instantiate___ns1__loginLifetime(struct soap *, int, const char *,
 
 inline struct __ns1__loginLifetime *
 soap_new___ns1__loginLifetime(struct soap *soap, int n = -1) {
-  return soap_instantiate___ns1__loginLifetime(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__loginLifetime(soap, n, nullptr, nullptr,
+                                               nullptr);
 }
 
 inline struct __ns1__loginLifetime *
 soap_new_req___ns1__loginLifetime(struct soap *soap) {
-  struct __ns1__loginLifetime *_p =
-      soap_instantiate___ns1__loginLifetime(soap, -1, NULL, NULL, NULL);
+  struct __ns1__loginLifetime *_p = soap_instantiate___ns1__loginLifetime(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__loginLifetime(soap, _p);
   }
@@ -43829,8 +44193,8 @@ soap_new_req___ns1__loginLifetime(struct soap *soap) {
 inline struct __ns1__loginLifetime *
 soap_new_set___ns1__loginLifetime(struct soap *soap,
                                   ns1__loginLifetime *ns1__loginLifetime_) {
-  struct __ns1__loginLifetime *_p =
-      soap_instantiate___ns1__loginLifetime(soap, -1, NULL, NULL, NULL);
+  struct __ns1__loginLifetime *_p = soap_instantiate___ns1__loginLifetime(
+      soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__loginLifetime(soap, _p);
     _p->ns1__loginLifetime_ = ns1__loginLifetime_;
@@ -43892,12 +44256,12 @@ soap_instantiate___ns1__login(struct soap *, int, const char *, const char *,
 
 inline struct __ns1__login *soap_new___ns1__login(struct soap *soap,
                                                   int n = -1) {
-  return soap_instantiate___ns1__login(soap, n, NULL, NULL, NULL);
+  return soap_instantiate___ns1__login(soap, n, nullptr, nullptr, nullptr);
 }
 
 inline struct __ns1__login *soap_new_req___ns1__login(struct soap *soap) {
   struct __ns1__login *_p =
-      soap_instantiate___ns1__login(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__login(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__login(soap, _p);
   }
@@ -43907,7 +44271,7 @@ inline struct __ns1__login *soap_new_req___ns1__login(struct soap *soap) {
 inline struct __ns1__login *soap_new_set___ns1__login(struct soap *soap,
                                                       ns1__login *ns1__login_) {
   struct __ns1__login *_p =
-      soap_instantiate___ns1__login(soap, -1, NULL, NULL, NULL);
+      soap_instantiate___ns1__login(soap, -1, nullptr, nullptr, nullptr);
   if (_p) {
     soap_default___ns1__login(soap, _p);
     _p->ns1__login_ = ns1__login_;
@@ -58578,7 +58942,7 @@ inline std::vector<ns1__parameterCondition *> *
 soap_new_std__vectorTemplateOfPointerTons1__parameterCondition(
     struct soap *soap, int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__parameterCondition(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__parameterCondition(
@@ -58616,7 +58980,7 @@ inline std::vector<ns1__restrictionCondition *> *
 soap_new_std__vectorTemplateOfPointerTons1__restrictionCondition(
     struct soap *soap, int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__restrictionCondition(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__restrictionCondition(
@@ -58654,7 +59018,7 @@ inline std::vector<ns1__shift *> *
 soap_new_std__vectorTemplateOfPointerTons1__shift(struct soap *soap,
                                                   int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__shift(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__shift(
@@ -58692,7 +59056,7 @@ inline std::vector<ns1__publication *> *
 soap_new_std__vectorTemplateOfPointerTons1__publication(struct soap *soap,
                                                         int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__publication(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__publication(
@@ -58730,7 +59094,7 @@ inline std::vector<ns1__keyword *> *
 soap_new_std__vectorTemplateOfPointerTons1__keyword(struct soap *soap,
                                                     int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__keyword(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__keyword(
@@ -58768,7 +59132,7 @@ inline std::vector<ns1__investigator *> *
 soap_new_std__vectorTemplateOfPointerTons1__investigator(struct soap *soap,
                                                          int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__investigator(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__investigator(
@@ -58807,7 +59171,7 @@ inline std::vector<ns1__relatedDatafiles *> *
 soap_new_std__vectorTemplateOfPointerTons1__relatedDatafiles(struct soap *soap,
                                                              int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__relatedDatafiles(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__relatedDatafiles(
@@ -58844,7 +59208,7 @@ inline std::vector<ns1__sampleParameter *> *
 soap_new_std__vectorTemplateOfPointerTons1__sampleParameter(struct soap *soap,
                                                             int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__sampleParameter(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__sampleParameter(
@@ -58881,7 +59245,7 @@ inline std::vector<ns1__icatRole *> *
 soap_new_std__vectorTemplateOfPointerTons1__icatRole(struct soap *soap,
                                                      int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__icatRole(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__icatRole(
@@ -58919,7 +59283,7 @@ inline std::vector<ns1__datafileFormat *> *
 soap_new_std__vectorTemplateOfPointerTons1__datafileFormat(struct soap *soap,
                                                            int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__datafileFormat(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__datafileFormat(
@@ -58959,7 +59323,7 @@ inline std::vector<ns1__datasetParameter *> *
 soap_new_std__vectorTemplateOfPointerTons1__datasetParameter(struct soap *soap,
                                                              int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__datasetParameter(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__datasetParameter(
@@ -58997,7 +59361,7 @@ inline std::vector<ns1__icatAuthorisation *> *
 soap_new_std__vectorTemplateOfPointerTons1__icatAuthorisation(struct soap *soap,
                                                               int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__icatAuthorisation(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__icatAuthorisation(
@@ -59034,7 +59398,7 @@ inline std::vector<ns1__datafile *> *
 soap_new_std__vectorTemplateOfPointerTons1__datafile(struct soap *soap,
                                                      int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__datafile(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__datafile(
@@ -59072,7 +59436,7 @@ inline std::vector<ns1__investigation *> *
 soap_new_std__vectorTemplateOfPointerTons1__investigation(struct soap *soap,
                                                           int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__investigation(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__investigation(
@@ -59112,7 +59476,7 @@ inline std::vector<ns1__parameterComparisonCondition *> *
 soap_new_std__vectorTemplateOfPointerTons1__parameterComparisonCondition(
     struct soap *soap, int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__parameterComparisonCondition(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void
@@ -59145,8 +59509,8 @@ soap_instantiate_std__vectorTemplateOfLONG64(struct soap *, int, const char *,
 
 inline std::vector<LONG64> *
 soap_new_std__vectorTemplateOfLONG64(struct soap *soap, int n = -1) {
-  return soap_instantiate_std__vectorTemplateOfLONG64(soap, n, NULL, NULL,
-                                                      NULL);
+  return soap_instantiate_std__vectorTemplateOfLONG64(soap, n, nullptr, nullptr,
+                                                      nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfLONG64(struct soap *soap,
@@ -59183,7 +59547,7 @@ inline std::vector<ns1__parameterSearch *> *
 soap_new_std__vectorTemplateOfPointerTons1__parameterSearch(struct soap *soap,
                                                             int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__parameterSearch(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__parameterSearch(
@@ -59220,7 +59584,7 @@ inline std::vector<ns1__dataset *> *
 soap_new_std__vectorTemplateOfPointerTons1__dataset(struct soap *soap,
                                                     int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__dataset(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__dataset(
@@ -59258,7 +59622,7 @@ inline std::vector<ns1__instrument *> *
 soap_new_std__vectorTemplateOfPointerTons1__instrument(struct soap *soap,
                                                        int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__instrument(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__instrument(
@@ -59297,7 +59661,7 @@ inline std::vector<ns1__datafileParameter *> *
 soap_new_std__vectorTemplateOfPointerTons1__datafileParameter(struct soap *soap,
                                                               int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__datafileParameter(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__datafileParameter(
@@ -59334,7 +59698,7 @@ inline std::vector<ns1__facilityCycle *> *
 soap_new_std__vectorTemplateOfPointerTons1__facilityCycle(struct soap *soap,
                                                           int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__facilityCycle(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__facilityCycle(
@@ -59373,7 +59737,7 @@ inline std::vector<ns1__parameter *> *
 soap_new_std__vectorTemplateOfPointerTons1__parameter(struct soap *soap,
                                                       int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__parameter(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__parameter(
@@ -59412,7 +59776,7 @@ inline std::vector<ns1__restrictionComparisonCondition *> *
 soap_new_std__vectorTemplateOfPointerTons1__restrictionComparisonCondition(
     struct soap *soap, int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__restrictionComparisonCondition(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void
@@ -59451,7 +59815,7 @@ inline std::vector<ns1__sample *> *
 soap_new_std__vectorTemplateOfPointerTons1__sample(struct soap *soap,
                                                    int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__sample(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__sample(
@@ -59489,7 +59853,7 @@ inline std::vector<ns1__facilityUser *> *
 soap_new_std__vectorTemplateOfPointerTons1__facilityUser(struct soap *soap,
                                                          int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerTons1__facilityUser(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerTons1__facilityUser(
@@ -59525,8 +59889,8 @@ soap_instantiate_std__vectorTemplateOfstd__string(struct soap *, int,
 
 inline std::vector<std::string> *
 soap_new_std__vectorTemplateOfstd__string(struct soap *soap, int n = -1) {
-  return soap_instantiate_std__vectorTemplateOfstd__string(soap, n, NULL, NULL,
-                                                           NULL);
+  return soap_instantiate_std__vectorTemplateOfstd__string(soap, n, nullptr,
+                                                           nullptr, nullptr);
 }
 
 inline void
@@ -59564,7 +59928,7 @@ inline std::vector<xsd__anyType *> *
 soap_new_std__vectorTemplateOfPointerToxsd__anyType(struct soap *soap,
                                                     int n = -1) {
   return soap_instantiate_std__vectorTemplateOfPointerToxsd__anyType(
-      soap, n, NULL, NULL, NULL);
+      soap, n, nullptr, nullptr, nullptr);
 }
 
 inline void soap_delete_std__vectorTemplateOfPointerToxsd__anyType(
diff --git a/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3ICATPortBindingProxy.h b/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3ICATPortBindingProxy.h
index 027dc5d67a7..3148fb39a3a 100644
--- a/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3ICATPortBindingProxy.h
+++ b/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3ICATPortBindingProxy.h
@@ -65,7 +65,7 @@ public:
   /// Web service operation 'login' (returns error code or SOAP_OK)
   virtual int login(ns1__login *ns1__login_,
                     ns1__loginResponse *ns1__loginResponse_) {
-    return this->login(NULL, NULL, ns1__login_, ns1__loginResponse_);
+    return this->login(nullptr, nullptr, ns1__login_, ns1__loginResponse_);
   }
   virtual int login(const char *endpoint, const char *soap_action,
                     ns1__login *ns1__login_,
@@ -75,7 +75,7 @@ public:
   virtual int
   loginLifetime(ns1__loginLifetime *ns1__loginLifetime_,
                 ns1__loginLifetimeResponse *ns1__loginLifetimeResponse_) {
-    return this->loginLifetime(NULL, NULL, ns1__loginLifetime_,
+    return this->loginLifetime(nullptr, nullptr, ns1__loginLifetime_,
                                ns1__loginLifetimeResponse_);
   }
   virtual int
@@ -86,7 +86,7 @@ public:
   /// Web service operation 'logout' (returns error code or SOAP_OK)
   virtual int logout(ns1__logout *ns1__logout_,
                      ns1__logoutResponse *ns1__logoutResponse_) {
-    return this->logout(NULL, NULL, ns1__logout_, ns1__logoutResponse_);
+    return this->logout(nullptr, nullptr, ns1__logout_, ns1__logoutResponse_);
   }
   virtual int logout(const char *endpoint, const char *soap_action,
                      ns1__logout *ns1__logout_,
@@ -96,7 +96,7 @@ public:
   virtual int
   getUserDetails(ns3__getUserDetails *ns1__getUserDetails,
                  ns3__getUserDetailsResponse *ns1__getUserDetailsResponse) {
-    return this->getUserDetails(NULL, NULL, ns1__getUserDetails,
+    return this->getUserDetails(nullptr, nullptr, ns1__getUserDetails,
                                 ns1__getUserDetailsResponse);
   }
   virtual int
@@ -108,7 +108,7 @@ public:
   virtual int
   isSessionValid(ns1__isSessionValid *ns1__isSessionValid_,
                  ns1__isSessionValidResponse *ns1__isSessionValidResponse_) {
-    return this->isSessionValid(NULL, NULL, ns1__isSessionValid_,
+    return this->isSessionValid(nullptr, nullptr, ns1__isSessionValid_,
                                 ns1__isSessionValidResponse_);
   }
   virtual int
@@ -120,7 +120,7 @@ public:
   virtual int getKeywordsForUser(
       ns1__getKeywordsForUser *ns1__getKeywordsForUser_,
       ns1__getKeywordsForUserResponse *ns1__getKeywordsForUserResponse_) {
-    return this->getKeywordsForUser(NULL, NULL, ns1__getKeywordsForUser_,
+    return this->getKeywordsForUser(nullptr, nullptr, ns1__getKeywordsForUser_,
                                     ns1__getKeywordsForUserResponse_);
   }
   virtual int getKeywordsForUser(
@@ -135,7 +135,7 @@ public:
       ns1__getKeywordsForUserStartWithMaxResponse *
           ns1__getKeywordsForUserStartWithMaxResponse_) {
     return this->getKeywordsForUserStartWithMax(
-        NULL, NULL, ns1__getKeywordsForUserStartWithMax_,
+        nullptr, nullptr, ns1__getKeywordsForUserStartWithMax_,
         ns1__getKeywordsForUserStartWithMaxResponse_);
   }
   virtual int getKeywordsForUserStartWithMax(
@@ -149,7 +149,8 @@ public:
   virtual int getKeywordsForUserMax(
       ns1__getKeywordsForUserMax *ns1__getKeywordsForUserMax_,
       ns1__getKeywordsForUserMaxResponse *ns1__getKeywordsForUserMaxResponse_) {
-    return this->getKeywordsForUserMax(NULL, NULL, ns1__getKeywordsForUserMax_,
+    return this->getKeywordsForUserMax(nullptr, nullptr,
+                                       ns1__getKeywordsForUserMax_,
                                        ns1__getKeywordsForUserMaxResponse_);
   }
   virtual int getKeywordsForUserMax(
@@ -163,7 +164,7 @@ public:
       ns1__getKeywordsForUserType *ns1__getKeywordsForUserType_,
       ns1__getKeywordsForUserTypeResponse *
           ns1__getKeywordsForUserTypeResponse_) {
-    return this->getKeywordsForUserType(NULL, NULL,
+    return this->getKeywordsForUserType(nullptr, nullptr,
                                         ns1__getKeywordsForUserType_,
                                         ns1__getKeywordsForUserTypeResponse_);
   }
@@ -177,7 +178,7 @@ public:
   virtual int
   getAllKeywords(ns1__getAllKeywords *ns1__getAllKeywords_,
                  ns1__getAllKeywordsResponse *ns1__getAllKeywordsResponse_) {
-    return this->getAllKeywords(NULL, NULL, ns1__getAllKeywords_,
+    return this->getAllKeywords(nullptr, nullptr, ns1__getAllKeywords_,
                                 ns1__getAllKeywordsResponse_);
   }
   virtual int
@@ -189,7 +190,7 @@ public:
   virtual int searchByAdvanced(
       ns1__searchByAdvanced *ns1__searchByAdvanced_,
       ns1__searchByAdvancedResponse *ns1__searchByAdvancedResponse_) {
-    return this->searchByAdvanced(NULL, NULL, ns1__searchByAdvanced_,
+    return this->searchByAdvanced(nullptr, nullptr, ns1__searchByAdvanced_,
                                   ns1__searchByAdvancedResponse_);
   }
   virtual int searchByAdvanced(
@@ -204,7 +205,7 @@ public:
       ns1__searchByAdvancedPaginationResponse *
           ns1__searchByAdvancedPaginationResponse_) {
     return this->searchByAdvancedPagination(
-        NULL, NULL, ns1__searchByAdvancedPagination_,
+        nullptr, nullptr, ns1__searchByAdvancedPagination_,
         ns1__searchByAdvancedPaginationResponse_);
   }
   virtual int searchByAdvancedPagination(
@@ -217,7 +218,7 @@ public:
   virtual int searchByKeywords(
       ns1__searchByKeywords *ns1__searchByKeywords_,
       ns1__searchByKeywordsResponse *ns1__searchByKeywordsResponse_) {
-    return this->searchByKeywords(NULL, NULL, ns1__searchByKeywords_,
+    return this->searchByKeywords(nullptr, nullptr, ns1__searchByKeywords_,
                                   ns1__searchByKeywordsResponse_);
   }
   virtual int searchByKeywords(
@@ -230,7 +231,8 @@ public:
   virtual int searchByKeywordsAll(
       ns1__searchByKeywordsAll *ns1__searchByKeywordsAll_,
       ns1__searchByKeywordsAllResponse *ns1__searchByKeywordsAllResponse_) {
-    return this->searchByKeywordsAll(NULL, NULL, ns1__searchByKeywordsAll_,
+    return this->searchByKeywordsAll(nullptr, nullptr,
+                                     ns1__searchByKeywordsAll_,
                                      ns1__searchByKeywordsAllResponse_);
   }
   virtual int searchByKeywordsAll(
@@ -243,7 +245,8 @@ public:
   virtual int getMyInvestigations(
       ns1__getMyInvestigations *ns1__getMyInvestigations_,
       ns1__getMyInvestigationsResponse *ns1__getMyInvestigationsResponse_) {
-    return this->getMyInvestigations(NULL, NULL, ns1__getMyInvestigations_,
+    return this->getMyInvestigations(nullptr, nullptr,
+                                     ns1__getMyInvestigations_,
                                      ns1__getMyInvestigationsResponse_);
   }
   virtual int getMyInvestigations(
@@ -258,7 +261,7 @@ public:
       ns1__getMyInvestigationsIncludesResponse *
           ns1__getMyInvestigationsIncludesResponse_) {
     return this->getMyInvestigationsIncludes(
-        NULL, NULL, ns1__getMyInvestigationsIncludes_,
+        nullptr, nullptr, ns1__getMyInvestigationsIncludes_,
         ns1__getMyInvestigationsIncludesResponse_);
   }
   virtual int getMyInvestigationsIncludes(
@@ -275,7 +278,7 @@ public:
       ns1__getMyInvestigationsIncludesPaginationResponse *
           ns1__getMyInvestigationsIncludesPaginationResponse_) {
     return this->getMyInvestigationsIncludesPagination(
-        NULL, NULL, ns1__getMyInvestigationsIncludesPagination_,
+        nullptr, nullptr, ns1__getMyInvestigationsIncludesPagination_,
         ns1__getMyInvestigationsIncludesPaginationResponse_);
   }
   virtual int getMyInvestigationsIncludesPagination(
@@ -289,7 +292,7 @@ public:
   virtual int
   searchByUserID(ns1__searchByUserID *ns1__searchByUserID_,
                  ns1__searchByUserIDResponse *ns1__searchByUserIDResponse_) {
-    return this->searchByUserID(NULL, NULL, ns1__searchByUserID_,
+    return this->searchByUserID(nullptr, nullptr, ns1__searchByUserID_,
                                 ns1__searchByUserIDResponse_);
   }
   virtual int
@@ -304,7 +307,7 @@ public:
       ns1__searchByUserIDPaginationResponse *
           ns1__searchByUserIDPaginationResponse_) {
     return this->searchByUserIDPagination(
-        NULL, NULL, ns1__searchByUserIDPagination_,
+        nullptr, nullptr, ns1__searchByUserIDPagination_,
         ns1__searchByUserIDPaginationResponse_);
   }
   virtual int searchByUserIDPagination(
@@ -318,7 +321,8 @@ public:
   virtual int searchByUserSurname(
       ns1__searchByUserSurname *ns1__searchByUserSurname_,
       ns1__searchByUserSurnameResponse *ns1__searchByUserSurnameResponse_) {
-    return this->searchByUserSurname(NULL, NULL, ns1__searchByUserSurname_,
+    return this->searchByUserSurname(nullptr, nullptr,
+                                     ns1__searchByUserSurname_,
                                      ns1__searchByUserSurnameResponse_);
   }
   virtual int searchByUserSurname(
@@ -333,7 +337,7 @@ public:
       ns1__searchByUserSurnamePaginationResponse *
           ns1__searchByUserSurnamePaginationResponse_) {
     return this->searchByUserSurnamePagination(
-        NULL, NULL, ns1__searchByUserSurnamePagination_,
+        nullptr, nullptr, ns1__searchByUserSurnamePagination_,
         ns1__searchByUserSurnamePaginationResponse_);
   }
   virtual int searchByUserSurnamePagination(
@@ -346,7 +350,7 @@ public:
   virtual int
   listInstruments(ns1__listInstruments *ns1__listInstruments_,
                   ns1__listInstrumentsResponse *ns1__listInstrumentsResponse_) {
-    return this->listInstruments(NULL, NULL, ns1__listInstruments_,
+    return this->listInstruments(nullptr, nullptr, ns1__listInstruments_,
                                  ns1__listInstrumentsResponse_);
   }
   virtual int
@@ -358,7 +362,7 @@ public:
   virtual int getAllInstruments(
       ns1__getAllInstruments *ns1__getAllInstruments_,
       ns1__getAllInstrumentsResponse *ns1__getAllInstrumentsResponse_) {
-    return this->getAllInstruments(NULL, NULL, ns1__getAllInstruments_,
+    return this->getAllInstruments(nullptr, nullptr, ns1__getAllInstruments_,
                                    ns1__getAllInstrumentsResponse_);
   }
   virtual int getAllInstruments(
@@ -369,7 +373,7 @@ public:
   /// Web service operation 'listRoles' (returns error code or SOAP_OK)
   virtual int listRoles(ns1__listRoles *ns1__listRoles_,
                         ns1__listRolesResponse *ns1__listRolesResponse_) {
-    return this->listRoles(NULL, NULL, ns1__listRoles_,
+    return this->listRoles(nullptr, nullptr, ns1__listRoles_,
                            ns1__listRolesResponse_);
   }
   virtual int listRoles(const char *endpoint, const char *soap_action,
@@ -380,7 +384,7 @@ public:
   virtual int
   listParameters(ns1__listParameters *ns1__listParameters_,
                  ns1__listParametersResponse *ns1__listParametersResponse_) {
-    return this->listParameters(NULL, NULL, ns1__listParameters_,
+    return this->listParameters(nullptr, nullptr, ns1__listParameters_,
                                 ns1__listParametersResponse_);
   }
   virtual int
@@ -392,7 +396,7 @@ public:
   virtual int listFacilityCycles(
       ns1__listFacilityCycles *ns1__listFacilityCycles_,
       ns1__listFacilityCyclesResponse *ns1__listFacilityCyclesResponse_) {
-    return this->listFacilityCycles(NULL, NULL, ns1__listFacilityCycles_,
+    return this->listFacilityCycles(nullptr, nullptr, ns1__listFacilityCycles_,
                                     ns1__listFacilityCyclesResponse_);
   }
   virtual int listFacilityCycles(
@@ -408,7 +412,7 @@ public:
       ns1__getFacilityCyclesWithDataForInstrumentResponse *
           ns1__getFacilityCyclesWithDataForInstrumentResponse_) {
     return this->getFacilityCyclesWithDataForInstrument(
-        NULL, NULL, ns1__getFacilityCyclesWithDataForInstrument_,
+        nullptr, nullptr, ns1__getFacilityCyclesWithDataForInstrument_,
         ns1__getFacilityCyclesWithDataForInstrumentResponse_);
   }
   virtual int getFacilityCyclesWithDataForInstrument(
@@ -424,7 +428,7 @@ public:
       ns1__getInstrumentsWithData *ns1__getInstrumentsWithData_,
       ns1__getInstrumentsWithDataResponse *
           ns1__getInstrumentsWithDataResponse_) {
-    return this->getInstrumentsWithData(NULL, NULL,
+    return this->getInstrumentsWithData(nullptr, nullptr,
                                         ns1__getInstrumentsWithData_,
                                         ns1__getInstrumentsWithDataResponse_);
   }
@@ -440,7 +444,7 @@ public:
       ns1__listInvestigationTypes *ns1__listInvestigationTypes_,
       ns1__listInvestigationTypesResponse *
           ns1__listInvestigationTypesResponse_) {
-    return this->listInvestigationTypes(NULL, NULL,
+    return this->listInvestigationTypes(nullptr, nullptr,
                                         ns1__listInvestigationTypes_,
                                         ns1__listInvestigationTypesResponse_);
   }
@@ -457,7 +461,7 @@ public:
       ns1__searchSamplesBySampleNameResponse *
           ns1__searchSamplesBySampleNameResponse_) {
     return this->searchSamplesBySampleName(
-        NULL, NULL, ns1__searchSamplesBySampleName_,
+        nullptr, nullptr, ns1__searchSamplesBySampleName_,
         ns1__searchSamplesBySampleNameResponse_);
   }
   virtual int searchSamplesBySampleName(
@@ -472,7 +476,7 @@ public:
       ns1__searchDatasetsBySample *ns1__searchDatasetsBySample_,
       ns1__searchDatasetsBySampleResponse *
           ns1__searchDatasetsBySampleResponse_) {
-    return this->searchDatasetsBySample(NULL, NULL,
+    return this->searchDatasetsBySample(nullptr, nullptr,
                                         ns1__searchDatasetsBySample_,
                                         ns1__searchDatasetsBySampleResponse_);
   }
@@ -486,7 +490,7 @@ public:
   virtual int listDatasetTypes(
       ns1__listDatasetTypes *ns1__listDatasetTypes_,
       ns1__listDatasetTypesResponse *ns1__listDatasetTypesResponse_) {
-    return this->listDatasetTypes(NULL, NULL, ns1__listDatasetTypes_,
+    return this->listDatasetTypes(nullptr, nullptr, ns1__listDatasetTypes_,
                                   ns1__listDatasetTypesResponse_);
   }
   virtual int listDatasetTypes(
@@ -498,7 +502,7 @@ public:
   virtual int listDatasetStatus(
       ns1__listDatasetStatus *ns1__listDatasetStatus_,
       ns1__listDatasetStatusResponse *ns1__listDatasetStatusResponse_) {
-    return this->listDatasetStatus(NULL, NULL, ns1__listDatasetStatus_,
+    return this->listDatasetStatus(nullptr, nullptr, ns1__listDatasetStatus_,
                                    ns1__listDatasetStatusResponse_);
   }
   virtual int listDatasetStatus(
@@ -510,7 +514,7 @@ public:
   virtual int searchByRunNumber(
       ns1__searchByRunNumber *ns1__searchByRunNumber_,
       ns1__searchByRunNumberResponse *ns1__searchByRunNumberResponse_) {
-    return this->searchByRunNumber(NULL, NULL, ns1__searchByRunNumber_,
+    return this->searchByRunNumber(nullptr, nullptr, ns1__searchByRunNumber_,
                                    ns1__searchByRunNumberResponse_);
   }
   virtual int searchByRunNumber(
@@ -525,7 +529,7 @@ public:
       ns1__searchByRunNumberPaginationResponse *
           ns1__searchByRunNumberPaginationResponse_) {
     return this->searchByRunNumberPagination(
-        NULL, NULL, ns1__searchByRunNumberPagination_,
+        nullptr, nullptr, ns1__searchByRunNumberPagination_,
         ns1__searchByRunNumberPaginationResponse_);
   }
   virtual int searchByRunNumberPagination(
@@ -539,7 +543,8 @@ public:
   virtual int listDatafileFormats(
       ns1__listDatafileFormats *ns1__listDatafileFormats_,
       ns1__listDatafileFormatsResponse *ns1__listDatafileFormatsResponse_) {
-    return this->listDatafileFormats(NULL, NULL, ns1__listDatafileFormats_,
+    return this->listDatafileFormats(nullptr, nullptr,
+                                     ns1__listDatafileFormats_,
                                      ns1__listDatafileFormatsResponse_);
   }
   virtual int listDatafileFormats(
@@ -551,7 +556,7 @@ public:
   virtual int getInvestigation(
       ns1__getInvestigation *ns1__getInvestigation_,
       ns1__getInvestigationResponse *ns1__getInvestigationResponse_) {
-    return this->getInvestigation(NULL, NULL, ns1__getInvestigation_,
+    return this->getInvestigation(nullptr, nullptr, ns1__getInvestigation_,
                                   ns1__getInvestigationResponse_);
   }
   virtual int getInvestigation(
@@ -566,7 +571,7 @@ public:
       ns1__getInvestigationIncludesResponse *
           ns1__getInvestigationIncludesResponse_) {
     return this->getInvestigationIncludes(
-        NULL, NULL, ns1__getInvestigationIncludes_,
+        nullptr, nullptr, ns1__getInvestigationIncludes_,
         ns1__getInvestigationIncludesResponse_);
   }
   virtual int getInvestigationIncludes(
@@ -579,7 +584,7 @@ public:
   virtual int getInvestigations(
       ns1__getInvestigations *ns1__getInvestigations_,
       ns1__getInvestigationsResponse *ns1__getInvestigationsResponse_) {
-    return this->getInvestigations(NULL, NULL, ns1__getInvestigations_,
+    return this->getInvestigations(nullptr, nullptr, ns1__getInvestigations_,
                                    ns1__getInvestigationsResponse_);
   }
   virtual int getInvestigations(
@@ -594,7 +599,7 @@ public:
       ns1__getInvestigationsIncludesResponse *
           ns1__getInvestigationsIncludesResponse_) {
     return this->getInvestigationsIncludes(
-        NULL, NULL, ns1__getInvestigationsIncludes_,
+        nullptr, nullptr, ns1__getInvestigationsIncludes_,
         ns1__getInvestigationsIncludesResponse_);
   }
   virtual int getInvestigationsIncludes(
@@ -608,7 +613,8 @@ public:
   virtual int createInvestigation(
       ns1__createInvestigation *ns1__createInvestigation_,
       ns1__createInvestigationResponse *ns1__createInvestigationResponse_) {
-    return this->createInvestigation(NULL, NULL, ns1__createInvestigation_,
+    return this->createInvestigation(nullptr, nullptr,
+                                     ns1__createInvestigation_,
                                      ns1__createInvestigationResponse_);
   }
   virtual int createInvestigation(
@@ -621,7 +627,8 @@ public:
   virtual int deleteInvestigation(
       ns1__deleteInvestigation *ns1__deleteInvestigation_,
       ns1__deleteInvestigationResponse *ns1__deleteInvestigationResponse_) {
-    return this->deleteInvestigation(NULL, NULL, ns1__deleteInvestigation_,
+    return this->deleteInvestigation(nullptr, nullptr,
+                                     ns1__deleteInvestigation_,
                                      ns1__deleteInvestigationResponse_);
   }
   virtual int deleteInvestigation(
@@ -634,7 +641,8 @@ public:
   virtual int removeInvestigation(
       ns1__removeInvestigation *ns1__removeInvestigation_,
       ns1__removeInvestigationResponse *ns1__removeInvestigationResponse_) {
-    return this->removeInvestigation(NULL, NULL, ns1__removeInvestigation_,
+    return this->removeInvestigation(nullptr, nullptr,
+                                     ns1__removeInvestigation_,
                                      ns1__removeInvestigationResponse_);
   }
   virtual int removeInvestigation(
@@ -645,7 +653,7 @@ public:
   /// Web service operation 'addKeyword' (returns error code or SOAP_OK)
   virtual int addKeyword(ns1__addKeyword *ns1__addKeyword_,
                          ns1__addKeywordResponse *ns1__addKeywordResponse_) {
-    return this->addKeyword(NULL, NULL, ns1__addKeyword_,
+    return this->addKeyword(nullptr, nullptr, ns1__addKeyword_,
                             ns1__addKeywordResponse_);
   }
   virtual int addKeyword(const char *endpoint, const char *soap_action,
@@ -656,7 +664,7 @@ public:
   virtual int
   addInvestigator(ns1__addInvestigator *ns1__addInvestigator_,
                   ns1__addInvestigatorResponse *ns1__addInvestigatorResponse_) {
-    return this->addInvestigator(NULL, NULL, ns1__addInvestigator_,
+    return this->addInvestigator(nullptr, nullptr, ns1__addInvestigator_,
                                  ns1__addInvestigatorResponse_);
   }
   virtual int
@@ -667,7 +675,7 @@ public:
   /// Web service operation 'addSample' (returns error code or SOAP_OK)
   virtual int addSample(ns1__addSample *ns1__addSample_,
                         ns1__addSampleResponse *ns1__addSampleResponse_) {
-    return this->addSample(NULL, NULL, ns1__addSample_,
+    return this->addSample(nullptr, nullptr, ns1__addSample_,
                            ns1__addSampleResponse_);
   }
   virtual int addSample(const char *endpoint, const char *soap_action,
@@ -678,7 +686,7 @@ public:
   virtual int
   addPublication(ns1__addPublication *ns1__addPublication_,
                  ns1__addPublicationResponse *ns1__addPublicationResponse_) {
-    return this->addPublication(NULL, NULL, ns1__addPublication_,
+    return this->addPublication(nullptr, nullptr, ns1__addPublication_,
                                 ns1__addPublicationResponse_);
   }
   virtual int
@@ -690,7 +698,7 @@ public:
   virtual int addSampleParameter(
       ns1__addSampleParameter *ns1__addSampleParameter_,
       ns1__addSampleParameterResponse *ns1__addSampleParameterResponse_) {
-    return this->addSampleParameter(NULL, NULL, ns1__addSampleParameter_,
+    return this->addSampleParameter(nullptr, nullptr, ns1__addSampleParameter_,
                                     ns1__addSampleParameterResponse_);
   }
   virtual int addSampleParameter(
@@ -702,7 +710,7 @@ public:
   virtual int deleteInvestigator(
       ns1__deleteInvestigator *ns1__deleteInvestigator_,
       ns1__deleteInvestigatorResponse *ns1__deleteInvestigatorResponse_) {
-    return this->deleteInvestigator(NULL, NULL, ns1__deleteInvestigator_,
+    return this->deleteInvestigator(nullptr, nullptr, ns1__deleteInvestigator_,
                                     ns1__deleteInvestigatorResponse_);
   }
   virtual int deleteInvestigator(
@@ -714,7 +722,7 @@ public:
   virtual int
   deleteKeyword(ns1__deleteKeyword *ns1__deleteKeyword_,
                 ns1__deleteKeywordResponse *ns1__deleteKeywordResponse_) {
-    return this->deleteKeyword(NULL, NULL, ns1__deleteKeyword_,
+    return this->deleteKeyword(nullptr, nullptr, ns1__deleteKeyword_,
                                ns1__deleteKeywordResponse_);
   }
   virtual int
@@ -726,7 +734,7 @@ public:
   virtual int deletePublication(
       ns1__deletePublication *ns1__deletePublication_,
       ns1__deletePublicationResponse *ns1__deletePublicationResponse_) {
-    return this->deletePublication(NULL, NULL, ns1__deletePublication_,
+    return this->deletePublication(nullptr, nullptr, ns1__deletePublication_,
                                    ns1__deletePublicationResponse_);
   }
   virtual int deletePublication(
@@ -738,7 +746,7 @@ public:
   virtual int
   deleteSample(ns1__deleteSample *ns1__deleteSample_,
                ns1__deleteSampleResponse *ns1__deleteSampleResponse_) {
-    return this->deleteSample(NULL, NULL, ns1__deleteSample_,
+    return this->deleteSample(nullptr, nullptr, ns1__deleteSample_,
                               ns1__deleteSampleResponse_);
   }
   virtual int
@@ -751,7 +759,8 @@ public:
   virtual int deleteSampleParameter(
       ns1__deleteSampleParameter *ns1__deleteSampleParameter_,
       ns1__deleteSampleParameterResponse *ns1__deleteSampleParameterResponse_) {
-    return this->deleteSampleParameter(NULL, NULL, ns1__deleteSampleParameter_,
+    return this->deleteSampleParameter(nullptr, nullptr,
+                                       ns1__deleteSampleParameter_,
                                        ns1__deleteSampleParameterResponse_);
   }
   virtual int deleteSampleParameter(
@@ -764,7 +773,8 @@ public:
   virtual int modifyInvestigation(
       ns1__modifyInvestigation *ns1__modifyInvestigation_,
       ns1__modifyInvestigationResponse *ns1__modifyInvestigationResponse_) {
-    return this->modifyInvestigation(NULL, NULL, ns1__modifyInvestigation_,
+    return this->modifyInvestigation(nullptr, nullptr,
+                                     ns1__modifyInvestigation_,
                                      ns1__modifyInvestigationResponse_);
   }
   virtual int modifyInvestigation(
@@ -776,7 +786,7 @@ public:
   virtual int modifyInvestigator(
       ns1__modifyInvestigator *ns1__modifyInvestigator_,
       ns1__modifyInvestigatorResponse *ns1__modifyInvestigatorResponse_) {
-    return this->modifyInvestigator(NULL, NULL, ns1__modifyInvestigator_,
+    return this->modifyInvestigator(nullptr, nullptr, ns1__modifyInvestigator_,
                                     ns1__modifyInvestigatorResponse_);
   }
   virtual int modifyInvestigator(
@@ -788,7 +798,7 @@ public:
   virtual int
   modifySample(ns1__modifySample *ns1__modifySample_,
                ns1__modifySampleResponse *ns1__modifySampleResponse_) {
-    return this->modifySample(NULL, NULL, ns1__modifySample_,
+    return this->modifySample(nullptr, nullptr, ns1__modifySample_,
                               ns1__modifySampleResponse_);
   }
   virtual int
@@ -800,7 +810,7 @@ public:
   virtual int modifyPublication(
       ns1__modifyPublication *ns1__modifyPublication_,
       ns1__modifyPublicationResponse *ns1__modifyPublicationResponse_) {
-    return this->modifyPublication(NULL, NULL, ns1__modifyPublication_,
+    return this->modifyPublication(nullptr, nullptr, ns1__modifyPublication_,
                                    ns1__modifyPublicationResponse_);
   }
   virtual int modifyPublication(
@@ -813,7 +823,8 @@ public:
   virtual int modifySampleParameter(
       ns1__modifySampleParameter *ns1__modifySampleParameter_,
       ns1__modifySampleParameterResponse *ns1__modifySampleParameterResponse_) {
-    return this->modifySampleParameter(NULL, NULL, ns1__modifySampleParameter_,
+    return this->modifySampleParameter(nullptr, nullptr,
+                                       ns1__modifySampleParameter_,
                                        ns1__modifySampleParameterResponse_);
   }
   virtual int modifySampleParameter(
@@ -825,7 +836,7 @@ public:
   virtual int
   removeKeyword(ns1__removeKeyword *ns1__removeKeyword_,
                 ns1__removeKeywordResponse *ns1__removeKeywordResponse_) {
-    return this->removeKeyword(NULL, NULL, ns1__removeKeyword_,
+    return this->removeKeyword(nullptr, nullptr, ns1__removeKeyword_,
                                ns1__removeKeywordResponse_);
   }
   virtual int
@@ -837,7 +848,7 @@ public:
   virtual int removeInvestigator(
       ns1__removeInvestigator *ns1__removeInvestigator_,
       ns1__removeInvestigatorResponse *ns1__removeInvestigatorResponse_) {
-    return this->removeInvestigator(NULL, NULL, ns1__removeInvestigator_,
+    return this->removeInvestigator(nullptr, nullptr, ns1__removeInvestigator_,
                                     ns1__removeInvestigatorResponse_);
   }
   virtual int removeInvestigator(
@@ -849,7 +860,7 @@ public:
   virtual int removePublication(
       ns1__removePublication *ns1__removePublication_,
       ns1__removePublicationResponse *ns1__removePublicationResponse_) {
-    return this->removePublication(NULL, NULL, ns1__removePublication_,
+    return this->removePublication(nullptr, nullptr, ns1__removePublication_,
                                    ns1__removePublicationResponse_);
   }
   virtual int removePublication(
@@ -861,7 +872,7 @@ public:
   virtual int
   removeSample(ns1__removeSample *ns1__removeSample_,
                ns1__removeSampleResponse *ns1__removeSampleResponse_) {
-    return this->removeSample(NULL, NULL, ns1__removeSample_,
+    return this->removeSample(nullptr, nullptr, ns1__removeSample_,
                               ns1__removeSampleResponse_);
   }
   virtual int
@@ -874,7 +885,8 @@ public:
   virtual int removeSampleParameter(
       ns1__removeSampleParameter *ns1__removeSampleParameter_,
       ns1__removeSampleParameterResponse *ns1__removeSampleParameterResponse_) {
-    return this->removeSampleParameter(NULL, NULL, ns1__removeSampleParameter_,
+    return this->removeSampleParameter(nullptr, nullptr,
+                                       ns1__removeSampleParameter_,
                                        ns1__removeSampleParameterResponse_);
   }
   virtual int removeSampleParameter(
@@ -885,7 +897,7 @@ public:
   /// Web service operation 'getDataset' (returns error code or SOAP_OK)
   virtual int getDataset(ns1__getDataset *ns1__getDataset_,
                          ns1__getDatasetResponse *ns1__getDatasetResponse_) {
-    return this->getDataset(NULL, NULL, ns1__getDataset_,
+    return this->getDataset(nullptr, nullptr, ns1__getDataset_,
                             ns1__getDatasetResponse_);
   }
   virtual int getDataset(const char *endpoint, const char *soap_action,
@@ -896,7 +908,7 @@ public:
   virtual int getDatasetIncludes(
       ns1__getDatasetIncludes *ns1__getDatasetIncludes_,
       ns1__getDatasetIncludesResponse *ns1__getDatasetIncludesResponse_) {
-    return this->getDatasetIncludes(NULL, NULL, ns1__getDatasetIncludes_,
+    return this->getDatasetIncludes(nullptr, nullptr, ns1__getDatasetIncludes_,
                                     ns1__getDatasetIncludesResponse_);
   }
   virtual int getDatasetIncludes(
@@ -907,7 +919,7 @@ public:
   /// Web service operation 'getDatasets' (returns error code or SOAP_OK)
   virtual int getDatasets(ns1__getDatasets *ns1__getDatasets_,
                           ns1__getDatasetsResponse *ns1__getDatasetsResponse_) {
-    return this->getDatasets(NULL, NULL, ns1__getDatasets_,
+    return this->getDatasets(nullptr, nullptr, ns1__getDatasets_,
                              ns1__getDatasetsResponse_);
   }
   virtual int getDatasets(const char *endpoint, const char *soap_action,
@@ -918,7 +930,7 @@ public:
   virtual int
   createDataSet(ns1__createDataSet *ns1__createDataSet_,
                 ns1__createDataSetResponse *ns1__createDataSetResponse_) {
-    return this->createDataSet(NULL, NULL, ns1__createDataSet_,
+    return this->createDataSet(nullptr, nullptr, ns1__createDataSet_,
                                ns1__createDataSetResponse_);
   }
   virtual int
@@ -930,7 +942,7 @@ public:
   virtual int
   createDataSets(ns1__createDataSets *ns1__createDataSets_,
                  ns1__createDataSetsResponse *ns1__createDataSetsResponse_) {
-    return this->createDataSets(NULL, NULL, ns1__createDataSets_,
+    return this->createDataSets(nullptr, nullptr, ns1__createDataSets_,
                                 ns1__createDataSetsResponse_);
   }
   virtual int
@@ -942,7 +954,7 @@ public:
   virtual int
   deleteDataSet(ns1__deleteDataSet *ns1__deleteDataSet_,
                 ns1__deleteDataSetResponse *ns1__deleteDataSetResponse_) {
-    return this->deleteDataSet(NULL, NULL, ns1__deleteDataSet_,
+    return this->deleteDataSet(nullptr, nullptr, ns1__deleteDataSet_,
                                ns1__deleteDataSetResponse_);
   }
   virtual int
@@ -956,7 +968,7 @@ public:
       ns1__deleteDataSetParameter *ns1__deleteDataSetParameter_,
       ns1__deleteDataSetParameterResponse *
           ns1__deleteDataSetParameterResponse_) {
-    return this->deleteDataSetParameter(NULL, NULL,
+    return this->deleteDataSetParameter(nullptr, nullptr,
                                         ns1__deleteDataSetParameter_,
                                         ns1__deleteDataSetParameterResponse_);
   }
@@ -970,7 +982,7 @@ public:
   virtual int
   modifyDataSet(ns1__modifyDataSet *ns1__modifyDataSet_,
                 ns1__modifyDataSetResponse *ns1__modifyDataSetResponse_) {
-    return this->modifyDataSet(NULL, NULL, ns1__modifyDataSet_,
+    return this->modifyDataSet(nullptr, nullptr, ns1__modifyDataSet_,
                                ns1__modifyDataSetResponse_);
   }
   virtual int
@@ -984,7 +996,7 @@ public:
       ns1__modifyDataSetParameter *ns1__modifyDataSetParameter_,
       ns1__modifyDataSetParameterResponse *
           ns1__modifyDataSetParameterResponse_) {
-    return this->modifyDataSetParameter(NULL, NULL,
+    return this->modifyDataSetParameter(nullptr, nullptr,
                                         ns1__modifyDataSetParameter_,
                                         ns1__modifyDataSetParameterResponse_);
   }
@@ -998,7 +1010,7 @@ public:
   virtual int setDataSetSample(
       ns1__setDataSetSample *ns1__setDataSetSample_,
       ns1__setDataSetSampleResponse *ns1__setDataSetSampleResponse_) {
-    return this->setDataSetSample(NULL, NULL, ns1__setDataSetSample_,
+    return this->setDataSetSample(nullptr, nullptr, ns1__setDataSetSample_,
                                   ns1__setDataSetSampleResponse_);
   }
   virtual int setDataSetSample(
@@ -1011,7 +1023,8 @@ public:
   virtual int addDataSetParameter(
       ns1__addDataSetParameter *ns1__addDataSetParameter_,
       ns1__addDataSetParameterResponse *ns1__addDataSetParameterResponse_) {
-    return this->addDataSetParameter(NULL, NULL, ns1__addDataSetParameter_,
+    return this->addDataSetParameter(nullptr, nullptr,
+                                     ns1__addDataSetParameter_,
                                      ns1__addDataSetParameterResponse_);
   }
   virtual int addDataSetParameter(
@@ -1024,7 +1037,8 @@ public:
   virtual int addDataSetParameters(
       ns1__addDataSetParameters *ns1__addDataSetParameters_,
       ns1__addDataSetParametersResponse *ns1__addDataSetParametersResponse_) {
-    return this->addDataSetParameters(NULL, NULL, ns1__addDataSetParameters_,
+    return this->addDataSetParameters(nullptr, nullptr,
+                                      ns1__addDataSetParameters_,
                                       ns1__addDataSetParametersResponse_);
   }
   virtual int addDataSetParameters(
@@ -1036,7 +1050,7 @@ public:
   virtual int
   removeDataSet(ns1__removeDataSet *ns1__removeDataSet_,
                 ns1__removeDataSetResponse *ns1__removeDataSetResponse_) {
-    return this->removeDataSet(NULL, NULL, ns1__removeDataSet_,
+    return this->removeDataSet(nullptr, nullptr, ns1__removeDataSet_,
                                ns1__removeDataSetResponse_);
   }
   virtual int
@@ -1050,7 +1064,7 @@ public:
       ns1__removeDataSetParameter *ns1__removeDataSetParameter_,
       ns1__removeDataSetParameterResponse *
           ns1__removeDataSetParameterResponse_) {
-    return this->removeDataSetParameter(NULL, NULL,
+    return this->removeDataSetParameter(nullptr, nullptr,
                                         ns1__removeDataSetParameter_,
                                         ns1__removeDataSetParameterResponse_);
   }
@@ -1063,7 +1077,7 @@ public:
   /// Web service operation 'getDatafile' (returns error code or SOAP_OK)
   virtual int getDatafile(ns1__getDatafile *ns1__getDatafile_,
                           ns1__getDatafileResponse *ns1__getDatafileResponse_) {
-    return this->getDatafile(NULL, NULL, ns1__getDatafile_,
+    return this->getDatafile(nullptr, nullptr, ns1__getDatafile_,
                              ns1__getDatafileResponse_);
   }
   virtual int getDatafile(const char *endpoint, const char *soap_action,
@@ -1074,7 +1088,7 @@ public:
   virtual int
   getDatafiles(ns1__getDatafiles *ns1__getDatafiles_,
                ns1__getDatafilesResponse *ns1__getDatafilesResponse_) {
-    return this->getDatafiles(NULL, NULL, ns1__getDatafiles_,
+    return this->getDatafiles(nullptr, nullptr, ns1__getDatafiles_,
                               ns1__getDatafilesResponse_);
   }
   virtual int
@@ -1086,7 +1100,7 @@ public:
   virtual int
   createDataFile(ns1__createDataFile *ns1__createDataFile_,
                  ns1__createDataFileResponse *ns1__createDataFileResponse_) {
-    return this->createDataFile(NULL, NULL, ns1__createDataFile_,
+    return this->createDataFile(nullptr, nullptr, ns1__createDataFile_,
                                 ns1__createDataFileResponse_);
   }
   virtual int
@@ -1098,7 +1112,7 @@ public:
   virtual int
   createDataFiles(ns1__createDataFiles *ns1__createDataFiles_,
                   ns1__createDataFilesResponse *ns1__createDataFilesResponse_) {
-    return this->createDataFiles(NULL, NULL, ns1__createDataFiles_,
+    return this->createDataFiles(nullptr, nullptr, ns1__createDataFiles_,
                                  ns1__createDataFilesResponse_);
   }
   virtual int
@@ -1110,7 +1124,7 @@ public:
   virtual int
   deleteDataFile(ns1__deleteDataFile *ns1__deleteDataFile_,
                  ns1__deleteDataFileResponse *ns1__deleteDataFileResponse_) {
-    return this->deleteDataFile(NULL, NULL, ns1__deleteDataFile_,
+    return this->deleteDataFile(nullptr, nullptr, ns1__deleteDataFile_,
                                 ns1__deleteDataFileResponse_);
   }
   virtual int
@@ -1122,7 +1136,7 @@ public:
   virtual int
   modifyDataFile(ns1__modifyDataFile *ns1__modifyDataFile_,
                  ns1__modifyDataFileResponse *ns1__modifyDataFileResponse_) {
-    return this->modifyDataFile(NULL, NULL, ns1__modifyDataFile_,
+    return this->modifyDataFile(nullptr, nullptr, ns1__modifyDataFile_,
                                 ns1__modifyDataFileResponse_);
   }
   virtual int
@@ -1135,7 +1149,8 @@ public:
   virtual int addDataFileParameter(
       ns1__addDataFileParameter *ns1__addDataFileParameter_,
       ns1__addDataFileParameterResponse *ns1__addDataFileParameterResponse_) {
-    return this->addDataFileParameter(NULL, NULL, ns1__addDataFileParameter_,
+    return this->addDataFileParameter(nullptr, nullptr,
+                                      ns1__addDataFileParameter_,
                                       ns1__addDataFileParameterResponse_);
   }
   virtual int addDataFileParameter(
@@ -1148,7 +1163,8 @@ public:
   virtual int addDataFileParameters(
       ns1__addDataFileParameters *ns1__addDataFileParameters_,
       ns1__addDataFileParametersResponse *ns1__addDataFileParametersResponse_) {
-    return this->addDataFileParameters(NULL, NULL, ns1__addDataFileParameters_,
+    return this->addDataFileParameters(nullptr, nullptr,
+                                       ns1__addDataFileParameters_,
                                        ns1__addDataFileParametersResponse_);
   }
   virtual int addDataFileParameters(
@@ -1162,7 +1178,7 @@ public:
       ns1__modifyDataFileParameter *ns1__modifyDataFileParameter_,
       ns1__modifyDataFileParameterResponse *
           ns1__modifyDataFileParameterResponse_) {
-    return this->modifyDataFileParameter(NULL, NULL,
+    return this->modifyDataFileParameter(nullptr, nullptr,
                                          ns1__modifyDataFileParameter_,
                                          ns1__modifyDataFileParameterResponse_);
   }
@@ -1178,7 +1194,7 @@ public:
       ns1__deleteDataFileParameter *ns1__deleteDataFileParameter_,
       ns1__deleteDataFileParameterResponse *
           ns1__deleteDataFileParameterResponse_) {
-    return this->deleteDataFileParameter(NULL, NULL,
+    return this->deleteDataFileParameter(nullptr, nullptr,
                                          ns1__deleteDataFileParameter_,
                                          ns1__deleteDataFileParameterResponse_);
   }
@@ -1192,7 +1208,7 @@ public:
   virtual int
   removeDataFile(ns1__removeDataFile *ns1__removeDataFile_,
                  ns1__removeDataFileResponse *ns1__removeDataFileResponse_) {
-    return this->removeDataFile(NULL, NULL, ns1__removeDataFile_,
+    return this->removeDataFile(nullptr, nullptr, ns1__removeDataFile_,
                                 ns1__removeDataFileResponse_);
   }
   virtual int
@@ -1206,7 +1222,7 @@ public:
       ns1__removeDataFileParameter *ns1__removeDataFileParameter_,
       ns1__removeDataFileParameterResponse *
           ns1__removeDataFileParameterResponse_) {
-    return this->removeDataFileParameter(NULL, NULL,
+    return this->removeDataFileParameter(nullptr, nullptr,
                                          ns1__removeDataFileParameter_,
                                          ns1__removeDataFileParameterResponse_);
   }
@@ -1220,7 +1236,7 @@ public:
   virtual int getAuthorisations(
       ns1__getAuthorisations *ns1__getAuthorisations_,
       ns1__getAuthorisationsResponse *ns1__getAuthorisationsResponse_) {
-    return this->getAuthorisations(NULL, NULL, ns1__getAuthorisations_,
+    return this->getAuthorisations(nullptr, nullptr, ns1__getAuthorisations_,
                                    ns1__getAuthorisationsResponse_);
   }
   virtual int getAuthorisations(
@@ -1232,7 +1248,7 @@ public:
   virtual int addAuthorisation(
       ns1__addAuthorisation *ns1__addAuthorisation_,
       ns1__addAuthorisationResponse *ns1__addAuthorisationResponse_) {
-    return this->addAuthorisation(NULL, NULL, ns1__addAuthorisation_,
+    return this->addAuthorisation(nullptr, nullptr, ns1__addAuthorisation_,
                                   ns1__addAuthorisationResponse_);
   }
   virtual int addAuthorisation(
@@ -1245,7 +1261,8 @@ public:
   virtual int deleteAuthorisation(
       ns1__deleteAuthorisation *ns1__deleteAuthorisation_,
       ns1__deleteAuthorisationResponse *ns1__deleteAuthorisationResponse_) {
-    return this->deleteAuthorisation(NULL, NULL, ns1__deleteAuthorisation_,
+    return this->deleteAuthorisation(nullptr, nullptr,
+                                     ns1__deleteAuthorisation_,
                                      ns1__deleteAuthorisationResponse_);
   }
   virtual int deleteAuthorisation(
@@ -1258,7 +1275,8 @@ public:
   virtual int removeAuthorisation(
       ns1__removeAuthorisation *ns1__removeAuthorisation_,
       ns1__removeAuthorisationResponse *ns1__removeAuthorisationResponse_) {
-    return this->removeAuthorisation(NULL, NULL, ns1__removeAuthorisation_,
+    return this->removeAuthorisation(nullptr, nullptr,
+                                     ns1__removeAuthorisation_,
                                      ns1__removeAuthorisationResponse_);
   }
   virtual int removeAuthorisation(
@@ -1271,7 +1289,8 @@ public:
   virtual int updateAuthorisation(
       ns1__updateAuthorisation *ns1__updateAuthorisation_,
       ns1__updateAuthorisationResponse *ns1__updateAuthorisationResponse_) {
-    return this->updateAuthorisation(NULL, NULL, ns1__updateAuthorisation_,
+    return this->updateAuthorisation(nullptr, nullptr,
+                                     ns1__updateAuthorisation_,
                                      ns1__updateAuthorisationResponse_);
   }
   virtual int updateAuthorisation(
@@ -1283,7 +1302,7 @@ public:
   virtual int
   ingestMetadata(ns1__ingestMetadata *ns1__ingestMetadata_,
                  ns1__ingestMetadataResponse *ns1__ingestMetadataResponse_) {
-    return this->ingestMetadata(NULL, NULL, ns1__ingestMetadata_,
+    return this->ingestMetadata(nullptr, nullptr, ns1__ingestMetadata_,
                                 ns1__ingestMetadataResponse_);
   }
   virtual int
@@ -1295,7 +1314,7 @@ public:
   virtual int downloadDatafile(
       ns1__downloadDatafile *ns1__downloadDatafile_,
       ns1__downloadDatafileResponse *ns1__downloadDatafileResponse_) {
-    return this->downloadDatafile(NULL, NULL, ns1__downloadDatafile_,
+    return this->downloadDatafile(nullptr, nullptr, ns1__downloadDatafile_,
                                   ns1__downloadDatafileResponse_);
   }
   virtual int downloadDatafile(
@@ -1307,7 +1326,7 @@ public:
   virtual int
   downloadDataset(ns1__downloadDataset *ns1__downloadDataset_,
                   ns1__downloadDatasetResponse *ns1__downloadDatasetResponse_) {
-    return this->downloadDataset(NULL, NULL, ns1__downloadDataset_,
+    return this->downloadDataset(nullptr, nullptr, ns1__downloadDataset_,
                                  ns1__downloadDatasetResponse_);
   }
   virtual int
@@ -1319,7 +1338,7 @@ public:
   virtual int downloadDatafiles(
       ns1__downloadDatafiles *ns1__downloadDatafiles_,
       ns1__downloadDatafilesResponse *ns1__downloadDatafilesResponse_) {
-    return this->downloadDatafiles(NULL, NULL, ns1__downloadDatafiles_,
+    return this->downloadDatafiles(nullptr, nullptr, ns1__downloadDatafiles_,
                                    ns1__downloadDatafilesResponse_);
   }
   virtual int downloadDatafiles(
@@ -1334,7 +1353,7 @@ public:
       ns1__checkDatafileDownloadAccessResponse *
           ns1__checkDatafileDownloadAccessResponse_) {
     return this->checkDatafileDownloadAccess(
-        NULL, NULL, ns1__checkDatafileDownloadAccess_,
+        nullptr, nullptr, ns1__checkDatafileDownloadAccess_,
         ns1__checkDatafileDownloadAccessResponse_);
   }
   virtual int checkDatafileDownloadAccess(
@@ -1350,7 +1369,7 @@ public:
       ns1__checkDatasetDownloadAccessResponse *
           ns1__checkDatasetDownloadAccessResponse_) {
     return this->checkDatasetDownloadAccess(
-        NULL, NULL, ns1__checkDatasetDownloadAccess_,
+        nullptr, nullptr, ns1__checkDatasetDownloadAccess_,
         ns1__checkDatasetDownloadAccessResponse_);
   }
   virtual int checkDatasetDownloadAccess(
@@ -1363,7 +1382,7 @@ public:
   virtual int getICATAPIVersion(
       ns1__getICATAPIVersion *ns1__getICATAPIVersion_,
       ns1__getICATAPIVersionResponse *ns1__getICATAPIVersionResponse_) {
-    return this->getICATAPIVersion(NULL, NULL, ns1__getICATAPIVersion_,
+    return this->getICATAPIVersion(nullptr, nullptr, ns1__getICATAPIVersion_,
                                    ns1__getICATAPIVersionResponse_);
   }
   virtual int getICATAPIVersion(
@@ -1379,7 +1398,7 @@ public:
       ns1__getFacilityUserByFacilityUserIdResponse *
           ns1__getFacilityUserByFacilityUserIdResponse_) {
     return this->getFacilityUserByFacilityUserId(
-        NULL, NULL, ns1__getFacilityUserByFacilityUserId_,
+        nullptr, nullptr, ns1__getFacilityUserByFacilityUserId_,
         ns1__getFacilityUserByFacilityUserIdResponse_);
   }
   virtual int getFacilityUserByFacilityUserId(
@@ -1396,7 +1415,7 @@ public:
       ns1__getFacilityUserByFederalIdResponse *
           ns1__getFacilityUserByFederalIdResponse_) {
     return this->getFacilityUserByFederalId(
-        NULL, NULL, ns1__getFacilityUserByFederalId_,
+        nullptr, nullptr, ns1__getFacilityUserByFederalId_,
         ns1__getFacilityUserByFederalIdResponse_);
   }
   virtual int getFacilityUserByFederalId(
@@ -1413,7 +1432,7 @@ public:
       ns1__searchInvestigationByParameterConditionResponse *
           ns1__searchInvestigationByParameterConditionResponse_) {
     return this->searchInvestigationByParameterCondition(
-        NULL, NULL, ns1__searchInvestigationByParameterCondition_,
+        nullptr, nullptr, ns1__searchInvestigationByParameterCondition_,
         ns1__searchInvestigationByParameterConditionResponse_);
   }
   virtual int searchInvestigationByParameterCondition(
@@ -1431,7 +1450,7 @@ public:
       ns1__searchDatafileByParameterConditionResponse *
           ns1__searchDatafileByParameterConditionResponse_) {
     return this->searchDatafileByParameterCondition(
-        NULL, NULL, ns1__searchDatafileByParameterCondition_,
+        nullptr, nullptr, ns1__searchDatafileByParameterCondition_,
         ns1__searchDatafileByParameterConditionResponse_);
   }
   virtual int searchDatafileByParameterCondition(
@@ -1449,7 +1468,7 @@ public:
       ns1__searchDatasetByParameterConditionResponse *
           ns1__searchDatasetByParameterConditionResponse_) {
     return this->searchDatasetByParameterCondition(
-        NULL, NULL, ns1__searchDatasetByParameterCondition_,
+        nullptr, nullptr, ns1__searchDatasetByParameterCondition_,
         ns1__searchDatasetByParameterConditionResponse_);
   }
   virtual int searchDatasetByParameterCondition(
@@ -1467,7 +1486,7 @@ public:
       ns1__searchSampleByParameterConditionResponse *
           ns1__searchSampleByParameterConditionResponse_) {
     return this->searchSampleByParameterCondition(
-        NULL, NULL, ns1__searchSampleByParameterCondition_,
+        nullptr, nullptr, ns1__searchSampleByParameterCondition_,
         ns1__searchSampleByParameterConditionResponse_);
   }
   virtual int searchSampleByParameterCondition(
@@ -1485,7 +1504,7 @@ public:
       ns1__searchInvestigationByParameterComparisonResponse *
           ns1__searchInvestigationByParameterComparisonResponse_) {
     return this->searchInvestigationByParameterComparison(
-        NULL, NULL, ns1__searchInvestigationByParameterComparison_,
+        nullptr, nullptr, ns1__searchInvestigationByParameterComparison_,
         ns1__searchInvestigationByParameterComparisonResponse_);
   }
   virtual int searchInvestigationByParameterComparison(
@@ -1503,7 +1522,7 @@ public:
       ns1__searchDatafileByParameterComparisonResponse *
           ns1__searchDatafileByParameterComparisonResponse_) {
     return this->searchDatafileByParameterComparison(
-        NULL, NULL, ns1__searchDatafileByParameterComparison_,
+        nullptr, nullptr, ns1__searchDatafileByParameterComparison_,
         ns1__searchDatafileByParameterComparisonResponse_);
   }
   virtual int searchDatafileByParameterComparison(
@@ -1521,7 +1540,7 @@ public:
       ns1__searchDatasetByParameterComparisonResponse *
           ns1__searchDatasetByParameterComparisonResponse_) {
     return this->searchDatasetByParameterComparison(
-        NULL, NULL, ns1__searchDatasetByParameterComparison_,
+        nullptr, nullptr, ns1__searchDatasetByParameterComparison_,
         ns1__searchDatasetByParameterComparisonResponse_);
   }
   virtual int searchDatasetByParameterComparison(
@@ -1539,7 +1558,7 @@ public:
       ns1__searchSampleByParameterComparisonResponse *
           ns1__searchSampleByParameterComparisonResponse_) {
     return this->searchSampleByParameterComparison(
-        NULL, NULL, ns1__searchSampleByParameterComparison_,
+        nullptr, nullptr, ns1__searchSampleByParameterComparison_,
         ns1__searchSampleByParameterComparisonResponse_);
   }
   virtual int searchSampleByParameterComparison(
@@ -1556,7 +1575,7 @@ public:
       ns1__searchInvestigationByParameterResponse *
           ns1__searchInvestigationByParameterResponse_) {
     return this->searchInvestigationByParameter(
-        NULL, NULL, ns1__searchInvestigationByParameter_,
+        nullptr, nullptr, ns1__searchInvestigationByParameter_,
         ns1__searchInvestigationByParameterResponse_);
   }
   virtual int searchInvestigationByParameter(
@@ -1572,7 +1591,7 @@ public:
       ns1__searchDatafileByParameterResponse *
           ns1__searchDatafileByParameterResponse_) {
     return this->searchDatafileByParameter(
-        NULL, NULL, ns1__searchDatafileByParameter_,
+        nullptr, nullptr, ns1__searchDatafileByParameter_,
         ns1__searchDatafileByParameterResponse_);
   }
   virtual int searchDatafileByParameter(
@@ -1588,7 +1607,7 @@ public:
       ns1__searchDatasetByParameterResponse *
           ns1__searchDatasetByParameterResponse_) {
     return this->searchDatasetByParameter(
-        NULL, NULL, ns1__searchDatasetByParameter_,
+        nullptr, nullptr, ns1__searchDatasetByParameter_,
         ns1__searchDatasetByParameterResponse_);
   }
   virtual int searchDatasetByParameter(
@@ -1603,7 +1622,7 @@ public:
       ns1__searchSampleByParameter *ns1__searchSampleByParameter_,
       ns1__searchSampleByParameterResponse *
           ns1__searchSampleByParameterResponse_) {
-    return this->searchSampleByParameter(NULL, NULL,
+    return this->searchSampleByParameter(nullptr, nullptr,
                                          ns1__searchSampleByParameter_,
                                          ns1__searchSampleByParameterResponse_);
   }
@@ -1619,7 +1638,7 @@ public:
       ns1__getParameterByNameUnits *ns1__getParameterByNameUnits_,
       ns1__getParameterByNameUnitsResponse *
           ns1__getParameterByNameUnitsResponse_) {
-    return this->getParameterByNameUnits(NULL, NULL,
+    return this->getParameterByNameUnits(nullptr, nullptr,
                                          ns1__getParameterByNameUnits_,
                                          ns1__getParameterByNameUnitsResponse_);
   }
@@ -1633,7 +1652,7 @@ public:
   virtual int getParameterByName(
       ns1__getParameterByName *ns1__getParameterByName_,
       ns1__getParameterByNameResponse *ns1__getParameterByNameResponse_) {
-    return this->getParameterByName(NULL, NULL, ns1__getParameterByName_,
+    return this->getParameterByName(nullptr, nullptr, ns1__getParameterByName_,
                                     ns1__getParameterByNameResponse_);
   }
   virtual int getParameterByName(
@@ -1648,7 +1667,7 @@ public:
       ns1__getParameterByRestrictionResponse *
           ns1__getParameterByRestrictionResponse_) {
     return this->getParameterByRestriction(
-        NULL, NULL, ns1__getParameterByRestriction_,
+        nullptr, nullptr, ns1__getParameterByRestriction_,
         ns1__getParameterByRestrictionResponse_);
   }
   virtual int getParameterByRestriction(
@@ -1662,7 +1681,8 @@ public:
   virtual int getParameterByUnits(
       ns1__getParameterByUnits *ns1__getParameterByUnits_,
       ns1__getParameterByUnitsResponse *ns1__getParameterByUnitsResponse_) {
-    return this->getParameterByUnits(NULL, NULL, ns1__getParameterByUnits_,
+    return this->getParameterByUnits(nullptr, nullptr,
+                                     ns1__getParameterByUnits_,
                                      ns1__getParameterByUnitsResponse_);
   }
   virtual int getParameterByUnits(
@@ -1678,7 +1698,7 @@ public:
       ns1__searchDatasetByParameterRestrictionResponse *
           ns1__searchDatasetByParameterRestrictionResponse_) {
     return this->searchDatasetByParameterRestriction(
-        NULL, NULL, ns1__searchDatasetByParameterRestriction_,
+        nullptr, nullptr, ns1__searchDatasetByParameterRestriction_,
         ns1__searchDatasetByParameterRestrictionResponse_);
   }
   virtual int searchDatasetByParameterRestriction(
@@ -1696,7 +1716,7 @@ public:
       ns1__searchSampleByParameterRestrictionResponse *
           ns1__searchSampleByParameterRestrictionResponse_) {
     return this->searchSampleByParameterRestriction(
-        NULL, NULL, ns1__searchSampleByParameterRestriction_,
+        nullptr, nullptr, ns1__searchSampleByParameterRestriction_,
         ns1__searchSampleByParameterRestrictionResponse_);
   }
   virtual int searchSampleByParameterRestriction(
@@ -1714,7 +1734,7 @@ public:
       ns1__searchDatafileByParameterRestrictionResponse *
           ns1__searchDatafileByParameterRestrictionResponse_) {
     return this->searchDatafileByParameterRestriction(
-        NULL, NULL, ns1__searchDatafileByParameterRestriction_,
+        nullptr, nullptr, ns1__searchDatafileByParameterRestriction_,
         ns1__searchDatafileByParameterRestrictionResponse_);
   }
   virtual int searchDatafileByParameterRestriction(
@@ -1732,7 +1752,7 @@ public:
       ns1__searchInvestigationByParameterRestrictionResponse *
           ns1__searchInvestigationByParameterRestrictionResponse_) {
     return this->searchInvestigationByParameterRestriction(
-        NULL, NULL, ns1__searchInvestigationByParameterRestriction_,
+        nullptr, nullptr, ns1__searchInvestigationByParameterRestriction_,
         ns1__searchInvestigationByParameterRestrictionResponse_);
   }
   virtual int searchInvestigationByParameterRestriction(
@@ -1750,7 +1770,7 @@ public:
       ns1__searchInvestigationByRestrictionResponse *
           ns1__searchInvestigationByRestrictionResponse_) {
     return this->searchInvestigationByRestriction(
-        NULL, NULL, ns1__searchInvestigationByRestriction_,
+        nullptr, nullptr, ns1__searchInvestigationByRestriction_,
         ns1__searchInvestigationByRestrictionResponse_);
   }
   virtual int searchInvestigationByRestriction(
@@ -1767,7 +1787,7 @@ public:
       ns1__searchDatasetByRestrictionResponse *
           ns1__searchDatasetByRestrictionResponse_) {
     return this->searchDatasetByRestriction(
-        NULL, NULL, ns1__searchDatasetByRestriction_,
+        nullptr, nullptr, ns1__searchDatasetByRestriction_,
         ns1__searchDatasetByRestrictionResponse_);
   }
   virtual int searchDatasetByRestriction(
@@ -1783,7 +1803,7 @@ public:
       ns1__searchDatafileByRestrictionResponse *
           ns1__searchDatafileByRestrictionResponse_) {
     return this->searchDatafileByRestriction(
-        NULL, NULL, ns1__searchDatafileByRestriction_,
+        nullptr, nullptr, ns1__searchDatafileByRestriction_,
         ns1__searchDatafileByRestrictionResponse_);
   }
   virtual int searchDatafileByRestriction(
@@ -1799,7 +1819,7 @@ public:
       ns1__searchSampleByRestrictionResponse *
           ns1__searchSampleByRestrictionResponse_) {
     return this->searchSampleByRestriction(
-        NULL, NULL, ns1__searchSampleByRestriction_,
+        nullptr, nullptr, ns1__searchSampleByRestriction_,
         ns1__searchSampleByRestrictionResponse_);
   }
   virtual int searchSampleByRestriction(
@@ -1816,7 +1836,7 @@ public:
       ns1__searchInvestigationByRestrictionComparasionResponse *
           ns1__searchInvestigationByRestrictionComparasionResponse_) {
     return this->searchInvestigationByRestrictionComparasion(
-        NULL, NULL, ns1__searchInvestigationByRestrictionComparasion_,
+        nullptr, nullptr, ns1__searchInvestigationByRestrictionComparasion_,
         ns1__searchInvestigationByRestrictionComparasionResponse_);
   }
   virtual int searchInvestigationByRestrictionComparasion(
@@ -1834,7 +1854,7 @@ public:
       ns1__searchDatasetByRestrictionComparisonResponse *
           ns1__searchDatasetByRestrictionComparisonResponse_) {
     return this->searchDatasetByRestrictionComparison(
-        NULL, NULL, ns1__searchDatasetByRestrictionComparison_,
+        nullptr, nullptr, ns1__searchDatasetByRestrictionComparison_,
         ns1__searchDatasetByRestrictionComparisonResponse_);
   }
   virtual int searchDatasetByRestrictionComparison(
@@ -1852,7 +1872,7 @@ public:
       ns1__searchDatafileByRestrictionComparisonResponse *
           ns1__searchDatafileByRestrictionComparisonResponse_) {
     return this->searchDatafileByRestrictionComparison(
-        NULL, NULL, ns1__searchDatafileByRestrictionComparison_,
+        nullptr, nullptr, ns1__searchDatafileByRestrictionComparison_,
         ns1__searchDatafileByRestrictionComparisonResponse_);
   }
   virtual int searchDatafileByRestrictionComparison(
@@ -1870,7 +1890,7 @@ public:
       ns1__searchSampleByRestrictionComparisonResponse *
           ns1__searchSampleByRestrictionComparisonResponse_) {
     return this->searchSampleByRestrictionComparison(
-        NULL, NULL, ns1__searchSampleByRestrictionComparison_,
+        nullptr, nullptr, ns1__searchSampleByRestrictionComparison_,
         ns1__searchSampleByRestrictionComparisonResponse_);
   }
   virtual int searchSampleByRestrictionComparison(
@@ -1888,7 +1908,7 @@ public:
       ns1__searchSampleByRestrictionLogicalResponse *
           ns1__searchSampleByRestrictionLogicalResponse_) {
     return this->searchSampleByRestrictionLogical(
-        NULL, NULL, ns1__searchSampleByRestrictionLogical_,
+        nullptr, nullptr, ns1__searchSampleByRestrictionLogical_,
         ns1__searchSampleByRestrictionLogicalResponse_);
   }
   virtual int searchSampleByRestrictionLogical(
@@ -1906,7 +1926,7 @@ public:
       ns1__searchDatasetByRestrictionLogicalResponse *
           ns1__searchDatasetByRestrictionLogicalResponse_) {
     return this->searchDatasetByRestrictionLogical(
-        NULL, NULL, ns1__searchDatasetByRestrictionLogical_,
+        nullptr, nullptr, ns1__searchDatasetByRestrictionLogical_,
         ns1__searchDatasetByRestrictionLogicalResponse_);
   }
   virtual int searchDatasetByRestrictionLogical(
@@ -1924,7 +1944,7 @@ public:
       ns1__searchInvestigationByRestrictionLogicalResponse *
           ns1__searchInvestigationByRestrictionLogicalResponse_) {
     return this->searchInvestigationByRestrictionLogical(
-        NULL, NULL, ns1__searchInvestigationByRestrictionLogical_,
+        nullptr, nullptr, ns1__searchInvestigationByRestrictionLogical_,
         ns1__searchInvestigationByRestrictionLogicalResponse_);
   }
   virtual int searchInvestigationByRestrictionLogical(
@@ -1942,7 +1962,7 @@ public:
       ns1__searchDatafileByRestrictionLogicalResponse *
           ns1__searchDatafileByRestrictionLogicalResponse_) {
     return this->searchDatafileByRestrictionLogical(
-        NULL, NULL, ns1__searchDatafileByRestrictionLogical_,
+        nullptr, nullptr, ns1__searchDatafileByRestrictionLogical_,
         ns1__searchDatafileByRestrictionLogicalResponse_);
   }
   virtual int searchDatafileByRestrictionLogical(
@@ -1960,7 +1980,7 @@ public:
       ns1__searchInvestigationByParameterLogicalResponse *
           ns1__searchInvestigationByParameterLogicalResponse_) {
     return this->searchInvestigationByParameterLogical(
-        NULL, NULL, ns1__searchInvestigationByParameterLogical_,
+        nullptr, nullptr, ns1__searchInvestigationByParameterLogical_,
         ns1__searchInvestigationByParameterLogicalResponse_);
   }
   virtual int searchInvestigationByParameterLogical(
@@ -1978,7 +1998,7 @@ public:
       ns1__searchDatafileByParameterLogicalResponse *
           ns1__searchDatafileByParameterLogicalResponse_) {
     return this->searchDatafileByParameterLogical(
-        NULL, NULL, ns1__searchDatafileByParameterLogical_,
+        nullptr, nullptr, ns1__searchDatafileByParameterLogical_,
         ns1__searchDatafileByParameterLogicalResponse_);
   }
   virtual int searchDatafileByParameterLogical(
@@ -1996,7 +2016,7 @@ public:
       ns1__searchDatasetByParameterLogicalResponse *
           ns1__searchDatasetByParameterLogicalResponse_) {
     return this->searchDatasetByParameterLogical(
-        NULL, NULL, ns1__searchDatasetByParameterLogical_,
+        nullptr, nullptr, ns1__searchDatasetByParameterLogical_,
         ns1__searchDatasetByParameterLogicalResponse_);
   }
   virtual int searchDatasetByParameterLogical(
@@ -2013,7 +2033,7 @@ public:
       ns1__searchSampleByParameterLogicalResponse *
           ns1__searchSampleByParameterLogicalResponse_) {
     return this->searchSampleByParameterLogical(
-        NULL, NULL, ns1__searchSampleByParameterLogical_,
+        nullptr, nullptr, ns1__searchSampleByParameterLogical_,
         ns1__searchSampleByParameterLogicalResponse_);
   }
   virtual int searchSampleByParameterLogical(
@@ -2030,7 +2050,7 @@ public:
       ns1__searchFacilityUserByRestrictionResponse *
           ns1__searchFacilityUserByRestrictionResponse_) {
     return this->searchFacilityUserByRestriction(
-        NULL, NULL, ns1__searchFacilityUserByRestriction_,
+        nullptr, nullptr, ns1__searchFacilityUserByRestriction_,
         ns1__searchFacilityUserByRestrictionResponse_);
   }
   virtual int searchFacilityUserByRestriction(
diff --git a/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3Stub.h b/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3Stub.h
index 55b4342d456..687cc40cad3 100644
--- a/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3Stub.h
+++ b/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3Stub.h
@@ -291,7 +291,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  xsd__anyType() { xsd__anyType::soap_default(NULL); }
+  xsd__anyType() { xsd__anyType::soap_default(nullptr); }
   virtual ~xsd__anyType() = default;
 };
 #endif
@@ -313,7 +313,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  xsd__boolean() { xsd__boolean::soap_default(NULL); }
+  xsd__boolean() { xsd__boolean::soap_default(nullptr); }
   virtual ~xsd__boolean() = default;
 };
 #endif
@@ -335,7 +335,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  xsd__dateTime() { xsd__dateTime::soap_default(NULL); }
+  xsd__dateTime() { xsd__dateTime::soap_default(nullptr); }
   virtual ~xsd__dateTime() = default;
 };
 #endif
@@ -357,7 +357,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  xsd__double() { xsd__double::soap_default(NULL); }
+  xsd__double() { xsd__double::soap_default(nullptr); }
   virtual ~xsd__double() = default;
 };
 #endif
@@ -379,7 +379,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  xsd__float() { xsd__float::soap_default(NULL); }
+  xsd__float() { xsd__float::soap_default(nullptr); }
   virtual ~xsd__float() = default;
 };
 #endif
@@ -401,7 +401,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  xsd__int() { xsd__int::soap_default(NULL); }
+  xsd__int() { xsd__int::soap_default(nullptr); }
   virtual ~xsd__int() = default;
 };
 #endif
@@ -423,7 +423,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  xsd__long() { xsd__long::soap_default(NULL); }
+  xsd__long() { xsd__long::soap_default(nullptr); }
   virtual ~xsd__long() = default;
 };
 #endif
@@ -449,7 +449,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  xsd__string() { xsd__string::soap_default(NULL); }
+  xsd__string() { xsd__string::soap_default(nullptr); }
   virtual ~xsd__string() = default;
 };
 #endif
@@ -471,7 +471,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__logicalOperator_() { ns1__logicalOperator_::soap_default(NULL); }
+  ns1__logicalOperator_() { ns1__logicalOperator_::soap_default(nullptr); }
   virtual ~ns1__logicalOperator_() = default;
 };
 #endif
@@ -493,7 +493,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__datafileInclude_() { ns1__datafileInclude_::soap_default(NULL); }
+  ns1__datafileInclude_() { ns1__datafileInclude_::soap_default(nullptr); }
   virtual ~ns1__datafileInclude_() = default;
 };
 #endif
@@ -515,7 +515,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__datasetInclude_() { ns1__datasetInclude_::soap_default(NULL); }
+  ns1__datasetInclude_() { ns1__datasetInclude_::soap_default(nullptr); }
   virtual ~ns1__datasetInclude_() = default;
 };
 #endif
@@ -538,7 +538,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__investigationInclude_() {
-    ns1__investigationInclude_::soap_default(NULL);
+    ns1__investigationInclude_::soap_default(nullptr);
   }
   virtual ~ns1__investigationInclude_() = default;
 };
@@ -562,7 +562,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__restrictionAttributes_() {
-    ns1__restrictionAttributes_::soap_default(NULL);
+    ns1__restrictionAttributes_::soap_default(nullptr);
   }
   virtual ~ns1__restrictionAttributes_() = default;
 };
@@ -585,7 +585,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__sampleInclude_() { ns1__sampleInclude_::soap_default(NULL); }
+  ns1__sampleInclude_() { ns1__sampleInclude_::soap_default(nullptr); }
   virtual ~ns1__sampleInclude_() = default;
 };
 #endif
@@ -607,7 +607,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__parameterValueType_() { ns1__parameterValueType_::soap_default(NULL); }
+  ns1__parameterValueType_() {
+    ns1__parameterValueType_::soap_default(nullptr);
+  }
   virtual ~ns1__parameterValueType_() = default;
 };
 #endif
@@ -629,7 +631,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__comparisonOperator_() { ns1__comparisonOperator_::soap_default(NULL); }
+  ns1__comparisonOperator_() {
+    ns1__comparisonOperator_::soap_default(nullptr);
+  }
   virtual ~ns1__comparisonOperator_() = default;
 };
 #endif
@@ -651,7 +655,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__keywordType_() { ns1__keywordType_::soap_default(NULL); }
+  ns1__keywordType_() { ns1__keywordType_::soap_default(nullptr); }
   virtual ~ns1__keywordType_() = default;
 };
 #endif
@@ -673,7 +677,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__parameterType_() { ns1__parameterType_::soap_default(NULL); }
+  ns1__parameterType_() { ns1__parameterType_::soap_default(nullptr); }
   virtual ~ns1__parameterType_() = default;
 };
 #endif
@@ -695,7 +699,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__elementType_() { ns1__elementType_::soap_default(NULL); }
+  ns1__elementType_() { ns1__elementType_::soap_default(nullptr); }
   virtual ~ns1__elementType_() = default;
 };
 #endif
@@ -720,7 +724,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByRestrictionLogical() {
-    ns1__searchDatasetByRestrictionLogical::soap_default(NULL);
+    ns1__searchDatasetByRestrictionLogical::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByRestrictionLogical() = default;
 };
@@ -743,7 +747,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__condition() { ns1__condition::soap_default(NULL); }
+  ns1__condition() { ns1__condition::soap_default(nullptr); }
   virtual ~ns1__condition() = default;
 };
 #endif
@@ -772,7 +776,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByRestrictionLogicalResponse() {
-    ns1__searchDatasetByRestrictionLogicalResponse::soap_default(NULL);
+    ns1__searchDatasetByRestrictionLogicalResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByRestrictionLogicalResponse() = default;
 };
@@ -799,7 +803,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByParameterRestriction() {
-    ns1__searchDatasetByParameterRestriction::soap_default(NULL);
+    ns1__searchDatasetByParameterRestriction::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByParameterRestriction() = default;
 };
@@ -829,7 +833,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByParameterRestrictionResponse() {
-    ns1__searchDatasetByParameterRestrictionResponse::soap_default(NULL);
+    ns1__searchDatasetByParameterRestrictionResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByParameterRestrictionResponse() = default;
 };
@@ -851,7 +855,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__listDatasetTypes() { ns1__listDatasetTypes::soap_default(NULL); }
+  ns1__listDatasetTypes() { ns1__listDatasetTypes::soap_default(nullptr); }
   virtual ~ns1__listDatasetTypes() = default;
 };
 #endif
@@ -878,7 +882,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__listDatasetTypesResponse() {
-    ns1__listDatasetTypesResponse::soap_default(NULL);
+    ns1__listDatasetTypesResponse::soap_default(nullptr);
   }
   virtual ~ns1__listDatasetTypesResponse() = default;
 };
@@ -903,7 +907,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchFacilityUserByRestriction() {
-    ns1__searchFacilityUserByRestriction::soap_default(NULL);
+    ns1__searchFacilityUserByRestriction::soap_default(nullptr);
   }
   virtual ~ns1__searchFacilityUserByRestriction() = default;
 };
@@ -933,7 +937,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchFacilityUserByRestrictionResponse() {
-    ns1__searchFacilityUserByRestrictionResponse::soap_default(NULL);
+    ns1__searchFacilityUserByRestrictionResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchFacilityUserByRestrictionResponse() = default;
 };
@@ -958,7 +962,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__entityBaseBean() { ns1__entityBaseBean::soap_default(NULL); }
+  ns1__entityBaseBean() { ns1__entityBaseBean::soap_default(nullptr); }
   virtual ~ns1__entityBaseBean() = default;
 };
 #endif
@@ -981,7 +985,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSamplesBySampleName() {
-    ns1__searchSamplesBySampleName::soap_default(NULL);
+    ns1__searchSamplesBySampleName::soap_default(nullptr);
   }
   virtual ~ns1__searchSamplesBySampleName() = default;
 };
@@ -1009,7 +1013,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSamplesBySampleNameResponse() {
-    ns1__searchSamplesBySampleNameResponse::soap_default(NULL);
+    ns1__searchSamplesBySampleNameResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchSamplesBySampleNameResponse() = default;
 };
@@ -1030,7 +1034,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__entityPrimaryKeyBaseBean() {
-    ns1__entityPrimaryKeyBaseBean::soap_default(NULL);
+    ns1__entityPrimaryKeyBaseBean::soap_default(nullptr);
   }
   virtual ~ns1__entityPrimaryKeyBaseBean() = default;
 };
@@ -1056,7 +1060,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByRestrictionComparison() {
-    ns1__searchSampleByRestrictionComparison::soap_default(NULL);
+    ns1__searchSampleByRestrictionComparison::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByRestrictionComparison() = default;
 };
@@ -1086,7 +1090,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByRestrictionComparisonResponse() {
-    ns1__searchSampleByRestrictionComparisonResponse::soap_default(NULL);
+    ns1__searchSampleByRestrictionComparisonResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByRestrictionComparisonResponse() = default;
 };
@@ -1111,7 +1115,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByRestriction() {
-    ns1__searchDatafileByRestriction::soap_default(NULL);
+    ns1__searchDatafileByRestriction::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByRestriction() = default;
 };
@@ -1139,7 +1143,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByRestrictionResponse() {
-    ns1__searchDatafileByRestrictionResponse::soap_default(NULL);
+    ns1__searchDatafileByRestrictionResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByRestrictionResponse() = default;
 };
@@ -1161,7 +1165,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__listInstruments() { ns1__listInstruments::soap_default(NULL); }
+  ns1__listInstruments() { ns1__listInstruments::soap_default(nullptr); }
   virtual ~ns1__listInstruments() = default;
 };
 #endif
@@ -1188,7 +1192,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__listInstrumentsResponse() {
-    ns1__listInstrumentsResponse::soap_default(NULL);
+    ns1__listInstrumentsResponse::soap_default(nullptr);
   }
   virtual ~ns1__listInstrumentsResponse() = default;
 };
@@ -1211,7 +1215,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__removeSample() { ns1__removeSample::soap_default(NULL); }
+  ns1__removeSample() { ns1__removeSample::soap_default(nullptr); }
   virtual ~ns1__removeSample() = default;
 };
 #endif
@@ -1230,7 +1234,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__removeSampleResponse() { ns1__removeSampleResponse::soap_default(NULL); }
+  ns1__removeSampleResponse() {
+    ns1__removeSampleResponse::soap_default(nullptr);
+  }
   virtual ~ns1__removeSampleResponse() = default;
 };
 #endif
@@ -1254,7 +1260,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__InsufficientPrivilegesException() {
-    ns1__InsufficientPrivilegesException::soap_default(NULL);
+    ns1__InsufficientPrivilegesException::soap_default(nullptr);
   }
   virtual ~ns1__InsufficientPrivilegesException() = default;
 };
@@ -1278,7 +1284,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__createDataFile() { ns1__createDataFile::soap_default(NULL); }
+  ns1__createDataFile() { ns1__createDataFile::soap_default(nullptr); }
   virtual ~ns1__createDataFile() = default;
 };
 #endif
@@ -1305,7 +1311,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__createDataFileResponse() {
-    ns1__createDataFileResponse::soap_default(NULL);
+    ns1__createDataFileResponse::soap_default(nullptr);
   }
   virtual ~ns1__createDataFileResponse() = default;
 };
@@ -1328,7 +1334,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__modifySample() { ns1__modifySample::soap_default(NULL); }
+  ns1__modifySample() { ns1__modifySample::soap_default(nullptr); }
   virtual ~ns1__modifySample() = default;
 };
 #endif
@@ -1347,7 +1353,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__modifySampleResponse() { ns1__modifySampleResponse::soap_default(NULL); }
+  ns1__modifySampleResponse() {
+    ns1__modifySampleResponse::soap_default(nullptr);
+  }
   virtual ~ns1__modifySampleResponse() = default;
 };
 #endif
@@ -1373,7 +1381,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByParameterLogical() {
-    ns1__searchInvestigationByParameterLogical::soap_default(NULL);
+    ns1__searchInvestigationByParameterLogical::soap_default(nullptr);
   }
   virtual ~ns1__searchInvestigationByParameterLogical() = default;
 };
@@ -1403,7 +1411,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByParameterLogicalResponse() {
-    ns1__searchInvestigationByParameterLogicalResponse::soap_default(NULL);
+    ns1__searchInvestigationByParameterLogicalResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchInvestigationByParameterLogicalResponse() = default;
 };
@@ -1428,7 +1436,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getParameterByNameUnits() {
-    ns1__getParameterByNameUnits::soap_default(NULL);
+    ns1__getParameterByNameUnits::soap_default(nullptr);
   }
   virtual ~ns1__getParameterByNameUnits() = default;
 };
@@ -1456,7 +1464,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getParameterByNameUnitsResponse() {
-    ns1__getParameterByNameUnitsResponse::soap_default(NULL);
+    ns1__getParameterByNameUnitsResponse::soap_default(nullptr);
   }
   virtual ~ns1__getParameterByNameUnitsResponse() = default;
 };
@@ -1479,7 +1487,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__removeDataFile() { ns1__removeDataFile::soap_default(NULL); }
+  ns1__removeDataFile() { ns1__removeDataFile::soap_default(nullptr); }
   virtual ~ns1__removeDataFile() = default;
 };
 #endif
@@ -1499,7 +1507,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__removeDataFileResponse() {
-    ns1__removeDataFileResponse::soap_default(NULL);
+    ns1__removeDataFileResponse::soap_default(nullptr);
   }
   virtual ~ns1__removeDataFileResponse() = default;
 };
@@ -1522,7 +1530,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__removeAuthorisation() { ns1__removeAuthorisation::soap_default(NULL); }
+  ns1__removeAuthorisation() {
+    ns1__removeAuthorisation::soap_default(nullptr);
+  }
   virtual ~ns1__removeAuthorisation() = default;
 };
 #endif
@@ -1542,7 +1552,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__removeAuthorisationResponse() {
-    ns1__removeAuthorisationResponse::soap_default(NULL);
+    ns1__removeAuthorisationResponse::soap_default(nullptr);
   }
   virtual ~ns1__removeAuthorisationResponse() = default;
 };
@@ -1564,7 +1574,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__listFacilityCycles() { ns1__listFacilityCycles::soap_default(NULL); }
+  ns1__listFacilityCycles() { ns1__listFacilityCycles::soap_default(nullptr); }
   virtual ~ns1__listFacilityCycles() = default;
 };
 #endif
@@ -1591,7 +1601,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__listFacilityCyclesResponse() {
-    ns1__listFacilityCyclesResponse::soap_default(NULL);
+    ns1__listFacilityCyclesResponse::soap_default(nullptr);
   }
   virtual ~ns1__listFacilityCyclesResponse() = default;
 };
@@ -1617,7 +1627,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__addDataFileParameters() {
-    ns1__addDataFileParameters::soap_default(NULL);
+    ns1__addDataFileParameters::soap_default(nullptr);
   }
   virtual ~ns1__addDataFileParameters() = default;
 };
@@ -1645,7 +1655,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__addDataFileParametersResponse() {
-    ns1__addDataFileParametersResponse::soap_default(NULL);
+    ns1__addDataFileParametersResponse::soap_default(nullptr);
   }
   virtual ~ns1__addDataFileParametersResponse() = default;
 };
@@ -1667,7 +1677,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__logout() { ns1__logout::soap_default(NULL); }
+  ns1__logout() { ns1__logout::soap_default(nullptr); }
   virtual ~ns1__logout() = default;
 };
 #endif
@@ -1693,7 +1703,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__logoutResponse() { ns1__logoutResponse::soap_default(NULL); }
+  ns1__logoutResponse() { ns1__logoutResponse::soap_default(nullptr); }
   virtual ~ns1__logoutResponse() = default;
 };
 #endif
@@ -1715,7 +1725,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getInstrumentsWithData() {
-    ns1__getInstrumentsWithData::soap_default(NULL);
+    ns1__getInstrumentsWithData::soap_default(nullptr);
   }
   virtual ~ns1__getInstrumentsWithData() = default;
 };
@@ -1743,7 +1753,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getInstrumentsWithDataResponse() {
-    ns1__getInstrumentsWithDataResponse::soap_default(NULL);
+    ns1__getInstrumentsWithDataResponse::soap_default(nullptr);
   }
   virtual ~ns1__getInstrumentsWithDataResponse() = default;
 };
@@ -1766,7 +1776,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__downloadDataset() { ns1__downloadDataset::soap_default(NULL); }
+  ns1__downloadDataset() { ns1__downloadDataset::soap_default(nullptr); }
   virtual ~ns1__downloadDataset() = default;
 };
 #endif
@@ -1793,7 +1803,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__downloadDatasetResponse() {
-    ns1__downloadDatasetResponse::soap_default(NULL);
+    ns1__downloadDatasetResponse::soap_default(nullptr);
   }
   virtual ~ns1__downloadDatasetResponse() = default;
 };
@@ -1817,7 +1827,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getFacilityUserByFederalId() {
-    ns1__getFacilityUserByFederalId::soap_default(NULL);
+    ns1__getFacilityUserByFederalId::soap_default(nullptr);
   }
   virtual ~ns1__getFacilityUserByFederalId() = default;
 };
@@ -1845,7 +1855,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getFacilityUserByFederalIdResponse() {
-    ns1__getFacilityUserByFederalIdResponse::soap_default(NULL);
+    ns1__getFacilityUserByFederalIdResponse::soap_default(nullptr);
   }
   virtual ~ns1__getFacilityUserByFederalIdResponse() = default;
 };
@@ -1868,7 +1878,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__removeInvestigation() { ns1__removeInvestigation::soap_default(NULL); }
+  ns1__removeInvestigation() {
+    ns1__removeInvestigation::soap_default(nullptr);
+  }
   virtual ~ns1__removeInvestigation() = default;
 };
 #endif
@@ -1888,7 +1900,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__removeInvestigationResponse() {
-    ns1__removeInvestigationResponse::soap_default(NULL);
+    ns1__removeInvestigationResponse::soap_default(nullptr);
   }
   virtual ~ns1__removeInvestigationResponse() = default;
 };
@@ -1912,7 +1924,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__removeInvestigator() { ns1__removeInvestigator::soap_default(NULL); }
+  ns1__removeInvestigator() { ns1__removeInvestigator::soap_default(nullptr); }
   virtual ~ns1__removeInvestigator() = default;
 };
 #endif
@@ -1932,7 +1944,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__removeInvestigatorResponse() {
-    ns1__removeInvestigatorResponse::soap_default(NULL);
+    ns1__removeInvestigatorResponse::soap_default(nullptr);
   }
   virtual ~ns1__removeInvestigatorResponse() = default;
 };
@@ -1957,7 +1969,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getParameterByRestriction() {
-    ns1__getParameterByRestriction::soap_default(NULL);
+    ns1__getParameterByRestriction::soap_default(nullptr);
   }
   virtual ~ns1__getParameterByRestriction() = default;
 };
@@ -1985,7 +1997,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getParameterByRestrictionResponse() {
-    ns1__getParameterByRestrictionResponse::soap_default(NULL);
+    ns1__getParameterByRestrictionResponse::soap_default(nullptr);
   }
   virtual ~ns1__getParameterByRestrictionResponse() = default;
 };
@@ -2008,7 +2020,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__removeKeyword() { ns1__removeKeyword::soap_default(NULL); }
+  ns1__removeKeyword() { ns1__removeKeyword::soap_default(nullptr); }
   virtual ~ns1__removeKeyword() = default;
 };
 #endif
@@ -2028,7 +2040,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__removeKeywordResponse() {
-    ns1__removeKeywordResponse::soap_default(NULL);
+    ns1__removeKeywordResponse::soap_default(nullptr);
   }
   virtual ~ns1__removeKeywordResponse() = default;
 };
@@ -2051,7 +2063,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__deleteInvestigation() { ns1__deleteInvestigation::soap_default(NULL); }
+  ns1__deleteInvestigation() {
+    ns1__deleteInvestigation::soap_default(nullptr);
+  }
   virtual ~ns1__deleteInvestigation() = default;
 };
 #endif
@@ -2071,7 +2085,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__deleteInvestigationResponse() {
-    ns1__deleteInvestigationResponse::soap_default(NULL);
+    ns1__deleteInvestigationResponse::soap_default(nullptr);
   }
   virtual ~ns1__deleteInvestigationResponse() = default;
 };
@@ -2096,7 +2110,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__createDataSets() { ns1__createDataSets::soap_default(NULL); }
+  ns1__createDataSets() { ns1__createDataSets::soap_default(nullptr); }
   virtual ~ns1__createDataSets() = default;
 };
 #endif
@@ -2123,7 +2137,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__createDataSetsResponse() {
-    ns1__createDataSetsResponse::soap_default(NULL);
+    ns1__createDataSetsResponse::soap_default(nullptr);
   }
   virtual ~ns1__createDataSetsResponse() = default;
 };
@@ -2146,7 +2160,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__removePublication() { ns1__removePublication::soap_default(NULL); }
+  ns1__removePublication() { ns1__removePublication::soap_default(nullptr); }
   virtual ~ns1__removePublication() = default;
 };
 #endif
@@ -2166,7 +2180,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__removePublicationResponse() {
-    ns1__removePublicationResponse::soap_default(NULL);
+    ns1__removePublicationResponse::soap_default(nullptr);
   }
   virtual ~ns1__removePublicationResponse() = default;
 };
@@ -2189,7 +2203,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getAllKeywords() { ns1__getAllKeywords::soap_default(NULL); }
+  ns1__getAllKeywords() { ns1__getAllKeywords::soap_default(nullptr); }
   virtual ~ns1__getAllKeywords() = default;
 };
 #endif
@@ -2216,7 +2230,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getAllKeywordsResponse() {
-    ns1__getAllKeywordsResponse::soap_default(NULL);
+    ns1__getAllKeywordsResponse::soap_default(nullptr);
   }
   virtual ~ns1__getAllKeywordsResponse() = default;
 };
@@ -2243,7 +2257,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByRestrictionComparison() {
-    ns1__searchDatafileByRestrictionComparison::soap_default(NULL);
+    ns1__searchDatafileByRestrictionComparison::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByRestrictionComparison() = default;
 };
@@ -2273,7 +2287,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByRestrictionComparisonResponse() {
-    ns1__searchDatafileByRestrictionComparisonResponse::soap_default(NULL);
+    ns1__searchDatafileByRestrictionComparisonResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByRestrictionComparisonResponse() = default;
 };
@@ -2303,7 +2317,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__userDetails() { ns1__userDetails::soap_default(NULL); }
+  ns1__userDetails() { ns1__userDetails::soap_default(nullptr); }
   virtual ~ns1__userDetails() = default;
 };
 #endif
@@ -2327,7 +2341,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByParameter() {
-    ns1__searchDatafileByParameter::soap_default(NULL);
+    ns1__searchDatafileByParameter::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByParameter() = default;
 };
@@ -2355,7 +2369,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByParameterResponse() {
-    ns1__searchDatafileByParameterResponse::soap_default(NULL);
+    ns1__searchDatafileByParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByParameterResponse() = default;
 };
@@ -2382,7 +2396,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByParameterCondition() {
-    ns1__searchInvestigationByParameterCondition::soap_default(NULL);
+    ns1__searchInvestigationByParameterCondition::soap_default(nullptr);
   }
   virtual ~ns1__searchInvestigationByParameterCondition() = default;
 };
@@ -2413,7 +2427,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByParameterConditionResponse() {
-    ns1__searchInvestigationByParameterConditionResponse::soap_default(NULL);
+    ns1__searchInvestigationByParameterConditionResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchInvestigationByParameterConditionResponse() = default;
 };
@@ -2436,7 +2450,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__downloadDatafiles() { ns1__downloadDatafiles::soap_default(NULL); }
+  ns1__downloadDatafiles() { ns1__downloadDatafiles::soap_default(nullptr); }
   virtual ~ns1__downloadDatafiles() = default;
 };
 #endif
@@ -2463,7 +2477,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__downloadDatafilesResponse() {
-    ns1__downloadDatafilesResponse::soap_default(NULL);
+    ns1__downloadDatafilesResponse::soap_default(nullptr);
   }
   virtual ~ns1__downloadDatafilesResponse() = default;
 };
@@ -2488,7 +2502,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByRestriction() {
-    ns1__searchSampleByRestriction::soap_default(NULL);
+    ns1__searchSampleByRestriction::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByRestriction() = default;
 };
@@ -2516,7 +2530,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByRestrictionResponse() {
-    ns1__searchSampleByRestrictionResponse::soap_default(NULL);
+    ns1__searchSampleByRestrictionResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByRestrictionResponse() = default;
 };
@@ -2542,7 +2556,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByParameterComparison() {
-    ns1__searchDatasetByParameterComparison::soap_default(NULL);
+    ns1__searchDatasetByParameterComparison::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByParameterComparison() = default;
 };
@@ -2572,7 +2586,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByParameterComparisonResponse() {
-    ns1__searchDatasetByParameterComparisonResponse::soap_default(NULL);
+    ns1__searchDatasetByParameterComparisonResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByParameterComparisonResponse() = default;
 };
@@ -2595,7 +2609,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__modifyDataSet() { ns1__modifyDataSet::soap_default(NULL); }
+  ns1__modifyDataSet() { ns1__modifyDataSet::soap_default(nullptr); }
   virtual ~ns1__modifyDataSet() = default;
 };
 #endif
@@ -2615,7 +2629,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__modifyDataSetResponse() {
-    ns1__modifyDataSetResponse::soap_default(NULL);
+    ns1__modifyDataSetResponse::soap_default(nullptr);
   }
   virtual ~ns1__modifyDataSetResponse() = default;
 };
@@ -2640,7 +2654,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__addSampleParameter() { ns1__addSampleParameter::soap_default(NULL); }
+  ns1__addSampleParameter() { ns1__addSampleParameter::soap_default(nullptr); }
   virtual ~ns1__addSampleParameter() = default;
 };
 #endif
@@ -2667,7 +2681,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__addSampleParameterResponse() {
-    ns1__addSampleParameterResponse::soap_default(NULL);
+    ns1__addSampleParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__addSampleParameterResponse() = default;
 };
@@ -2693,7 +2707,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getFacilityCyclesWithDataForInstrument() {
-    ns1__getFacilityCyclesWithDataForInstrument::soap_default(NULL);
+    ns1__getFacilityCyclesWithDataForInstrument::soap_default(nullptr);
   }
   virtual ~ns1__getFacilityCyclesWithDataForInstrument() = default;
 };
@@ -2724,7 +2738,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getFacilityCyclesWithDataForInstrumentResponse() {
-    ns1__getFacilityCyclesWithDataForInstrumentResponse::soap_default(NULL);
+    ns1__getFacilityCyclesWithDataForInstrumentResponse::soap_default(nullptr);
   }
   virtual ~ns1__getFacilityCyclesWithDataForInstrumentResponse() = default;
 };
@@ -2748,7 +2762,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getFacilityUserByFacilityUserId() {
-    ns1__getFacilityUserByFacilityUserId::soap_default(NULL);
+    ns1__getFacilityUserByFacilityUserId::soap_default(nullptr);
   }
   virtual ~ns1__getFacilityUserByFacilityUserId() = default;
 };
@@ -2778,7 +2792,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getFacilityUserByFacilityUserIdResponse() {
-    ns1__getFacilityUserByFacilityUserIdResponse::soap_default(NULL);
+    ns1__getFacilityUserByFacilityUserIdResponse::soap_default(nullptr);
   }
   virtual ~ns1__getFacilityUserByFacilityUserIdResponse() = default;
 };
@@ -2802,7 +2816,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__checkDatafileDownloadAccess() {
-    ns1__checkDatafileDownloadAccess::soap_default(NULL);
+    ns1__checkDatafileDownloadAccess::soap_default(nullptr);
   }
   virtual ~ns1__checkDatafileDownloadAccess() = default;
 };
@@ -2830,7 +2844,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__checkDatafileDownloadAccessResponse() {
-    ns1__checkDatafileDownloadAccessResponse::soap_default(NULL);
+    ns1__checkDatafileDownloadAccessResponse::soap_default(nullptr);
   }
   virtual ~ns1__checkDatafileDownloadAccessResponse() = default;
 };
@@ -2857,7 +2871,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__downloadInfo() { ns1__downloadInfo::soap_default(NULL); }
+  ns1__downloadInfo() { ns1__downloadInfo::soap_default(nullptr); }
   virtual ~ns1__downloadInfo() = default;
 };
 #endif
@@ -2879,7 +2893,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__deleteDataFile() { ns1__deleteDataFile::soap_default(NULL); }
+  ns1__deleteDataFile() { ns1__deleteDataFile::soap_default(nullptr); }
   virtual ~ns1__deleteDataFile() = default;
 };
 #endif
@@ -2899,7 +2913,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__deleteDataFileResponse() {
-    ns1__deleteDataFileResponse::soap_default(NULL);
+    ns1__deleteDataFileResponse::soap_default(nullptr);
   }
   virtual ~ns1__deleteDataFileResponse() = default;
 };
@@ -2922,7 +2936,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__searchByUserSurname() { ns1__searchByUserSurname::soap_default(NULL); }
+  ns1__searchByUserSurname() {
+    ns1__searchByUserSurname::soap_default(nullptr);
+  }
   virtual ~ns1__searchByUserSurname() = default;
 };
 #endif
@@ -2949,7 +2965,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchByUserSurnameResponse() {
-    ns1__searchByUserSurnameResponse::soap_default(NULL);
+    ns1__searchByUserSurnameResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchByUserSurnameResponse() = default;
 };
@@ -2975,7 +2991,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchByUserSurnamePagination() {
-    ns1__searchByUserSurnamePagination::soap_default(NULL);
+    ns1__searchByUserSurnamePagination::soap_default(nullptr);
   }
   virtual ~ns1__searchByUserSurnamePagination() = default;
 };
@@ -3004,7 +3020,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchByUserSurnamePaginationResponse() {
-    ns1__searchByUserSurnamePaginationResponse::soap_default(NULL);
+    ns1__searchByUserSurnamePaginationResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchByUserSurnamePaginationResponse() = default;
 };
@@ -3029,7 +3045,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByParameterCondition() {
-    ns1__searchDatafileByParameterCondition::soap_default(NULL);
+    ns1__searchDatafileByParameterCondition::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByParameterCondition() = default;
 };
@@ -3059,7 +3075,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByParameterConditionResponse() {
-    ns1__searchDatafileByParameterConditionResponse::soap_default(NULL);
+    ns1__searchDatafileByParameterConditionResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByParameterConditionResponse() = default;
 };
@@ -3083,7 +3099,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__checkDatasetDownloadAccess() {
-    ns1__checkDatasetDownloadAccess::soap_default(NULL);
+    ns1__checkDatasetDownloadAccess::soap_default(nullptr);
   }
   virtual ~ns1__checkDatasetDownloadAccess() = default;
 };
@@ -3111,7 +3127,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__checkDatasetDownloadAccessResponse() {
-    ns1__checkDatasetDownloadAccessResponse::soap_default(NULL);
+    ns1__checkDatasetDownloadAccessResponse::soap_default(nullptr);
   }
   virtual ~ns1__checkDatasetDownloadAccessResponse() = default;
 };
@@ -3134,7 +3150,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__searchByKeywords() { ns1__searchByKeywords::soap_default(NULL); }
+  ns1__searchByKeywords() { ns1__searchByKeywords::soap_default(nullptr); }
   virtual ~ns1__searchByKeywords() = default;
 };
 #endif
@@ -3161,7 +3177,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchByKeywordsResponse() {
-    ns1__searchByKeywordsResponse::soap_default(NULL);
+    ns1__searchByKeywordsResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchByKeywordsResponse() = default;
 };
@@ -3187,7 +3203,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__searchByKeywordsAll() { ns1__searchByKeywordsAll::soap_default(NULL); }
+  ns1__searchByKeywordsAll() {
+    ns1__searchByKeywordsAll::soap_default(nullptr);
+  }
   virtual ~ns1__searchByKeywordsAll() = default;
 };
 #endif
@@ -3212,7 +3230,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__keywordDetails() { ns1__keywordDetails::soap_default(NULL); }
+  ns1__keywordDetails() { ns1__keywordDetails::soap_default(nullptr); }
   virtual ~ns1__keywordDetails() = default;
 };
 #endif
@@ -3239,7 +3257,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchByKeywordsAllResponse() {
-    ns1__searchByKeywordsAllResponse::soap_default(NULL);
+    ns1__searchByKeywordsAllResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchByKeywordsAllResponse() = default;
 };
@@ -3261,7 +3279,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getAllInstruments() { ns1__getAllInstruments::soap_default(NULL); }
+  ns1__getAllInstruments() { ns1__getAllInstruments::soap_default(nullptr); }
   virtual ~ns1__getAllInstruments() = default;
 };
 #endif
@@ -3288,7 +3306,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getAllInstrumentsResponse() {
-    ns1__getAllInstrumentsResponse::soap_default(NULL);
+    ns1__getAllInstrumentsResponse::soap_default(nullptr);
   }
   virtual ~ns1__getAllInstrumentsResponse() = default;
 };
@@ -3314,7 +3332,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByRestrictionLogical() {
-    ns1__searchDatafileByRestrictionLogical::soap_default(NULL);
+    ns1__searchDatafileByRestrictionLogical::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByRestrictionLogical() = default;
 };
@@ -3344,7 +3362,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByRestrictionLogicalResponse() {
-    ns1__searchDatafileByRestrictionLogicalResponse::soap_default(NULL);
+    ns1__searchDatafileByRestrictionLogicalResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByRestrictionLogicalResponse() = default;
 };
@@ -3366,7 +3384,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getMyInvestigations() { ns1__getMyInvestigations::soap_default(NULL); }
+  ns1__getMyInvestigations() {
+    ns1__getMyInvestigations::soap_default(nullptr);
+  }
   virtual ~ns1__getMyInvestigations() = default;
 };
 #endif
@@ -3393,7 +3413,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getMyInvestigationsResponse() {
-    ns1__getMyInvestigationsResponse::soap_default(NULL);
+    ns1__getMyInvestigationsResponse::soap_default(nullptr);
   }
   virtual ~ns1__getMyInvestigationsResponse() = default;
 };
@@ -3419,7 +3439,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getMyInvestigationsIncludes() {
-    ns1__getMyInvestigationsIncludes::soap_default(NULL);
+    ns1__getMyInvestigationsIncludes::soap_default(nullptr);
   }
   virtual ~ns1__getMyInvestigationsIncludes() = default;
 };
@@ -3447,7 +3467,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getMyInvestigationsIncludesResponse() {
-    ns1__getMyInvestigationsIncludesResponse::soap_default(NULL);
+    ns1__getMyInvestigationsIncludesResponse::soap_default(nullptr);
   }
   virtual ~ns1__getMyInvestigationsIncludesResponse() = default;
 };
@@ -3476,7 +3496,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getMyInvestigationsIncludesPagination() {
-    ns1__getMyInvestigationsIncludesPagination::soap_default(NULL);
+    ns1__getMyInvestigationsIncludesPagination::soap_default(nullptr);
   }
   virtual ~ns1__getMyInvestigationsIncludesPagination() = default;
 };
@@ -3506,7 +3526,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getMyInvestigationsIncludesPaginationResponse() {
-    ns1__getMyInvestigationsIncludesPaginationResponse::soap_default(NULL);
+    ns1__getMyInvestigationsIncludesPaginationResponse::soap_default(nullptr);
   }
   virtual ~ns1__getMyInvestigationsIncludesPaginationResponse() = default;
 };
@@ -3533,7 +3553,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByParameterRestriction() {
-    ns1__searchSampleByParameterRestriction::soap_default(NULL);
+    ns1__searchSampleByParameterRestriction::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByParameterRestriction() = default;
 };
@@ -3563,7 +3583,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByParameterRestrictionResponse() {
-    ns1__searchSampleByParameterRestrictionResponse::soap_default(NULL);
+    ns1__searchSampleByParameterRestrictionResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByParameterRestrictionResponse() = default;
 };
@@ -3588,7 +3608,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__removeDataSetParameter() {
-    ns1__removeDataSetParameter::soap_default(NULL);
+    ns1__removeDataSetParameter::soap_default(nullptr);
   }
   virtual ~ns1__removeDataSetParameter() = default;
 };
@@ -3609,7 +3629,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__removeDataSetParameterResponse() {
-    ns1__removeDataSetParameterResponse::soap_default(NULL);
+    ns1__removeDataSetParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__removeDataSetParameterResponse() = default;
 };
@@ -3634,7 +3654,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByParameterCondition() {
-    ns1__searchSampleByParameterCondition::soap_default(NULL);
+    ns1__searchSampleByParameterCondition::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByParameterCondition() = default;
 };
@@ -3664,7 +3684,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByParameterConditionResponse() {
-    ns1__searchSampleByParameterConditionResponse::soap_default(NULL);
+    ns1__searchSampleByParameterConditionResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByParameterConditionResponse() = default;
 };
@@ -3693,7 +3713,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByParameterRestriction() {
-    ns1__searchInvestigationByParameterRestriction::soap_default(NULL);
+    ns1__searchInvestigationByParameterRestriction::soap_default(nullptr);
   }
   virtual ~ns1__searchInvestigationByParameterRestriction() = default;
 };
@@ -3724,7 +3744,8 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByParameterRestrictionResponse() {
-    ns1__searchInvestigationByParameterRestrictionResponse::soap_default(NULL);
+    ns1__searchInvestigationByParameterRestrictionResponse::soap_default(
+        nullptr);
   }
   virtual ~ns1__searchInvestigationByParameterRestrictionResponse() = default;
 };
@@ -3748,7 +3769,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__modifyPublication() { ns1__modifyPublication::soap_default(NULL); }
+  ns1__modifyPublication() { ns1__modifyPublication::soap_default(nullptr); }
   virtual ~ns1__modifyPublication() = default;
 };
 #endif
@@ -3768,7 +3789,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__modifyPublicationResponse() {
-    ns1__modifyPublicationResponse::soap_default(NULL);
+    ns1__modifyPublicationResponse::soap_default(nullptr);
   }
   virtual ~ns1__modifyPublicationResponse() = default;
 };
@@ -3791,7 +3812,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__searchByUserID() { ns1__searchByUserID::soap_default(NULL); }
+  ns1__searchByUserID() { ns1__searchByUserID::soap_default(nullptr); }
   virtual ~ns1__searchByUserID() = default;
 };
 #endif
@@ -3818,7 +3839,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchByUserIDResponse() {
-    ns1__searchByUserIDResponse::soap_default(NULL);
+    ns1__searchByUserIDResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchByUserIDResponse() = default;
 };
@@ -3844,7 +3865,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchByUserIDPagination() {
-    ns1__searchByUserIDPagination::soap_default(NULL);
+    ns1__searchByUserIDPagination::soap_default(nullptr);
   }
   virtual ~ns1__searchByUserIDPagination() = default;
 };
@@ -3872,7 +3893,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchByUserIDPaginationResponse() {
-    ns1__searchByUserIDPaginationResponse::soap_default(NULL);
+    ns1__searchByUserIDPaginationResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchByUserIDPaginationResponse() = default;
 };
@@ -3898,7 +3919,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByParameterLogical() {
-    ns1__searchDatasetByParameterLogical::soap_default(NULL);
+    ns1__searchDatasetByParameterLogical::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByParameterLogical() = default;
 };
@@ -3928,7 +3949,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByParameterLogicalResponse() {
-    ns1__searchDatasetByParameterLogicalResponse::soap_default(NULL);
+    ns1__searchDatasetByParameterLogicalResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByParameterLogicalResponse() = default;
 };
@@ -3954,7 +3975,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__removeDataFileParameter() {
-    ns1__removeDataFileParameter::soap_default(NULL);
+    ns1__removeDataFileParameter::soap_default(nullptr);
   }
   virtual ~ns1__removeDataFileParameter() = default;
 };
@@ -3975,7 +3996,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__removeDataFileParameterResponse() {
-    ns1__removeDataFileParameterResponse::soap_default(NULL);
+    ns1__removeDataFileParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__removeDataFileParameterResponse() = default;
 };
@@ -4000,7 +4021,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByParameterCondition() {
-    ns1__searchDatasetByParameterCondition::soap_default(NULL);
+    ns1__searchDatasetByParameterCondition::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByParameterCondition() = default;
 };
@@ -4030,7 +4051,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByParameterConditionResponse() {
-    ns1__searchDatasetByParameterConditionResponse::soap_default(NULL);
+    ns1__searchDatasetByParameterConditionResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByParameterConditionResponse() = default;
 };
@@ -4055,7 +4076,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByParameter() {
-    ns1__searchSampleByParameter::soap_default(NULL);
+    ns1__searchSampleByParameter::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByParameter() = default;
 };
@@ -4083,7 +4104,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByParameterResponse() {
-    ns1__searchSampleByParameterResponse::soap_default(NULL);
+    ns1__searchSampleByParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByParameterResponse() = default;
 };
@@ -4110,7 +4131,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getInvestigationsIncludes() {
-    ns1__getInvestigationsIncludes::soap_default(NULL);
+    ns1__getInvestigationsIncludes::soap_default(nullptr);
   }
   virtual ~ns1__getInvestigationsIncludes() = default;
 };
@@ -4138,7 +4159,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getInvestigationsIncludesResponse() {
-    ns1__getInvestigationsIncludesResponse::soap_default(NULL);
+    ns1__getInvestigationsIncludesResponse::soap_default(nullptr);
   }
   virtual ~ns1__getInvestigationsIncludesResponse() = default;
 };
@@ -4161,7 +4182,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getInvestigations() { ns1__getInvestigations::soap_default(NULL); }
+  ns1__getInvestigations() { ns1__getInvestigations::soap_default(nullptr); }
   virtual ~ns1__getInvestigations() = default;
 };
 #endif
@@ -4188,7 +4209,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getInvestigationsResponse() {
-    ns1__getInvestigationsResponse::soap_default(NULL);
+    ns1__getInvestigationsResponse::soap_default(nullptr);
   }
   virtual ~ns1__getInvestigationsResponse() = default;
 };
@@ -4211,7 +4232,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__deleteDataSet() { ns1__deleteDataSet::soap_default(NULL); }
+  ns1__deleteDataSet() { ns1__deleteDataSet::soap_default(nullptr); }
   virtual ~ns1__deleteDataSet() = default;
 };
 #endif
@@ -4231,7 +4252,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__deleteDataSetResponse() {
-    ns1__deleteDataSetResponse::soap_default(NULL);
+    ns1__deleteDataSetResponse::soap_default(nullptr);
   }
   virtual ~ns1__deleteDataSetResponse() = default;
 };
@@ -4259,7 +4280,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByParameterComparison() {
-    ns1__searchInvestigationByParameterComparison::soap_default(NULL);
+    ns1__searchInvestigationByParameterComparison::soap_default(nullptr);
   }
   virtual ~ns1__searchInvestigationByParameterComparison() = default;
 };
@@ -4290,7 +4311,8 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByParameterComparisonResponse() {
-    ns1__searchInvestigationByParameterComparisonResponse::soap_default(NULL);
+    ns1__searchInvestigationByParameterComparisonResponse::soap_default(
+        nullptr);
   }
   virtual ~ns1__searchInvestigationByParameterComparisonResponse() = default;
 };
@@ -4312,7 +4334,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__isSessionValid() { ns1__isSessionValid::soap_default(NULL); }
+  ns1__isSessionValid() { ns1__isSessionValid::soap_default(nullptr); }
   virtual ~ns1__isSessionValid() = default;
 };
 #endif
@@ -4339,7 +4361,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__isSessionValidResponse() {
-    ns1__isSessionValidResponse::soap_default(NULL);
+    ns1__isSessionValidResponse::soap_default(nullptr);
   }
   virtual ~ns1__isSessionValidResponse() = default;
 };
@@ -4362,7 +4384,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getDatafiles() { ns1__getDatafiles::soap_default(NULL); }
+  ns1__getDatafiles() { ns1__getDatafiles::soap_default(nullptr); }
   virtual ~ns1__getDatafiles() = default;
 };
 #endif
@@ -4388,7 +4410,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getDatafilesResponse() { ns1__getDatafilesResponse::soap_default(NULL); }
+  ns1__getDatafilesResponse() {
+    ns1__getDatafilesResponse::soap_default(nullptr);
+  }
   virtual ~ns1__getDatafilesResponse() = default;
 };
 #endif
@@ -4409,7 +4433,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getICATAPIVersion() { ns1__getICATAPIVersion::soap_default(NULL); }
+  ns1__getICATAPIVersion() { ns1__getICATAPIVersion::soap_default(nullptr); }
   virtual ~ns1__getICATAPIVersion() = default;
 };
 #endif
@@ -4436,7 +4460,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getICATAPIVersionResponse() {
-    ns1__getICATAPIVersionResponse::soap_default(NULL);
+    ns1__getICATAPIVersionResponse::soap_default(nullptr);
   }
   virtual ~ns1__getICATAPIVersionResponse() = default;
 };
@@ -4461,7 +4485,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByRestriction() {
-    ns1__searchInvestigationByRestriction::soap_default(NULL);
+    ns1__searchInvestigationByRestriction::soap_default(nullptr);
   }
   virtual ~ns1__searchInvestigationByRestriction() = default;
 };
@@ -4491,7 +4515,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByRestrictionResponse() {
-    ns1__searchInvestigationByRestrictionResponse::soap_default(NULL);
+    ns1__searchInvestigationByRestrictionResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchInvestigationByRestrictionResponse() = default;
 };
@@ -4515,7 +4539,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__deleteInvestigator() { ns1__deleteInvestigator::soap_default(NULL); }
+  ns1__deleteInvestigator() { ns1__deleteInvestigator::soap_default(nullptr); }
   virtual ~ns1__deleteInvestigator() = default;
 };
 #endif
@@ -4535,7 +4559,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__deleteInvestigatorResponse() {
-    ns1__deleteInvestigatorResponse::soap_default(NULL);
+    ns1__deleteInvestigatorResponse::soap_default(nullptr);
   }
   virtual ~ns1__deleteInvestigatorResponse() = default;
 };
@@ -4560,7 +4584,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__addInvestigator() { ns1__addInvestigator::soap_default(NULL); }
+  ns1__addInvestigator() { ns1__addInvestigator::soap_default(nullptr); }
   virtual ~ns1__addInvestigator() = default;
 };
 #endif
@@ -4587,7 +4611,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__addInvestigatorResponse() {
-    ns1__addInvestigatorResponse::soap_default(NULL);
+    ns1__addInvestigatorResponse::soap_default(nullptr);
   }
   virtual ~ns1__addInvestigatorResponse() = default;
 };
@@ -4613,7 +4637,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByParameterLogical() {
-    ns1__searchDatafileByParameterLogical::soap_default(NULL);
+    ns1__searchDatafileByParameterLogical::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByParameterLogical() = default;
 };
@@ -4643,7 +4667,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByParameterLogicalResponse() {
-    ns1__searchDatafileByParameterLogicalResponse::soap_default(NULL);
+    ns1__searchDatafileByParameterLogicalResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByParameterLogicalResponse() = default;
 };
@@ -4667,7 +4691,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__createDataSet() { ns1__createDataSet::soap_default(NULL); }
+  ns1__createDataSet() { ns1__createDataSet::soap_default(nullptr); }
   virtual ~ns1__createDataSet() = default;
 };
 #endif
@@ -4694,7 +4718,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__createDataSetResponse() {
-    ns1__createDataSetResponse::soap_default(NULL);
+    ns1__createDataSetResponse::soap_default(nullptr);
   }
   virtual ~ns1__createDataSetResponse() = default;
 };
@@ -4722,7 +4746,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByParameterRestriction() {
-    ns1__searchDatafileByParameterRestriction::soap_default(NULL);
+    ns1__searchDatafileByParameterRestriction::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByParameterRestriction() = default;
 };
@@ -4752,7 +4776,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByParameterRestrictionResponse() {
-    ns1__searchDatafileByParameterRestrictionResponse::soap_default(NULL);
+    ns1__searchDatafileByParameterRestrictionResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByParameterRestrictionResponse() = default;
 };
@@ -4780,7 +4804,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByRestrictionLogical() {
-    ns1__searchInvestigationByRestrictionLogical::soap_default(NULL);
+    ns1__searchInvestigationByRestrictionLogical::soap_default(nullptr);
   }
   virtual ~ns1__searchInvestigationByRestrictionLogical() = default;
 };
@@ -4811,7 +4835,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByRestrictionLogicalResponse() {
-    ns1__searchInvestigationByRestrictionLogicalResponse::soap_default(NULL);
+    ns1__searchInvestigationByRestrictionLogicalResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchInvestigationByRestrictionLogicalResponse() = default;
 };
@@ -4836,7 +4860,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__removeSampleParameter() {
-    ns1__removeSampleParameter::soap_default(NULL);
+    ns1__removeSampleParameter::soap_default(nullptr);
   }
   virtual ~ns1__removeSampleParameter() = default;
 };
@@ -4857,7 +4881,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__removeSampleParameterResponse() {
-    ns1__removeSampleParameterResponse::soap_default(NULL);
+    ns1__removeSampleParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__removeSampleParameterResponse() = default;
 };
@@ -4882,7 +4906,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__deleteDataSetParameter() {
-    ns1__deleteDataSetParameter::soap_default(NULL);
+    ns1__deleteDataSetParameter::soap_default(nullptr);
   }
   virtual ~ns1__deleteDataSetParameter() = default;
 };
@@ -4903,7 +4927,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__deleteDataSetParameterResponse() {
-    ns1__deleteDataSetParameterResponse::soap_default(NULL);
+    ns1__deleteDataSetParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__deleteDataSetParameterResponse() = default;
 };
@@ -4927,7 +4951,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__setDataSetSample() { ns1__setDataSetSample::soap_default(NULL); }
+  ns1__setDataSetSample() { ns1__setDataSetSample::soap_default(nullptr); }
   virtual ~ns1__setDataSetSample() = default;
 };
 #endif
@@ -4947,7 +4971,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__setDataSetSampleResponse() {
-    ns1__setDataSetSampleResponse::soap_default(NULL);
+    ns1__setDataSetSampleResponse::soap_default(nullptr);
   }
   virtual ~ns1__setDataSetSampleResponse() = default;
 };
@@ -4970,7 +4994,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__downloadDatafile() { ns1__downloadDatafile::soap_default(NULL); }
+  ns1__downloadDatafile() { ns1__downloadDatafile::soap_default(nullptr); }
   virtual ~ns1__downloadDatafile() = default;
 };
 #endif
@@ -4997,7 +5021,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__downloadDatafileResponse() {
-    ns1__downloadDatafileResponse::soap_default(NULL);
+    ns1__downloadDatafileResponse::soap_default(nullptr);
   }
   virtual ~ns1__downloadDatafileResponse() = default;
 };
@@ -5020,7 +5044,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getParameterByName() { ns1__getParameterByName::soap_default(NULL); }
+  ns1__getParameterByName() { ns1__getParameterByName::soap_default(nullptr); }
   virtual ~ns1__getParameterByName() = default;
 };
 #endif
@@ -5047,7 +5071,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getParameterByNameResponse() {
-    ns1__getParameterByNameResponse::soap_default(NULL);
+    ns1__getParameterByNameResponse::soap_default(nullptr);
   }
   virtual ~ns1__getParameterByNameResponse() = default;
 };
@@ -5072,7 +5096,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getKeywordsForUserType() {
-    ns1__getKeywordsForUserType::soap_default(NULL);
+    ns1__getKeywordsForUserType::soap_default(nullptr);
   }
   virtual ~ns1__getKeywordsForUserType() = default;
 };
@@ -5100,7 +5124,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getKeywordsForUserTypeResponse() {
-    ns1__getKeywordsForUserTypeResponse::soap_default(NULL);
+    ns1__getKeywordsForUserTypeResponse::soap_default(nullptr);
   }
   virtual ~ns1__getKeywordsForUserTypeResponse() = default;
 };
@@ -5124,7 +5148,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getKeywordsForUserMax() {
-    ns1__getKeywordsForUserMax::soap_default(NULL);
+    ns1__getKeywordsForUserMax::soap_default(nullptr);
   }
   virtual ~ns1__getKeywordsForUserMax() = default;
 };
@@ -5152,7 +5176,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getKeywordsForUserMaxResponse() {
-    ns1__getKeywordsForUserMaxResponse::soap_default(NULL);
+    ns1__getKeywordsForUserMaxResponse::soap_default(nullptr);
   }
   virtual ~ns1__getKeywordsForUserMaxResponse() = default;
 };
@@ -5177,7 +5201,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getKeywordsForUserStartWithMax() {
-    ns1__getKeywordsForUserStartWithMax::soap_default(NULL);
+    ns1__getKeywordsForUserStartWithMax::soap_default(nullptr);
   }
   virtual ~ns1__getKeywordsForUserStartWithMax() = default;
 };
@@ -5207,7 +5231,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getKeywordsForUserStartWithMaxResponse() {
-    ns1__getKeywordsForUserStartWithMaxResponse::soap_default(NULL);
+    ns1__getKeywordsForUserStartWithMaxResponse::soap_default(nullptr);
   }
   virtual ~ns1__getKeywordsForUserStartWithMaxResponse() = default;
 };
@@ -5229,7 +5253,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getKeywordsForUser() { ns1__getKeywordsForUser::soap_default(NULL); }
+  ns1__getKeywordsForUser() { ns1__getKeywordsForUser::soap_default(nullptr); }
   virtual ~ns1__getKeywordsForUser() = default;
 };
 #endif
@@ -5256,7 +5280,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getKeywordsForUserResponse() {
-    ns1__getKeywordsForUserResponse::soap_default(NULL);
+    ns1__getKeywordsForUserResponse::soap_default(nullptr);
   }
   virtual ~ns1__getKeywordsForUserResponse() = default;
 };
@@ -5279,7 +5303,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__listInvestigationTypes() {
-    ns1__listInvestigationTypes::soap_default(NULL);
+    ns1__listInvestigationTypes::soap_default(nullptr);
   }
   virtual ~ns1__listInvestigationTypes() = default;
 };
@@ -5307,7 +5331,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__listInvestigationTypesResponse() {
-    ns1__listInvestigationTypesResponse::soap_default(NULL);
+    ns1__listInvestigationTypesResponse::soap_default(nullptr);
   }
   virtual ~ns1__listInvestigationTypesResponse() = default;
 };
@@ -5332,7 +5356,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__modifyDataSetParameter() {
-    ns1__modifyDataSetParameter::soap_default(NULL);
+    ns1__modifyDataSetParameter::soap_default(nullptr);
   }
   virtual ~ns1__modifyDataSetParameter() = default;
 };
@@ -5353,7 +5377,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__modifyDataSetParameterResponse() {
-    ns1__modifyDataSetParameterResponse::soap_default(NULL);
+    ns1__modifyDataSetParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__modifyDataSetParameterResponse() = default;
 };
@@ -5376,7 +5400,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__removeDataSet() { ns1__removeDataSet::soap_default(NULL); }
+  ns1__removeDataSet() { ns1__removeDataSet::soap_default(nullptr); }
   virtual ~ns1__removeDataSet() = default;
 };
 #endif
@@ -5396,7 +5420,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__removeDataSetResponse() {
-    ns1__removeDataSetResponse::soap_default(NULL);
+    ns1__removeDataSetResponse::soap_default(nullptr);
   }
   virtual ~ns1__removeDataSetResponse() = default;
 };
@@ -5422,7 +5446,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByParameterLogical() {
-    ns1__searchSampleByParameterLogical::soap_default(NULL);
+    ns1__searchSampleByParameterLogical::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByParameterLogical() = default;
 };
@@ -5452,7 +5476,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByParameterLogicalResponse() {
-    ns1__searchSampleByParameterLogicalResponse::soap_default(NULL);
+    ns1__searchSampleByParameterLogicalResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByParameterLogicalResponse() = default;
 };
@@ -5479,7 +5503,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByRestrictionComparison() {
-    ns1__searchDatasetByRestrictionComparison::soap_default(NULL);
+    ns1__searchDatasetByRestrictionComparison::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByRestrictionComparison() = default;
 };
@@ -5509,7 +5533,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByRestrictionComparisonResponse() {
-    ns1__searchDatasetByRestrictionComparisonResponse::soap_default(NULL);
+    ns1__searchDatasetByRestrictionComparisonResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByRestrictionComparisonResponse() = default;
 };
@@ -5533,7 +5557,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__addKeyword() { ns1__addKeyword::soap_default(NULL); }
+  ns1__addKeyword() { ns1__addKeyword::soap_default(nullptr); }
   virtual ~ns1__addKeyword() = default;
 };
 #endif
@@ -5559,7 +5583,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__addKeywordResponse() { ns1__addKeywordResponse::soap_default(NULL); }
+  ns1__addKeywordResponse() { ns1__addKeywordResponse::soap_default(nullptr); }
   virtual ~ns1__addKeywordResponse() = default;
 };
 #endif
@@ -5583,7 +5607,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getAuthorisations() { ns1__getAuthorisations::soap_default(NULL); }
+  ns1__getAuthorisations() { ns1__getAuthorisations::soap_default(nullptr); }
   virtual ~ns1__getAuthorisations() = default;
 };
 #endif
@@ -5610,7 +5634,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getAuthorisationsResponse() {
-    ns1__getAuthorisationsResponse::soap_default(NULL);
+    ns1__getAuthorisationsResponse::soap_default(nullptr);
   }
   virtual ~ns1__getAuthorisationsResponse() = default;
 };
@@ -5634,7 +5658,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__modifyInvestigation() { ns1__modifyInvestigation::soap_default(NULL); }
+  ns1__modifyInvestigation() {
+    ns1__modifyInvestigation::soap_default(nullptr);
+  }
   virtual ~ns1__modifyInvestigation() = default;
 };
 #endif
@@ -5654,7 +5680,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__modifyInvestigationResponse() {
-    ns1__modifyInvestigationResponse::soap_default(NULL);
+    ns1__modifyInvestigationResponse::soap_default(nullptr);
   }
   virtual ~ns1__modifyInvestigationResponse() = default;
 };
@@ -5676,7 +5702,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__listDatasetStatus() { ns1__listDatasetStatus::soap_default(NULL); }
+  ns1__listDatasetStatus() { ns1__listDatasetStatus::soap_default(nullptr); }
   virtual ~ns1__listDatasetStatus() = default;
 };
 #endif
@@ -5703,7 +5729,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__listDatasetStatusResponse() {
-    ns1__listDatasetStatusResponse::soap_default(NULL);
+    ns1__listDatasetStatusResponse::soap_default(nullptr);
   }
   virtual ~ns1__listDatasetStatusResponse() = default;
 };
@@ -5726,7 +5752,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__deleteSample() { ns1__deleteSample::soap_default(NULL); }
+  ns1__deleteSample() { ns1__deleteSample::soap_default(nullptr); }
   virtual ~ns1__deleteSample() = default;
 };
 #endif
@@ -5745,7 +5771,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__deleteSampleResponse() { ns1__deleteSampleResponse::soap_default(NULL); }
+  ns1__deleteSampleResponse() {
+    ns1__deleteSampleResponse::soap_default(nullptr);
+  }
   virtual ~ns1__deleteSampleResponse() = default;
 };
 #endif
@@ -5769,7 +5797,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByParameter() {
-    ns1__searchDatasetByParameter::soap_default(NULL);
+    ns1__searchDatasetByParameter::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByParameter() = default;
 };
@@ -5797,7 +5825,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByParameterResponse() {
-    ns1__searchDatasetByParameterResponse::soap_default(NULL);
+    ns1__searchDatasetByParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByParameterResponse() = default;
 };
@@ -5820,7 +5848,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__deleteKeyword() { ns1__deleteKeyword::soap_default(NULL); }
+  ns1__deleteKeyword() { ns1__deleteKeyword::soap_default(nullptr); }
   virtual ~ns1__deleteKeyword() = default;
 };
 #endif
@@ -5840,7 +5868,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__deleteKeywordResponse() {
-    ns1__deleteKeywordResponse::soap_default(NULL);
+    ns1__deleteKeywordResponse::soap_default(nullptr);
   }
   virtual ~ns1__deleteKeywordResponse() = default;
 };
@@ -5865,7 +5893,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__addDataSetParameters() { ns1__addDataSetParameters::soap_default(NULL); }
+  ns1__addDataSetParameters() {
+    ns1__addDataSetParameters::soap_default(nullptr);
+  }
   virtual ~ns1__addDataSetParameters() = default;
 };
 #endif
@@ -5892,7 +5922,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__addDataSetParametersResponse() {
-    ns1__addDataSetParametersResponse::soap_default(NULL);
+    ns1__addDataSetParametersResponse::soap_default(nullptr);
   }
   virtual ~ns1__addDataSetParametersResponse() = default;
 };
@@ -5921,7 +5951,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchByRunNumberPagination() {
-    ns1__searchByRunNumberPagination::soap_default(NULL);
+    ns1__searchByRunNumberPagination::soap_default(nullptr);
   }
   virtual ~ns1__searchByRunNumberPagination() = default;
 };
@@ -5949,7 +5979,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchByRunNumberPaginationResponse() {
-    ns1__searchByRunNumberPaginationResponse::soap_default(NULL);
+    ns1__searchByRunNumberPaginationResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchByRunNumberPaginationResponse() = default;
 };
@@ -5975,7 +6005,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__searchByRunNumber() { ns1__searchByRunNumber::soap_default(NULL); }
+  ns1__searchByRunNumber() { ns1__searchByRunNumber::soap_default(nullptr); }
   virtual ~ns1__searchByRunNumber() = default;
 };
 #endif
@@ -6002,7 +6032,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchByRunNumberResponse() {
-    ns1__searchByRunNumberResponse::soap_default(NULL);
+    ns1__searchByRunNumberResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchByRunNumberResponse() = default;
 };
@@ -6028,7 +6058,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByParameterComparison() {
-    ns1__searchDatafileByParameterComparison::soap_default(NULL);
+    ns1__searchDatafileByParameterComparison::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByParameterComparison() = default;
 };
@@ -6058,7 +6088,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatafileByParameterComparisonResponse() {
-    ns1__searchDatafileByParameterComparisonResponse::soap_default(NULL);
+    ns1__searchDatafileByParameterComparisonResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatafileByParameterComparisonResponse() = default;
 };
@@ -6086,7 +6116,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchByAdvancedPagination() {
-    ns1__searchByAdvancedPagination::soap_default(NULL);
+    ns1__searchByAdvancedPagination::soap_default(nullptr);
   }
   virtual ~ns1__searchByAdvancedPagination() = default;
 };
@@ -6131,7 +6161,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__advancedSearchDetails() {
-    ns1__advancedSearchDetails::soap_default(NULL);
+    ns1__advancedSearchDetails::soap_default(nullptr);
   }
   virtual ~ns1__advancedSearchDetails() = default;
 };
@@ -6159,7 +6189,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchByAdvancedPaginationResponse() {
-    ns1__searchByAdvancedPaginationResponse::soap_default(NULL);
+    ns1__searchByAdvancedPaginationResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchByAdvancedPaginationResponse() = default;
 };
@@ -6184,7 +6214,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__searchByAdvanced() { ns1__searchByAdvanced::soap_default(NULL); }
+  ns1__searchByAdvanced() { ns1__searchByAdvanced::soap_default(nullptr); }
   virtual ~ns1__searchByAdvanced() = default;
 };
 #endif
@@ -6211,7 +6241,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchByAdvancedResponse() {
-    ns1__searchByAdvancedResponse::soap_default(NULL);
+    ns1__searchByAdvancedResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchByAdvancedResponse() = default;
 };
@@ -6236,7 +6266,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByParameter() {
-    ns1__searchInvestigationByParameter::soap_default(NULL);
+    ns1__searchInvestigationByParameter::soap_default(nullptr);
   }
   virtual ~ns1__searchInvestigationByParameter() = default;
 };
@@ -6266,7 +6296,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByParameterResponse() {
-    ns1__searchInvestigationByParameterResponse::soap_default(NULL);
+    ns1__searchInvestigationByParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchInvestigationByParameterResponse() = default;
 };
@@ -6288,7 +6318,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__listDatafileFormats() { ns1__listDatafileFormats::soap_default(NULL); }
+  ns1__listDatafileFormats() {
+    ns1__listDatafileFormats::soap_default(nullptr);
+  }
   virtual ~ns1__listDatafileFormats() = default;
 };
 #endif
@@ -6315,7 +6347,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__listDatafileFormatsResponse() {
-    ns1__listDatafileFormatsResponse::soap_default(NULL);
+    ns1__listDatafileFormatsResponse::soap_default(nullptr);
   }
   virtual ~ns1__listDatafileFormatsResponse() = default;
 };
@@ -6340,7 +6372,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__modifySampleParameter() {
-    ns1__modifySampleParameter::soap_default(NULL);
+    ns1__modifySampleParameter::soap_default(nullptr);
   }
   virtual ~ns1__modifySampleParameter() = default;
 };
@@ -6361,7 +6393,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__modifySampleParameterResponse() {
-    ns1__modifySampleParameterResponse::soap_default(NULL);
+    ns1__modifySampleParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__modifySampleParameterResponse() = default;
 };
@@ -6385,7 +6417,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__modifyInvestigator() { ns1__modifyInvestigator::soap_default(NULL); }
+  ns1__modifyInvestigator() { ns1__modifyInvestigator::soap_default(nullptr); }
   virtual ~ns1__modifyInvestigator() = default;
 };
 #endif
@@ -6405,7 +6437,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__modifyInvestigatorResponse() {
-    ns1__modifyInvestigatorResponse::soap_default(NULL);
+    ns1__modifyInvestigatorResponse::soap_default(nullptr);
   }
   virtual ~ns1__modifyInvestigatorResponse() = default;
 };
@@ -6430,7 +6462,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__addDataSetParameter() { ns1__addDataSetParameter::soap_default(NULL); }
+  ns1__addDataSetParameter() {
+    ns1__addDataSetParameter::soap_default(nullptr);
+  }
   virtual ~ns1__addDataSetParameter() = default;
 };
 #endif
@@ -6457,7 +6491,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__addDataSetParameterResponse() {
-    ns1__addDataSetParameterResponse::soap_default(NULL);
+    ns1__addDataSetParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__addDataSetParameterResponse() = default;
 };
@@ -6482,7 +6516,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__createDataFiles() { ns1__createDataFiles::soap_default(NULL); }
+  ns1__createDataFiles() { ns1__createDataFiles::soap_default(nullptr); }
   virtual ~ns1__createDataFiles() = default;
 };
 #endif
@@ -6509,7 +6543,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__createDataFilesResponse() {
-    ns1__createDataFilesResponse::soap_default(NULL);
+    ns1__createDataFilesResponse::soap_default(nullptr);
   }
   virtual ~ns1__createDataFilesResponse() = default;
 };
@@ -6536,7 +6570,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__addAuthorisation() { ns1__addAuthorisation::soap_default(NULL); }
+  ns1__addAuthorisation() { ns1__addAuthorisation::soap_default(nullptr); }
   virtual ~ns1__addAuthorisation() = default;
 };
 #endif
@@ -6563,7 +6597,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__addAuthorisationResponse() {
-    ns1__addAuthorisationResponse::soap_default(NULL);
+    ns1__addAuthorisationResponse::soap_default(nullptr);
   }
   virtual ~ns1__addAuthorisationResponse() = default;
 };
@@ -6587,7 +6621,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__addSample() { ns1__addSample::soap_default(NULL); }
+  ns1__addSample() { ns1__addSample::soap_default(nullptr); }
   virtual ~ns1__addSample() = default;
 };
 #endif
@@ -6613,7 +6647,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__addSampleResponse() { ns1__addSampleResponse::soap_default(NULL); }
+  ns1__addSampleResponse() { ns1__addSampleResponse::soap_default(nullptr); }
   virtual ~ns1__addSampleResponse() = default;
 };
 #endif
@@ -6635,7 +6669,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getParameterByUnits() { ns1__getParameterByUnits::soap_default(NULL); }
+  ns1__getParameterByUnits() {
+    ns1__getParameterByUnits::soap_default(nullptr);
+  }
   virtual ~ns1__getParameterByUnits() = default;
 };
 #endif
@@ -6662,7 +6698,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getParameterByUnitsResponse() {
-    ns1__getParameterByUnitsResponse::soap_default(NULL);
+    ns1__getParameterByUnitsResponse::soap_default(nullptr);
   }
   virtual ~ns1__getParameterByUnitsResponse() = default;
 };
@@ -6686,7 +6722,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__loginLifetime() { ns1__loginLifetime::soap_default(NULL); }
+  ns1__loginLifetime() { ns1__loginLifetime::soap_default(nullptr); }
   virtual ~ns1__loginLifetime() = default;
 };
 #endif
@@ -6713,7 +6749,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__loginLifetimeResponse() {
-    ns1__loginLifetimeResponse::soap_default(NULL);
+    ns1__loginLifetimeResponse::soap_default(nullptr);
   }
   virtual ~ns1__loginLifetimeResponse() = default;
 };
@@ -6736,7 +6772,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__login() { ns1__login::soap_default(NULL); }
+  ns1__login() { ns1__login::soap_default(nullptr); }
   virtual ~ns1__login() = default;
 };
 #endif
@@ -6762,7 +6798,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__loginResponse() { ns1__loginResponse::soap_default(NULL); }
+  ns1__loginResponse() { ns1__loginResponse::soap_default(nullptr); }
   virtual ~ns1__loginResponse() = default;
 };
 #endif
@@ -6784,7 +6820,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__deletePublication() { ns1__deletePublication::soap_default(NULL); }
+  ns1__deletePublication() { ns1__deletePublication::soap_default(nullptr); }
   virtual ~ns1__deletePublication() = default;
 };
 #endif
@@ -6804,7 +6840,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__deletePublicationResponse() {
-    ns1__deletePublicationResponse::soap_default(NULL);
+    ns1__deletePublicationResponse::soap_default(nullptr);
   }
   virtual ~ns1__deletePublicationResponse() = default;
 };
@@ -6827,7 +6863,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__deleteAuthorisation() { ns1__deleteAuthorisation::soap_default(NULL); }
+  ns1__deleteAuthorisation() {
+    ns1__deleteAuthorisation::soap_default(nullptr);
+  }
   virtual ~ns1__deleteAuthorisation() = default;
 };
 #endif
@@ -6847,7 +6885,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__deleteAuthorisationResponse() {
-    ns1__deleteAuthorisationResponse::soap_default(NULL);
+    ns1__deleteAuthorisationResponse::soap_default(nullptr);
   }
   virtual ~ns1__deleteAuthorisationResponse() = default;
 };
@@ -6870,7 +6908,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getDataset() { ns1__getDataset::soap_default(NULL); }
+  ns1__getDataset() { ns1__getDataset::soap_default(nullptr); }
   virtual ~ns1__getDataset() = default;
 };
 #endif
@@ -6896,7 +6934,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getDatasetResponse() { ns1__getDatasetResponse::soap_default(NULL); }
+  ns1__getDatasetResponse() { ns1__getDatasetResponse::soap_default(nullptr); }
   virtual ~ns1__getDatasetResponse() = default;
 };
 #endif
@@ -6920,7 +6958,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getDatasetIncludes() { ns1__getDatasetIncludes::soap_default(NULL); }
+  ns1__getDatasetIncludes() { ns1__getDatasetIncludes::soap_default(nullptr); }
   virtual ~ns1__getDatasetIncludes() = default;
 };
 #endif
@@ -6947,7 +6985,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getDatasetIncludesResponse() {
-    ns1__getDatasetIncludesResponse::soap_default(NULL);
+    ns1__getDatasetIncludesResponse::soap_default(nullptr);
   }
   virtual ~ns1__getDatasetIncludesResponse() = default;
 };
@@ -6971,7 +7009,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__updateAuthorisation() { ns1__updateAuthorisation::soap_default(NULL); }
+  ns1__updateAuthorisation() {
+    ns1__updateAuthorisation::soap_default(nullptr);
+  }
   virtual ~ns1__updateAuthorisation() = default;
 };
 #endif
@@ -6991,7 +7031,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__updateAuthorisationResponse() {
-    ns1__updateAuthorisationResponse::soap_default(NULL);
+    ns1__updateAuthorisationResponse::soap_default(nullptr);
   }
   virtual ~ns1__updateAuthorisationResponse() = default;
 };
@@ -7013,7 +7053,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__listRoles() { ns1__listRoles::soap_default(NULL); }
+  ns1__listRoles() { ns1__listRoles::soap_default(nullptr); }
   virtual ~ns1__listRoles() = default;
 };
 #endif
@@ -7039,7 +7079,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__listRolesResponse() { ns1__listRolesResponse::soap_default(NULL); }
+  ns1__listRolesResponse() { ns1__listRolesResponse::soap_default(nullptr); }
   virtual ~ns1__listRolesResponse() = default;
 };
 #endif
@@ -7063,7 +7103,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByRestriction() {
-    ns1__searchDatasetByRestriction::soap_default(NULL);
+    ns1__searchDatasetByRestriction::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByRestriction() = default;
 };
@@ -7091,7 +7131,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetByRestrictionResponse() {
-    ns1__searchDatasetByRestrictionResponse::soap_default(NULL);
+    ns1__searchDatasetByRestrictionResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetByRestrictionResponse() = default;
 };
@@ -7114,7 +7154,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__ingestMetadata() { ns1__ingestMetadata::soap_default(NULL); }
+  ns1__ingestMetadata() { ns1__ingestMetadata::soap_default(nullptr); }
   virtual ~ns1__ingestMetadata() = default;
 };
 #endif
@@ -7141,7 +7181,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__ingestMetadataResponse() {
-    ns1__ingestMetadataResponse::soap_default(NULL);
+    ns1__ingestMetadataResponse::soap_default(nullptr);
   }
   virtual ~ns1__ingestMetadataResponse() = default;
 };
@@ -7165,7 +7205,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__ICATAPIException() { ns1__ICATAPIException::soap_default(NULL); }
+  ns1__ICATAPIException() { ns1__ICATAPIException::soap_default(nullptr); }
   virtual ~ns1__ICATAPIException() = default;
 };
 #endif
@@ -7187,7 +7227,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getDatafile() { ns1__getDatafile::soap_default(NULL); }
+  ns1__getDatafile() { ns1__getDatafile::soap_default(nullptr); }
   virtual ~ns1__getDatafile() = default;
 };
 #endif
@@ -7213,7 +7253,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getDatafileResponse() { ns1__getDatafileResponse::soap_default(NULL); }
+  ns1__getDatafileResponse() {
+    ns1__getDatafileResponse::soap_default(nullptr);
+  }
   virtual ~ns1__getDatafileResponse() = default;
 };
 #endif
@@ -7235,7 +7277,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__modifyDataFile() { ns1__modifyDataFile::soap_default(NULL); }
+  ns1__modifyDataFile() { ns1__modifyDataFile::soap_default(nullptr); }
   virtual ~ns1__modifyDataFile() = default;
 };
 #endif
@@ -7255,7 +7297,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__modifyDataFileResponse() {
-    ns1__modifyDataFileResponse::soap_default(NULL);
+    ns1__modifyDataFileResponse::soap_default(nullptr);
   }
   virtual ~ns1__modifyDataFileResponse() = default;
 };
@@ -7282,7 +7324,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getInvestigationIncludes() {
-    ns1__getInvestigationIncludes::soap_default(NULL);
+    ns1__getInvestigationIncludes::soap_default(nullptr);
   }
   virtual ~ns1__getInvestigationIncludes() = default;
 };
@@ -7310,7 +7352,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getInvestigationIncludesResponse() {
-    ns1__getInvestigationIncludesResponse::soap_default(NULL);
+    ns1__getInvestigationIncludesResponse::soap_default(nullptr);
   }
   virtual ~ns1__getInvestigationIncludesResponse() = default;
 };
@@ -7333,7 +7375,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getInvestigation() { ns1__getInvestigation::soap_default(NULL); }
+  ns1__getInvestigation() { ns1__getInvestigation::soap_default(nullptr); }
   virtual ~ns1__getInvestigation() = default;
 };
 #endif
@@ -7360,7 +7402,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__getInvestigationResponse() {
-    ns1__getInvestigationResponse::soap_default(NULL);
+    ns1__getInvestigationResponse::soap_default(nullptr);
   }
   virtual ~ns1__getInvestigationResponse() = default;
 };
@@ -7385,7 +7427,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__deleteDataFileParameter() {
-    ns1__deleteDataFileParameter::soap_default(NULL);
+    ns1__deleteDataFileParameter::soap_default(nullptr);
   }
   virtual ~ns1__deleteDataFileParameter() = default;
 };
@@ -7406,7 +7448,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__deleteDataFileParameterResponse() {
-    ns1__deleteDataFileParameterResponse::soap_default(NULL);
+    ns1__deleteDataFileParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__deleteDataFileParameterResponse() = default;
 };
@@ -7430,7 +7472,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__addPublication() { ns1__addPublication::soap_default(NULL); }
+  ns1__addPublication() { ns1__addPublication::soap_default(nullptr); }
   virtual ~ns1__addPublication() = default;
 };
 #endif
@@ -7457,7 +7499,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__addPublicationResponse() {
-    ns1__addPublicationResponse::soap_default(NULL);
+    ns1__addPublicationResponse::soap_default(nullptr);
   }
   virtual ~ns1__addPublicationResponse() = default;
 };
@@ -7481,7 +7523,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__createInvestigation() { ns1__createInvestigation::soap_default(NULL); }
+  ns1__createInvestigation() {
+    ns1__createInvestigation::soap_default(nullptr);
+  }
   virtual ~ns1__createInvestigation() = default;
 };
 #endif
@@ -7508,7 +7552,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__createInvestigationResponse() {
-    ns1__createInvestigationResponse::soap_default(NULL);
+    ns1__createInvestigationResponse::soap_default(nullptr);
   }
   virtual ~ns1__createInvestigationResponse() = default;
 };
@@ -7532,7 +7576,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetsBySample() {
-    ns1__searchDatasetsBySample::soap_default(NULL);
+    ns1__searchDatasetsBySample::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetsBySample() = default;
 };
@@ -7560,7 +7604,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchDatasetsBySampleResponse() {
-    ns1__searchDatasetsBySampleResponse::soap_default(NULL);
+    ns1__searchDatasetsBySampleResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchDatasetsBySampleResponse() = default;
 };
@@ -7585,7 +7629,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__addDataFileParameter() { ns1__addDataFileParameter::soap_default(NULL); }
+  ns1__addDataFileParameter() {
+    ns1__addDataFileParameter::soap_default(nullptr);
+  }
   virtual ~ns1__addDataFileParameter() = default;
 };
 #endif
@@ -7612,7 +7658,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__addDataFileParameterResponse() {
-    ns1__addDataFileParameterResponse::soap_default(NULL);
+    ns1__addDataFileParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__addDataFileParameterResponse() = default;
 };
@@ -7638,7 +7684,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByRestrictionLogical() {
-    ns1__searchSampleByRestrictionLogical::soap_default(NULL);
+    ns1__searchSampleByRestrictionLogical::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByRestrictionLogical() = default;
 };
@@ -7668,7 +7714,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByRestrictionLogicalResponse() {
-    ns1__searchSampleByRestrictionLogicalResponse::soap_default(NULL);
+    ns1__searchSampleByRestrictionLogicalResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByRestrictionLogicalResponse() = default;
 };
@@ -7693,7 +7739,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__deleteSampleParameter() {
-    ns1__deleteSampleParameter::soap_default(NULL);
+    ns1__deleteSampleParameter::soap_default(nullptr);
   }
   virtual ~ns1__deleteSampleParameter() = default;
 };
@@ -7714,7 +7760,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__deleteSampleParameterResponse() {
-    ns1__deleteSampleParameterResponse::soap_default(NULL);
+    ns1__deleteSampleParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__deleteSampleParameterResponse() = default;
 };
@@ -7740,7 +7786,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByParameterComparison() {
-    ns1__searchSampleByParameterComparison::soap_default(NULL);
+    ns1__searchSampleByParameterComparison::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByParameterComparison() = default;
 };
@@ -7770,7 +7816,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchSampleByParameterComparisonResponse() {
-    ns1__searchSampleByParameterComparisonResponse::soap_default(NULL);
+    ns1__searchSampleByParameterComparisonResponse::soap_default(nullptr);
   }
   virtual ~ns1__searchSampleByParameterComparisonResponse() = default;
 };
@@ -7792,7 +7838,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__listParameters() { ns1__listParameters::soap_default(NULL); }
+  ns1__listParameters() { ns1__listParameters::soap_default(nullptr); }
   virtual ~ns1__listParameters() = default;
 };
 #endif
@@ -7819,7 +7865,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__listParametersResponse() {
-    ns1__listParametersResponse::soap_default(NULL);
+    ns1__listParametersResponse::soap_default(nullptr);
   }
   virtual ~ns1__listParametersResponse() = default;
 };
@@ -7844,7 +7890,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__modifyDataFileParameter() {
-    ns1__modifyDataFileParameter::soap_default(NULL);
+    ns1__modifyDataFileParameter::soap_default(nullptr);
   }
   virtual ~ns1__modifyDataFileParameter() = default;
 };
@@ -7865,7 +7911,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__modifyDataFileParameterResponse() {
-    ns1__modifyDataFileParameterResponse::soap_default(NULL);
+    ns1__modifyDataFileParameterResponse::soap_default(nullptr);
   }
   virtual ~ns1__modifyDataFileParameterResponse() = default;
 };
@@ -7888,7 +7934,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getDatasets() { ns1__getDatasets::soap_default(NULL); }
+  ns1__getDatasets() { ns1__getDatasets::soap_default(nullptr); }
   virtual ~ns1__getDatasets() = default;
 };
 #endif
@@ -7914,7 +7960,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__getDatasetsResponse() { ns1__getDatasetsResponse::soap_default(NULL); }
+  ns1__getDatasetsResponse() {
+    ns1__getDatasetsResponse::soap_default(nullptr);
+  }
   virtual ~ns1__getDatasetsResponse() = default;
 };
 #endif
@@ -7941,7 +7989,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByRestrictionComparasion() {
-    ns1__searchInvestigationByRestrictionComparasion::soap_default(NULL);
+    ns1__searchInvestigationByRestrictionComparasion::soap_default(nullptr);
   }
   virtual ~ns1__searchInvestigationByRestrictionComparasion() = default;
 };
@@ -7974,7 +8022,7 @@ public:
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__searchInvestigationByRestrictionComparasionResponse() {
     ns1__searchInvestigationByRestrictionComparasionResponse::soap_default(
-        NULL);
+        nullptr);
   }
   virtual ~ns1__searchInvestigationByRestrictionComparasionResponse() = default;
 };
@@ -7998,7 +8046,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns3__SessionException() { ns3__SessionException::soap_default(NULL); }
+  ns3__SessionException() { ns3__SessionException::soap_default(nullptr); }
   virtual ~ns3__SessionException() = default;
 };
 #endif
@@ -8022,7 +8070,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns3__NoSuchObjectFoundException() {
-    ns3__NoSuchObjectFoundException::soap_default(NULL);
+    ns3__NoSuchObjectFoundException::soap_default(nullptr);
   }
   virtual ~ns3__NoSuchObjectFoundException() = default;
 };
@@ -8046,7 +8094,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns3__ValidationException() { ns3__ValidationException::soap_default(NULL); }
+  ns3__ValidationException() {
+    ns3__ValidationException::soap_default(nullptr);
+  }
   virtual ~ns3__ValidationException() = default;
 };
 #endif
@@ -8068,7 +8118,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns3__getUserDetails() { ns3__getUserDetails::soap_default(NULL); }
+  ns3__getUserDetails() { ns3__getUserDetails::soap_default(nullptr); }
   virtual ~ns3__getUserDetails() = default;
 };
 #endif
@@ -8095,7 +8145,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns3__getUserDetailsResponse() {
-    ns3__getUserDetailsResponse::soap_default(NULL);
+    ns3__getUserDetailsResponse::soap_default(nullptr);
   }
   virtual ~ns3__getUserDetailsResponse() = default;
 };
@@ -8119,7 +8169,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns3__NoSuchUserException() { ns3__NoSuchUserException::soap_default(NULL); }
+  ns3__NoSuchUserException() {
+    ns3__NoSuchUserException::soap_default(nullptr);
+  }
   virtual ~ns3__NoSuchUserException() = default;
 };
 #endif
@@ -8154,7 +8206,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__restrictionCondition() { ns1__restrictionCondition::soap_default(NULL); }
+  ns1__restrictionCondition() {
+    ns1__restrictionCondition::soap_default(nullptr);
+  }
   virtual ~ns1__restrictionCondition() = default;
 };
 #endif
@@ -8173,7 +8227,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__parameterCondition() { ns1__parameterCondition::soap_default(NULL); }
+  ns1__parameterCondition() { ns1__parameterCondition::soap_default(nullptr); }
   virtual ~ns1__parameterCondition() = default;
 };
 #endif
@@ -8200,7 +8254,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__facilityUser() { ns1__facilityUser::soap_default(NULL); }
+  ns1__facilityUser() { ns1__facilityUser::soap_default(nullptr); }
   virtual ~ns1__facilityUser() = default;
 };
 #endif
@@ -8231,7 +8285,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__icatRole() { ns1__icatRole::soap_default(NULL); }
+  ns1__icatRole() { ns1__icatRole::soap_default(nullptr); }
   virtual ~ns1__icatRole() = default;
 };
 #endif
@@ -8260,7 +8314,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__sample() { ns1__sample::soap_default(NULL); }
+  ns1__sample() { ns1__sample::soap_default(nullptr); }
   virtual ~ns1__sample() = default;
 };
 #endif
@@ -8291,7 +8345,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__sampleParameter() { ns1__sampleParameter::soap_default(NULL); }
+  ns1__sampleParameter() { ns1__sampleParameter::soap_default(nullptr); }
   virtual ~ns1__sampleParameter() = default;
 };
 #endif
@@ -8314,7 +8368,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__sampleParameterPK() { ns1__sampleParameterPK::soap_default(NULL); }
+  ns1__sampleParameterPK() { ns1__sampleParameterPK::soap_default(nullptr); }
   virtual ~ns1__sampleParameterPK() = default;
 };
 #endif
@@ -8360,7 +8414,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__datafile() { ns1__datafile::soap_default(NULL); }
+  ns1__datafile() { ns1__datafile::soap_default(nullptr); }
   virtual ~ns1__datafile() = default;
 };
 #endif
@@ -8384,7 +8438,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__datafileFormat() { ns1__datafileFormat::soap_default(NULL); }
+  ns1__datafileFormat() { ns1__datafileFormat::soap_default(nullptr); }
   virtual ~ns1__datafileFormat() = default;
 };
 #endif
@@ -8406,7 +8460,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__datafileFormatPK() { ns1__datafileFormatPK::soap_default(NULL); }
+  ns1__datafileFormatPK() { ns1__datafileFormatPK::soap_default(nullptr); }
   virtual ~ns1__datafileFormatPK() = default;
 };
 #endif
@@ -8437,7 +8491,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__datafileParameter() { ns1__datafileParameter::soap_default(NULL); }
+  ns1__datafileParameter() { ns1__datafileParameter::soap_default(nullptr); }
   virtual ~ns1__datafileParameter() = default;
 };
 #endif
@@ -8461,7 +8515,9 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__datafileParameterPK() { ns1__datafileParameterPK::soap_default(NULL); }
+  ns1__datafileParameterPK() {
+    ns1__datafileParameterPK::soap_default(nullptr);
+  }
   virtual ~ns1__datafileParameterPK() = default;
 };
 #endif
@@ -8484,7 +8540,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__relatedDatafiles() { ns1__relatedDatafiles::soap_default(NULL); }
+  ns1__relatedDatafiles() { ns1__relatedDatafiles::soap_default(nullptr); }
   virtual ~ns1__relatedDatafiles() = default;
 };
 #endif
@@ -8506,7 +8562,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__relatedDatafilesPK() { ns1__relatedDatafilesPK::soap_default(NULL); }
+  ns1__relatedDatafilesPK() { ns1__relatedDatafilesPK::soap_default(nullptr); }
   virtual ~ns1__relatedDatafilesPK() = default;
 };
 #endif
@@ -8538,7 +8594,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__parameter() { ns1__parameter::soap_default(NULL); }
+  ns1__parameter() { ns1__parameter::soap_default(nullptr); }
   virtual ~ns1__parameter() = default;
 };
 #endif
@@ -8560,7 +8616,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__parameterPK() { ns1__parameterPK::soap_default(NULL); }
+  ns1__parameterPK() { ns1__parameterPK::soap_default(nullptr); }
   virtual ~ns1__parameterPK() = default;
 };
 #endif
@@ -8584,7 +8640,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__facilityCycle() { ns1__facilityCycle::soap_default(NULL); }
+  ns1__facilityCycle() { ns1__facilityCycle::soap_default(nullptr); }
   virtual ~ns1__facilityCycle() = default;
 };
 #endif
@@ -8608,7 +8664,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__instrument() { ns1__instrument::soap_default(NULL); }
+  ns1__instrument() { ns1__instrument::soap_default(nullptr); }
   virtual ~ns1__instrument() = default;
 };
 #endif
@@ -8630,7 +8686,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__investigatorPK() { ns1__investigatorPK::soap_default(NULL); }
+  ns1__investigatorPK() { ns1__investigatorPK::soap_default(nullptr); }
   virtual ~ns1__investigatorPK() = default;
 };
 #endif
@@ -8652,7 +8708,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__keywordPK() { ns1__keywordPK::soap_default(NULL); }
+  ns1__keywordPK() { ns1__keywordPK::soap_default(nullptr); }
   virtual ~ns1__keywordPK() = default;
 };
 #endif
@@ -8685,7 +8741,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__dataset() { ns1__dataset::soap_default(NULL); }
+  ns1__dataset() { ns1__dataset::soap_default(nullptr); }
   virtual ~ns1__dataset() = default;
 };
 #endif
@@ -8717,7 +8773,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__datasetParameter() { ns1__datasetParameter::soap_default(NULL); }
+  ns1__datasetParameter() { ns1__datasetParameter::soap_default(nullptr); }
   virtual ~ns1__datasetParameter() = default;
 };
 #endif
@@ -8740,7 +8796,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__datasetParameterPK() { ns1__datasetParameterPK::soap_default(NULL); }
+  ns1__datasetParameterPK() { ns1__datasetParameterPK::soap_default(nullptr); }
   virtual ~ns1__datasetParameterPK() = default;
 };
 #endif
@@ -8790,7 +8846,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__investigation() { ns1__investigation::soap_default(NULL); }
+  ns1__investigation() { ns1__investigation::soap_default(nullptr); }
   virtual ~ns1__investigation() = default;
 };
 #endif
@@ -8815,7 +8871,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__investigator() { ns1__investigator::soap_default(NULL); }
+  ns1__investigator() { ns1__investigator::soap_default(nullptr); }
   virtual ~ns1__investigator() = default;
 };
 #endif
@@ -8836,7 +8892,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__keyword() { ns1__keyword::soap_default(NULL); }
+  ns1__keyword() { ns1__keyword::soap_default(nullptr); }
   virtual ~ns1__keyword() = default;
 };
 #endif
@@ -8861,7 +8917,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__publication() { ns1__publication::soap_default(NULL); }
+  ns1__publication() { ns1__publication::soap_default(nullptr); }
   virtual ~ns1__publication() = default;
 };
 #endif
@@ -8883,7 +8939,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__shift() { ns1__shift::soap_default(NULL); }
+  ns1__shift() { ns1__shift::soap_default(nullptr); }
   virtual ~ns1__shift() = default;
 };
 #endif
@@ -8906,7 +8962,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__shiftPK() { ns1__shiftPK::soap_default(NULL); }
+  ns1__shiftPK() { ns1__shiftPK::soap_default(nullptr); }
   virtual ~ns1__shiftPK() = default;
 };
 #endif
@@ -8933,7 +8989,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__icatAuthorisation() { ns1__icatAuthorisation::soap_default(NULL); }
+  ns1__icatAuthorisation() { ns1__icatAuthorisation::soap_default(nullptr); }
   virtual ~ns1__icatAuthorisation() = default;
 };
 #endif
@@ -8959,7 +9015,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__restrictionLogicalCondition() {
-    ns1__restrictionLogicalCondition::soap_default(NULL);
+    ns1__restrictionLogicalCondition::soap_default(nullptr);
   }
   virtual ~ns1__restrictionLogicalCondition() = default;
 };
@@ -8989,7 +9045,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__restrictionComparisonCondition() {
-    ns1__restrictionComparisonCondition::soap_default(NULL);
+    ns1__restrictionComparisonCondition::soap_default(nullptr);
   }
   virtual ~ns1__restrictionComparisonCondition() = default;
 };
@@ -9016,7 +9072,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__parameterLogicalCondition() {
-    ns1__parameterLogicalCondition::soap_default(NULL);
+    ns1__parameterLogicalCondition::soap_default(nullptr);
   }
   virtual ~ns1__parameterLogicalCondition() = default;
 };
@@ -9040,7 +9096,7 @@ public:
   virtual int soap_out(struct soap *, const char *, int, const char *) const;
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
-  ns1__parameterSearch() { ns1__parameterSearch::soap_default(NULL); }
+  ns1__parameterSearch() { ns1__parameterSearch::soap_default(nullptr); }
   virtual ~ns1__parameterSearch() = default;
 };
 #endif
@@ -9068,7 +9124,7 @@ public:
   virtual void *soap_get(struct soap *, const char *, const char *);
   virtual void *soap_in(struct soap *, const char *, const char *);
   ns1__parameterComparisonCondition() {
-    ns1__parameterComparisonCondition::soap_default(NULL);
+    ns1__parameterComparisonCondition::soap_default(nullptr);
   }
   virtual ~ns1__parameterComparisonCondition() = default;
 };
diff --git a/Framework/ICat/src/GSoap/soapserializersC.cpp b/Framework/ICat/src/GSoap/soapserializersC.cpp
index ec18448a06e..f042b2c2b3f 100644
--- a/Framework/ICat/src/GSoap/soapserializersC.cpp
+++ b/Framework/ICat/src/GSoap/soapserializersC.cpp
@@ -591,7 +591,7 @@ soap_in_SOAP_ENV__Fault(struct soap *soap, const char *tag,
     return nullptr;
   a = (struct SOAP_ENV__Fault *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Fault,
-      sizeof(struct SOAP_ENV__Fault), 0, nullptr, NULL, NULL);
+      sizeof(struct SOAP_ENV__Fault), 0, nullptr, nullptr, nullptr);
   if (!a)
     return nullptr;
   soap_default_SOAP_ENV__Fault(soap, a);
@@ -779,7 +779,7 @@ soap_in_SOAP_ENV__Reason(struct soap *soap, const char *tag,
     return nullptr;
   a = (struct SOAP_ENV__Reason *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Reason,
-      sizeof(struct SOAP_ENV__Reason), 0, nullptr, NULL, NULL);
+      sizeof(struct SOAP_ENV__Reason), 0, nullptr, nullptr, nullptr);
   if (!a)
     return nullptr;
   soap_default_SOAP_ENV__Reason(soap, a);
@@ -921,7 +921,7 @@ soap_in_SOAP_ENV__Detail(struct soap *soap, const char *tag,
     return nullptr;
   a = (struct SOAP_ENV__Detail *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Detail,
-      sizeof(struct SOAP_ENV__Detail), 0, nullptr, NULL, NULL);
+      sizeof(struct SOAP_ENV__Detail), 0, nullptr, nullptr, nullptr);
   if (!a)
     return nullptr;
   soap_default_SOAP_ENV__Detail(soap, a);
@@ -1071,7 +1071,7 @@ soap_in_SOAP_ENV__Code(struct soap *soap, const char *tag,
     return nullptr;
   a = (struct SOAP_ENV__Code *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Code,
-      sizeof(struct SOAP_ENV__Code), 0, nullptr, NULL, NULL);
+      sizeof(struct SOAP_ENV__Code), 0, nullptr, nullptr, nullptr);
   if (!a)
     return nullptr;
   soap_default_SOAP_ENV__Code(soap, a);
@@ -1208,7 +1208,7 @@ soap_in_SOAP_ENV__Header(struct soap *soap, const char *tag,
     return nullptr;
   a = (struct SOAP_ENV__Header *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Header,
-      sizeof(struct SOAP_ENV__Header), 0, nullptr, NULL, NULL);
+      sizeof(struct SOAP_ENV__Header), 0, nullptr, nullptr, nullptr);
   if (!a)
     return nullptr;
   soap_default_SOAP_ENV__Header(soap, a);
diff --git a/Framework/ICat/src/GSoap/stdsoap2.cpp b/Framework/ICat/src/GSoap/stdsoap2.cpp
index fc03059c463..83fb0a47479 100644
--- a/Framework/ICat/src/GSoap/stdsoap2.cpp
+++ b/Framework/ICat/src/GSoap/stdsoap2.cpp
@@ -4533,7 +4533,7 @@ again:
         }
 #else
         names = (GENERAL_NAMES *)X509_get_ext_d2i(peer, NID_subject_alt_name,
-                                                  nullptr, NULL);
+                                                  nullptr, nullptr);
         if (names) {
           val = i2v_GENERAL_NAMES(nullptr, names, val);
           sk_GENERAL_NAME_pop_free(names, GENERAL_NAME_free);
@@ -12002,7 +12002,7 @@ end:
     soap->error = SOAP_LENGTH;
     return nullptr;
   }
-  s = (wchar_t *)soap_save_block(soap, nullptr, NULL, 0);
+  s = (wchar_t *)soap_save_block(soap, nullptr, nullptr, 0);
 #ifdef WITH_DOM
   if ((soap->mode & SOAP_XML_DOM) && soap->dom)
     soap->dom->wide = s;
@@ -12080,8 +12080,8 @@ int *SOAP_FMAC2 soap_inint(struct soap *soap, const char *tag, int *p,
     return nullptr;
   }
 #endif
-  p = (int *)soap_id_enter(soap, soap->id, p, t, sizeof(int), 0, nullptr, NULL,
-                           NULL);
+  p = (int *)soap_id_enter(soap, soap->id, p, t, sizeof(int), 0, nullptr,
+                           nullptr, nullptr);
   if (*soap->href)
     p = (int *)soap_id_forward(soap, soap->href, p, 0, t, 0, sizeof(int), 0,
                                nullptr);
@@ -12160,7 +12160,7 @@ long *SOAP_FMAC2 soap_inlong(struct soap *soap, const char *tag, long *p,
   }
 #endif
   p = (long *)soap_id_enter(soap, soap->id, p, t, sizeof(long), 0, nullptr,
-                            NULL, NULL);
+                            nullptr, nullptr);
   if (*soap->href)
     p = (long *)soap_id_forward(soap, soap->href, p, 0, t, 0, sizeof(long), 0,
                                 nullptr);
@@ -12251,7 +12251,7 @@ LONG64 *SOAP_FMAC2 soap_inLONG64(struct soap *soap, const char *tag, LONG64 *p,
   }
 #endif
   p = (LONG64 *)soap_id_enter(soap, soap->id, p, t, sizeof(LONG64), 0, nullptr,
-                              NULL, NULL);
+                              nullptr, nullptr);
   if (*soap->href)
     p = (LONG64 *)soap_id_forward(soap, soap->href, p, 0, t, 0, sizeof(LONG64),
                                   0, nullptr);
@@ -12318,7 +12318,7 @@ char *SOAP_FMAC2 soap_inbyte(struct soap *soap, const char *tag, char *p,
   }
 #endif
   p = (char *)soap_id_enter(soap, soap->id, p, t, sizeof(char), 0, nullptr,
-                            NULL, NULL);
+                            nullptr, nullptr);
   if (*soap->href)
     p = (char *)soap_id_forward(soap, soap->href, p, 0, t, 0, sizeof(char), 0,
                                 nullptr);
@@ -12386,7 +12386,7 @@ short *SOAP_FMAC2 soap_inshort(struct soap *soap, const char *tag, short *p,
   }
 #endif
   p = (short *)soap_id_enter(soap, soap->id, p, t, sizeof(short), 0, nullptr,
-                             NULL, NULL);
+                             nullptr, nullptr);
   if (*soap->href)
     p = (short *)soap_id_forward(soap, soap->href, p, 0, t, 0, sizeof(short), 0,
                                  nullptr);
@@ -12538,7 +12538,7 @@ float *SOAP_FMAC2 soap_infloat(struct soap *soap, const char *tag, float *p,
     return nullptr;
 #endif
   p = (float *)soap_id_enter(soap, soap->id, p, t, sizeof(float), 0, nullptr,
-                             NULL, NULL);
+                             nullptr, nullptr);
   if (*soap->href)
     p = (float *)soap_id_forward(soap, soap->href, p, 0, t, 0, sizeof(float), 0,
                                  nullptr);
@@ -12652,7 +12652,7 @@ double *SOAP_FMAC2 soap_indouble(struct soap *soap, const char *tag, double *p,
     return nullptr;
 #endif
   p = (double *)soap_id_enter(soap, soap->id, p, t, sizeof(double), 0, nullptr,
-                              NULL, NULL);
+                              nullptr, nullptr);
   if (*soap->href)
     p = (double *)soap_id_forward(soap, soap->href, p, 0, t, 0, sizeof(double),
                                   0, nullptr);
@@ -12721,8 +12721,9 @@ unsigned char *SOAP_FMAC2 soap_inunsignedByte(struct soap *soap,
     return nullptr;
   }
 #endif
-  p = (unsigned char *)soap_id_enter(
-      soap, soap->id, p, t, sizeof(unsigned char), 0, nullptr, NULL, NULL);
+  p = (unsigned char *)soap_id_enter(soap, soap->id, p, t,
+                                     sizeof(unsigned char), 0, nullptr, nullptr,
+                                     nullptr);
   if (*soap->href)
     p = (unsigned char *)soap_id_forward(soap, soap->href, p, 0, t, 0,
                                          sizeof(unsigned char), 0, nullptr);
@@ -12793,8 +12794,9 @@ soap_inunsignedShort(struct soap *soap, const char *tag, unsigned short *p,
     return nullptr;
   }
 #endif
-  p = (unsigned short *)soap_id_enter(
-      soap, soap->id, p, t, sizeof(unsigned short), 0, nullptr, NULL, NULL);
+  p = (unsigned short *)soap_id_enter(soap, soap->id, p, t,
+                                      sizeof(unsigned short), 0, nullptr,
+                                      nullptr, nullptr);
   if (*soap->href)
     p = (unsigned short *)soap_id_forward(soap, soap->href, p, 0, t, 0,
                                           sizeof(unsigned short), 0, nullptr);
@@ -12875,7 +12877,7 @@ unsigned int *SOAP_FMAC2 soap_inunsignedInt(struct soap *soap, const char *tag,
   }
 #endif
   p = (unsigned int *)soap_id_enter(soap, soap->id, p, t, sizeof(unsigned int),
-                                    0, nullptr, NULL, NULL);
+                                    0, nullptr, nullptr, nullptr);
   if (*soap->href)
     p = (unsigned int *)soap_id_forward(soap, soap->href, p, 0, t, 0,
                                         sizeof(unsigned int), 0, nullptr);
@@ -12956,8 +12958,9 @@ unsigned long *SOAP_FMAC2 soap_inunsignedLong(struct soap *soap,
     return nullptr;
   }
 #endif
-  p = (unsigned long *)soap_id_enter(
-      soap, soap->id, p, t, sizeof(unsigned long), 0, nullptr, NULL, NULL);
+  p = (unsigned long *)soap_id_enter(soap, soap->id, p, t,
+                                     sizeof(unsigned long), 0, nullptr, nullptr,
+                                     nullptr);
   if (*soap->href)
     p = (unsigned long *)soap_id_forward(soap, soap->href, p, 0, t, 0,
                                          sizeof(unsigned long), 0, nullptr);
@@ -13043,7 +13046,7 @@ ULONG64 *SOAP_FMAC2 soap_inULONG64(struct soap *soap, const char *tag,
     return nullptr;
   }
   p = (ULONG64 *)soap_id_enter(soap, soap->id, p, t, sizeof(ULONG64), 0,
-                               nullptr, NULL, NULL);
+                               nullptr, nullptr, nullptr);
   if (*soap->href)
     p = (ULONG64 *)soap_id_forward(soap, soap->href, p, 0, t, 0,
                                    sizeof(ULONG64), 0, nullptr);
@@ -13404,7 +13407,7 @@ char **SOAP_FMAC2 soap_instring(struct soap *soap, const char *tag, char **p,
     *p = soap_string_in(soap, flag, minlen, maxlen);
     if (!*p ||
         !(char *)soap_id_enter(soap, soap->id, *p, t, sizeof(char *), 0,
-                               nullptr, NULL, NULL))
+                               nullptr, nullptr, nullptr))
       return nullptr;
     if (!**p && tag && *tag == '-') {
       soap->error = SOAP_NO_TAG;
@@ -13467,7 +13470,7 @@ wchar_t **SOAP_FMAC2 soap_inwstring(struct soap *soap, const char *tag,
     *p = soap_wstring_in(soap, 1, minlen, maxlen);
     if (!*p ||
         !(wchar_t *)soap_id_enter(soap, soap->id, *p, t, sizeof(wchar_t *), 0,
-                                  nullptr, NULL, NULL))
+                                  nullptr, nullptr, nullptr))
       return nullptr;
     if (!**p && tag && *tag == '-') {
       soap->error = SOAP_NO_TAG;
@@ -13689,7 +13692,7 @@ time_t *SOAP_FMAC2 soap_indateTime(struct soap *soap, const char *tag,
     return nullptr;
   }
   p = (time_t *)soap_id_enter(soap, soap->id, p, t, sizeof(time_t), 0, nullptr,
-                              NULL, NULL);
+                              nullptr, nullptr);
   if (*soap->href)
     p = (time_t *)soap_id_forward(soap, soap->href, p, 0, t, 0, sizeof(time_t),
                                   0, nullptr);
diff --git a/Framework/ICat/src/ICat3/GSoapGenerated/ICat3C.cpp b/Framework/ICat/src/ICat3/GSoapGenerated/ICat3C.cpp
index 780fc97f821..6cab274568f 100644
--- a/Framework/ICat/src/ICat3/GSoapGenerated/ICat3C.cpp
+++ b/Framework/ICat/src/ICat3/GSoapGenerated/ICat3C.cpp
@@ -172,2050 +172,2135 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_getindependent(struct soap *soap) {
 SOAP_FMAC3 void *SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) {
   (void)type;
   if (soap_peek_element(soap))
-    return NULL;
+    return nullptr;
 #ifndef WITH_NOIDREF
   if (!*soap->id || !(*type = soap_lookup_type(soap, soap->id)))
     *type = soap_lookup_type(soap, soap->href);
   switch (*type) {
   case SOAP_TYPE_ICat3_byte:
-    return soap_in_byte(soap, NULL, NULL, "xsd:byte");
+    return soap_in_byte(soap, nullptr, nullptr, "xsd:byte");
   case SOAP_TYPE_ICat3_int:
-    return soap_in_int(soap, NULL, NULL, "xsd:int");
+    return soap_in_int(soap, nullptr, nullptr, "xsd:int");
   case SOAP_TYPE_ICat3_LONG64:
-    return soap_in_LONG64(soap, NULL, NULL, "xsd:long");
+    return soap_in_LONG64(soap, nullptr, nullptr, "xsd:long");
   case SOAP_TYPE_ICat3_float:
-    return soap_in_float(soap, NULL, NULL, "xsd:float");
+    return soap_in_float(soap, nullptr, nullptr, "xsd:float");
   case SOAP_TYPE_ICat3_double:
-    return soap_in_double(soap, NULL, NULL, "xsd:double");
+    return soap_in_double(soap, nullptr, nullptr, "xsd:double");
   case SOAP_TYPE_ICat3_time:
-    return soap_in_time(soap, NULL, NULL, "xsd:dateTime");
+    return soap_in_time(soap, nullptr, nullptr, "xsd:dateTime");
   case SOAP_TYPE_ICat3_ns1__elementType:
-    return soap_in_ns1__elementType(soap, NULL, NULL, "ns1:elementType");
+    return soap_in_ns1__elementType(soap, nullptr, nullptr, "ns1:elementType");
   case SOAP_TYPE_ICat3_ns1__parameterType:
-    return soap_in_ns1__parameterType(soap, NULL, NULL, "ns1:parameterType");
+    return soap_in_ns1__parameterType(soap, nullptr, nullptr,
+                                      "ns1:parameterType");
   case SOAP_TYPE_ICat3_ns1__keywordType:
-    return soap_in_ns1__keywordType(soap, NULL, NULL, "ns1:keywordType");
+    return soap_in_ns1__keywordType(soap, nullptr, nullptr, "ns1:keywordType");
   case SOAP_TYPE_ICat3_ns1__comparisonOperator:
-    return soap_in_ns1__comparisonOperator(soap, NULL, NULL,
+    return soap_in_ns1__comparisonOperator(soap, nullptr, nullptr,
                                            "ns1:comparisonOperator");
   case SOAP_TYPE_ICat3_ns1__parameterValueType:
-    return soap_in_ns1__parameterValueType(soap, NULL, NULL,
+    return soap_in_ns1__parameterValueType(soap, nullptr, nullptr,
                                            "ns1:parameterValueType");
   case SOAP_TYPE_ICat3_ns1__sampleInclude:
-    return soap_in_ns1__sampleInclude(soap, NULL, NULL, "ns1:sampleInclude");
+    return soap_in_ns1__sampleInclude(soap, nullptr, nullptr,
+                                      "ns1:sampleInclude");
   case SOAP_TYPE_ICat3_ns1__restrictionAttributes:
-    return soap_in_ns1__restrictionAttributes(soap, NULL, NULL,
+    return soap_in_ns1__restrictionAttributes(soap, nullptr, nullptr,
                                               "ns1:restrictionAttributes");
   case SOAP_TYPE_ICat3_ns1__investigationInclude:
-    return soap_in_ns1__investigationInclude(soap, NULL, NULL,
+    return soap_in_ns1__investigationInclude(soap, nullptr, nullptr,
                                              "ns1:investigationInclude");
   case SOAP_TYPE_ICat3_ns1__datasetInclude:
-    return soap_in_ns1__datasetInclude(soap, NULL, NULL, "ns1:datasetInclude");
+    return soap_in_ns1__datasetInclude(soap, nullptr, nullptr,
+                                       "ns1:datasetInclude");
   case SOAP_TYPE_ICat3_ns1__datafileInclude:
-    return soap_in_ns1__datafileInclude(soap, NULL, NULL,
+    return soap_in_ns1__datafileInclude(soap, nullptr, nullptr,
                                         "ns1:datafileInclude");
   case SOAP_TYPE_ICat3_ns1__logicalOperator:
-    return soap_in_ns1__logicalOperator(soap, NULL, NULL,
+    return soap_in_ns1__logicalOperator(soap, nullptr, nullptr,
                                         "ns1:logicalOperator");
   case SOAP_TYPE_ICat3_bool:
-    return soap_in_bool(soap, NULL, NULL, "xsd:boolean");
+    return soap_in_bool(soap, nullptr, nullptr, "xsd:boolean");
   case SOAP_TYPE_ICat3_ns1__elementType_:
-    return soap_in_ns1__elementType_(soap, NULL, NULL, "ns1:elementType");
+    return soap_in_ns1__elementType_(soap, nullptr, nullptr, "ns1:elementType");
   case SOAP_TYPE_ICat3_ns1__parameterType_:
-    return soap_in_ns1__parameterType_(soap, NULL, NULL, "ns1:parameterType");
+    return soap_in_ns1__parameterType_(soap, nullptr, nullptr,
+                                       "ns1:parameterType");
   case SOAP_TYPE_ICat3_ns1__keywordType_:
-    return soap_in_ns1__keywordType_(soap, NULL, NULL, "ns1:keywordType");
+    return soap_in_ns1__keywordType_(soap, nullptr, nullptr, "ns1:keywordType");
   case SOAP_TYPE_ICat3_ns1__comparisonOperator_:
-    return soap_in_ns1__comparisonOperator_(soap, NULL, NULL,
+    return soap_in_ns1__comparisonOperator_(soap, nullptr, nullptr,
                                             "ns1:comparisonOperator");
   case SOAP_TYPE_ICat3_ns1__parameterValueType_:
-    return soap_in_ns1__parameterValueType_(soap, NULL, NULL,
+    return soap_in_ns1__parameterValueType_(soap, nullptr, nullptr,
                                             "ns1:parameterValueType");
   case SOAP_TYPE_ICat3_ns1__sampleInclude_:
-    return soap_in_ns1__sampleInclude_(soap, NULL, NULL, "ns1:sampleInclude");
+    return soap_in_ns1__sampleInclude_(soap, nullptr, nullptr,
+                                       "ns1:sampleInclude");
   case SOAP_TYPE_ICat3_ns1__restrictionAttributes_:
-    return soap_in_ns1__restrictionAttributes_(soap, NULL, NULL,
+    return soap_in_ns1__restrictionAttributes_(soap, nullptr, nullptr,
                                                "ns1:restrictionAttributes");
   case SOAP_TYPE_ICat3_ns1__investigationInclude_:
-    return soap_in_ns1__investigationInclude_(soap, NULL, NULL,
+    return soap_in_ns1__investigationInclude_(soap, nullptr, nullptr,
                                               "ns1:investigationInclude");
   case SOAP_TYPE_ICat3_ns1__datasetInclude_:
-    return soap_in_ns1__datasetInclude_(soap, NULL, NULL, "ns1:datasetInclude");
+    return soap_in_ns1__datasetInclude_(soap, nullptr, nullptr,
+                                        "ns1:datasetInclude");
   case SOAP_TYPE_ICat3_ns1__datafileInclude_:
-    return soap_in_ns1__datafileInclude_(soap, NULL, NULL,
+    return soap_in_ns1__datafileInclude_(soap, nullptr, nullptr,
                                          "ns1:datafileInclude");
   case SOAP_TYPE_ICat3_ns1__logicalOperator_:
-    return soap_in_ns1__logicalOperator_(soap, NULL, NULL,
+    return soap_in_ns1__logicalOperator_(soap, nullptr, nullptr,
                                          "ns1:logicalOperator");
   case SOAP_TYPE_ICat3_ns3__NoSuchUserException:
-    return soap_in_ns3__NoSuchUserException(soap, NULL, NULL,
+    return soap_in_ns3__NoSuchUserException(soap, nullptr, nullptr,
                                             "ns3:NoSuchUserException");
   case SOAP_TYPE_ICat3_ns3__getUserDetailsResponse:
-    return soap_in_ns3__getUserDetailsResponse(soap, NULL, NULL,
+    return soap_in_ns3__getUserDetailsResponse(soap, nullptr, nullptr,
                                                "ns3:getUserDetailsResponse");
   case SOAP_TYPE_ICat3_ns3__getUserDetails:
-    return soap_in_ns3__getUserDetails(soap, NULL, NULL, "ns3:getUserDetails");
+    return soap_in_ns3__getUserDetails(soap, nullptr, nullptr,
+                                       "ns3:getUserDetails");
   case SOAP_TYPE_ICat3_ns3__ValidationException:
-    return soap_in_ns3__ValidationException(soap, NULL, NULL,
+    return soap_in_ns3__ValidationException(soap, nullptr, nullptr,
                                             "ns3:ValidationException");
   case SOAP_TYPE_ICat3_ns3__NoSuchObjectFoundException:
     return soap_in_ns3__NoSuchObjectFoundException(
-        soap, NULL, NULL, "ns3:NoSuchObjectFoundException");
+        soap, nullptr, nullptr, "ns3:NoSuchObjectFoundException");
   case SOAP_TYPE_ICat3_ns3__SessionException:
-    return soap_in_ns3__SessionException(soap, NULL, NULL,
+    return soap_in_ns3__SessionException(soap, nullptr, nullptr,
                                          "ns3:SessionException");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionComparasionResponse:
     return soap_in_ns1__searchInvestigationByRestrictionComparasionResponse(
-        soap, NULL, NULL,
+        soap, nullptr, nullptr,
         "ns1:searchInvestigationByRestrictionComparasionResponse");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionComparasion:
     return soap_in_ns1__searchInvestigationByRestrictionComparasion(
-        soap, NULL, NULL, "ns1:searchInvestigationByRestrictionComparasion");
+        soap, nullptr, nullptr,
+        "ns1:searchInvestigationByRestrictionComparasion");
   case SOAP_TYPE_ICat3_ns1__getDatasetsResponse:
-    return soap_in_ns1__getDatasetsResponse(soap, NULL, NULL,
+    return soap_in_ns1__getDatasetsResponse(soap, nullptr, nullptr,
                                             "ns1:getDatasetsResponse");
   case SOAP_TYPE_ICat3_ns1__getDatasets:
-    return soap_in_ns1__getDatasets(soap, NULL, NULL, "ns1:getDatasets");
+    return soap_in_ns1__getDatasets(soap, nullptr, nullptr, "ns1:getDatasets");
   case SOAP_TYPE_ICat3_ns1__modifyDataFileParameterResponse:
     return soap_in_ns1__modifyDataFileParameterResponse(
-        soap, NULL, NULL, "ns1:modifyDataFileParameterResponse");
+        soap, nullptr, nullptr, "ns1:modifyDataFileParameterResponse");
   case SOAP_TYPE_ICat3_ns1__modifyDataFileParameter:
-    return soap_in_ns1__modifyDataFileParameter(soap, NULL, NULL,
+    return soap_in_ns1__modifyDataFileParameter(soap, nullptr, nullptr,
                                                 "ns1:modifyDataFileParameter");
   case SOAP_TYPE_ICat3_ns1__listParametersResponse:
-    return soap_in_ns1__listParametersResponse(soap, NULL, NULL,
+    return soap_in_ns1__listParametersResponse(soap, nullptr, nullptr,
                                                "ns1:listParametersResponse");
   case SOAP_TYPE_ICat3_ns1__listParameters:
-    return soap_in_ns1__listParameters(soap, NULL, NULL, "ns1:listParameters");
+    return soap_in_ns1__listParameters(soap, nullptr, nullptr,
+                                       "ns1:listParameters");
   case SOAP_TYPE_ICat3_ns1__searchSampleByParameterComparisonResponse:
     return soap_in_ns1__searchSampleByParameterComparisonResponse(
-        soap, NULL, NULL, "ns1:searchSampleByParameterComparisonResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchSampleByParameterComparisonResponse");
   case SOAP_TYPE_ICat3_ns1__searchSampleByParameterComparison:
     return soap_in_ns1__searchSampleByParameterComparison(
-        soap, NULL, NULL, "ns1:searchSampleByParameterComparison");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameterComparison");
   case SOAP_TYPE_ICat3_ns1__deleteSampleParameterResponse:
     return soap_in_ns1__deleteSampleParameterResponse(
-        soap, NULL, NULL, "ns1:deleteSampleParameterResponse");
+        soap, nullptr, nullptr, "ns1:deleteSampleParameterResponse");
   case SOAP_TYPE_ICat3_ns1__deleteSampleParameter:
-    return soap_in_ns1__deleteSampleParameter(soap, NULL, NULL,
+    return soap_in_ns1__deleteSampleParameter(soap, nullptr, nullptr,
                                               "ns1:deleteSampleParameter");
   case SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionLogicalResponse:
     return soap_in_ns1__searchSampleByRestrictionLogicalResponse(
-        soap, NULL, NULL, "ns1:searchSampleByRestrictionLogicalResponse");
+        soap, nullptr, nullptr, "ns1:searchSampleByRestrictionLogicalResponse");
   case SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionLogical:
     return soap_in_ns1__searchSampleByRestrictionLogical(
-        soap, NULL, NULL, "ns1:searchSampleByRestrictionLogical");
+        soap, nullptr, nullptr, "ns1:searchSampleByRestrictionLogical");
   case SOAP_TYPE_ICat3_ns1__addDataFileParameterResponse:
     return soap_in_ns1__addDataFileParameterResponse(
-        soap, NULL, NULL, "ns1:addDataFileParameterResponse");
+        soap, nullptr, nullptr, "ns1:addDataFileParameterResponse");
   case SOAP_TYPE_ICat3_ns1__addDataFileParameter:
-    return soap_in_ns1__addDataFileParameter(soap, NULL, NULL,
+    return soap_in_ns1__addDataFileParameter(soap, nullptr, nullptr,
                                              "ns1:addDataFileParameter");
   case SOAP_TYPE_ICat3_ns1__searchDatasetsBySampleResponse:
     return soap_in_ns1__searchDatasetsBySampleResponse(
-        soap, NULL, NULL, "ns1:searchDatasetsBySampleResponse");
+        soap, nullptr, nullptr, "ns1:searchDatasetsBySampleResponse");
   case SOAP_TYPE_ICat3_ns1__searchDatasetsBySample:
-    return soap_in_ns1__searchDatasetsBySample(soap, NULL, NULL,
+    return soap_in_ns1__searchDatasetsBySample(soap, nullptr, nullptr,
                                                "ns1:searchDatasetsBySample");
   case SOAP_TYPE_ICat3_ns1__createInvestigationResponse:
     return soap_in_ns1__createInvestigationResponse(
-        soap, NULL, NULL, "ns1:createInvestigationResponse");
+        soap, nullptr, nullptr, "ns1:createInvestigationResponse");
   case SOAP_TYPE_ICat3_ns1__createInvestigation:
-    return soap_in_ns1__createInvestigation(soap, NULL, NULL,
+    return soap_in_ns1__createInvestigation(soap, nullptr, nullptr,
                                             "ns1:createInvestigation");
   case SOAP_TYPE_ICat3_ns1__addPublicationResponse:
-    return soap_in_ns1__addPublicationResponse(soap, NULL, NULL,
+    return soap_in_ns1__addPublicationResponse(soap, nullptr, nullptr,
                                                "ns1:addPublicationResponse");
   case SOAP_TYPE_ICat3_ns1__addPublication:
-    return soap_in_ns1__addPublication(soap, NULL, NULL, "ns1:addPublication");
+    return soap_in_ns1__addPublication(soap, nullptr, nullptr,
+                                       "ns1:addPublication");
   case SOAP_TYPE_ICat3_ns1__deleteDataFileParameterResponse:
     return soap_in_ns1__deleteDataFileParameterResponse(
-        soap, NULL, NULL, "ns1:deleteDataFileParameterResponse");
+        soap, nullptr, nullptr, "ns1:deleteDataFileParameterResponse");
   case SOAP_TYPE_ICat3_ns1__deleteDataFileParameter:
-    return soap_in_ns1__deleteDataFileParameter(soap, NULL, NULL,
+    return soap_in_ns1__deleteDataFileParameter(soap, nullptr, nullptr,
                                                 "ns1:deleteDataFileParameter");
   case SOAP_TYPE_ICat3_ns1__getInvestigationResponse:
     return soap_in_ns1__getInvestigationResponse(
-        soap, NULL, NULL, "ns1:getInvestigationResponse");
+        soap, nullptr, nullptr, "ns1:getInvestigationResponse");
   case SOAP_TYPE_ICat3_ns1__getInvestigation:
-    return soap_in_ns1__getInvestigation(soap, NULL, NULL,
+    return soap_in_ns1__getInvestigation(soap, nullptr, nullptr,
                                          "ns1:getInvestigation");
   case SOAP_TYPE_ICat3_ns1__getInvestigationIncludesResponse:
     return soap_in_ns1__getInvestigationIncludesResponse(
-        soap, NULL, NULL, "ns1:getInvestigationIncludesResponse");
+        soap, nullptr, nullptr, "ns1:getInvestigationIncludesResponse");
   case SOAP_TYPE_ICat3_ns1__getInvestigationIncludes:
     return soap_in_ns1__getInvestigationIncludes(
-        soap, NULL, NULL, "ns1:getInvestigationIncludes");
+        soap, nullptr, nullptr, "ns1:getInvestigationIncludes");
   case SOAP_TYPE_ICat3_ns1__modifyDataFileResponse:
-    return soap_in_ns1__modifyDataFileResponse(soap, NULL, NULL,
+    return soap_in_ns1__modifyDataFileResponse(soap, nullptr, nullptr,
                                                "ns1:modifyDataFileResponse");
   case SOAP_TYPE_ICat3_ns1__modifyDataFile:
-    return soap_in_ns1__modifyDataFile(soap, NULL, NULL, "ns1:modifyDataFile");
+    return soap_in_ns1__modifyDataFile(soap, nullptr, nullptr,
+                                       "ns1:modifyDataFile");
   case SOAP_TYPE_ICat3_ns1__getDatafileResponse:
-    return soap_in_ns1__getDatafileResponse(soap, NULL, NULL,
+    return soap_in_ns1__getDatafileResponse(soap, nullptr, nullptr,
                                             "ns1:getDatafileResponse");
   case SOAP_TYPE_ICat3_ns1__getDatafile:
-    return soap_in_ns1__getDatafile(soap, NULL, NULL, "ns1:getDatafile");
+    return soap_in_ns1__getDatafile(soap, nullptr, nullptr, "ns1:getDatafile");
   case SOAP_TYPE_ICat3_ns1__ICATAPIException:
-    return soap_in_ns1__ICATAPIException(soap, NULL, NULL,
+    return soap_in_ns1__ICATAPIException(soap, nullptr, nullptr,
                                          "ns1:ICATAPIException");
   case SOAP_TYPE_ICat3_ns1__ingestMetadataResponse:
-    return soap_in_ns1__ingestMetadataResponse(soap, NULL, NULL,
+    return soap_in_ns1__ingestMetadataResponse(soap, nullptr, nullptr,
                                                "ns1:ingestMetadataResponse");
   case SOAP_TYPE_ICat3_ns1__ingestMetadata:
-    return soap_in_ns1__ingestMetadata(soap, NULL, NULL, "ns1:ingestMetadata");
+    return soap_in_ns1__ingestMetadata(soap, nullptr, nullptr,
+                                       "ns1:ingestMetadata");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionResponse:
     return soap_in_ns1__searchDatasetByRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByRestrictionResponse");
+        soap, nullptr, nullptr, "ns1:searchDatasetByRestrictionResponse");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByRestriction:
     return soap_in_ns1__searchDatasetByRestriction(
-        soap, NULL, NULL, "ns1:searchDatasetByRestriction");
+        soap, nullptr, nullptr, "ns1:searchDatasetByRestriction");
   case SOAP_TYPE_ICat3_ns1__listRolesResponse:
-    return soap_in_ns1__listRolesResponse(soap, NULL, NULL,
+    return soap_in_ns1__listRolesResponse(soap, nullptr, nullptr,
                                           "ns1:listRolesResponse");
   case SOAP_TYPE_ICat3_ns1__listRoles:
-    return soap_in_ns1__listRoles(soap, NULL, NULL, "ns1:listRoles");
+    return soap_in_ns1__listRoles(soap, nullptr, nullptr, "ns1:listRoles");
   case SOAP_TYPE_ICat3_ns1__updateAuthorisationResponse:
     return soap_in_ns1__updateAuthorisationResponse(
-        soap, NULL, NULL, "ns1:updateAuthorisationResponse");
+        soap, nullptr, nullptr, "ns1:updateAuthorisationResponse");
   case SOAP_TYPE_ICat3_ns1__updateAuthorisation:
-    return soap_in_ns1__updateAuthorisation(soap, NULL, NULL,
+    return soap_in_ns1__updateAuthorisation(soap, nullptr, nullptr,
                                             "ns1:updateAuthorisation");
   case SOAP_TYPE_ICat3_ns1__getDatasetIncludesResponse:
     return soap_in_ns1__getDatasetIncludesResponse(
-        soap, NULL, NULL, "ns1:getDatasetIncludesResponse");
+        soap, nullptr, nullptr, "ns1:getDatasetIncludesResponse");
   case SOAP_TYPE_ICat3_ns1__getDatasetIncludes:
-    return soap_in_ns1__getDatasetIncludes(soap, NULL, NULL,
+    return soap_in_ns1__getDatasetIncludes(soap, nullptr, nullptr,
                                            "ns1:getDatasetIncludes");
   case SOAP_TYPE_ICat3_ns1__getDatasetResponse:
-    return soap_in_ns1__getDatasetResponse(soap, NULL, NULL,
+    return soap_in_ns1__getDatasetResponse(soap, nullptr, nullptr,
                                            "ns1:getDatasetResponse");
   case SOAP_TYPE_ICat3_ns1__getDataset:
-    return soap_in_ns1__getDataset(soap, NULL, NULL, "ns1:getDataset");
+    return soap_in_ns1__getDataset(soap, nullptr, nullptr, "ns1:getDataset");
   case SOAP_TYPE_ICat3_ns1__deleteAuthorisationResponse:
     return soap_in_ns1__deleteAuthorisationResponse(
-        soap, NULL, NULL, "ns1:deleteAuthorisationResponse");
+        soap, nullptr, nullptr, "ns1:deleteAuthorisationResponse");
   case SOAP_TYPE_ICat3_ns1__deleteAuthorisation:
-    return soap_in_ns1__deleteAuthorisation(soap, NULL, NULL,
+    return soap_in_ns1__deleteAuthorisation(soap, nullptr, nullptr,
                                             "ns1:deleteAuthorisation");
   case SOAP_TYPE_ICat3_ns1__deletePublicationResponse:
     return soap_in_ns1__deletePublicationResponse(
-        soap, NULL, NULL, "ns1:deletePublicationResponse");
+        soap, nullptr, nullptr, "ns1:deletePublicationResponse");
   case SOAP_TYPE_ICat3_ns1__deletePublication:
-    return soap_in_ns1__deletePublication(soap, NULL, NULL,
+    return soap_in_ns1__deletePublication(soap, nullptr, nullptr,
                                           "ns1:deletePublication");
   case SOAP_TYPE_ICat3_ns1__loginResponse:
-    return soap_in_ns1__loginResponse(soap, NULL, NULL, "ns1:loginResponse");
+    return soap_in_ns1__loginResponse(soap, nullptr, nullptr,
+                                      "ns1:loginResponse");
   case SOAP_TYPE_ICat3_ns1__login:
-    return soap_in_ns1__login(soap, NULL, NULL, "ns1:login");
+    return soap_in_ns1__login(soap, nullptr, nullptr, "ns1:login");
   case SOAP_TYPE_ICat3_ns1__loginLifetimeResponse:
-    return soap_in_ns1__loginLifetimeResponse(soap, NULL, NULL,
+    return soap_in_ns1__loginLifetimeResponse(soap, nullptr, nullptr,
                                               "ns1:loginLifetimeResponse");
   case SOAP_TYPE_ICat3_ns1__loginLifetime:
-    return soap_in_ns1__loginLifetime(soap, NULL, NULL, "ns1:loginLifetime");
+    return soap_in_ns1__loginLifetime(soap, nullptr, nullptr,
+                                      "ns1:loginLifetime");
   case SOAP_TYPE_ICat3_ns1__getParameterByUnitsResponse:
     return soap_in_ns1__getParameterByUnitsResponse(
-        soap, NULL, NULL, "ns1:getParameterByUnitsResponse");
+        soap, nullptr, nullptr, "ns1:getParameterByUnitsResponse");
   case SOAP_TYPE_ICat3_ns1__getParameterByUnits:
-    return soap_in_ns1__getParameterByUnits(soap, NULL, NULL,
+    return soap_in_ns1__getParameterByUnits(soap, nullptr, nullptr,
                                             "ns1:getParameterByUnits");
   case SOAP_TYPE_ICat3_ns1__addSampleResponse:
-    return soap_in_ns1__addSampleResponse(soap, NULL, NULL,
+    return soap_in_ns1__addSampleResponse(soap, nullptr, nullptr,
                                           "ns1:addSampleResponse");
   case SOAP_TYPE_ICat3_ns1__addSample:
-    return soap_in_ns1__addSample(soap, NULL, NULL, "ns1:addSample");
+    return soap_in_ns1__addSample(soap, nullptr, nullptr, "ns1:addSample");
   case SOAP_TYPE_ICat3_ns1__addAuthorisationResponse:
     return soap_in_ns1__addAuthorisationResponse(
-        soap, NULL, NULL, "ns1:addAuthorisationResponse");
+        soap, nullptr, nullptr, "ns1:addAuthorisationResponse");
   case SOAP_TYPE_ICat3_ns1__addAuthorisation:
-    return soap_in_ns1__addAuthorisation(soap, NULL, NULL,
+    return soap_in_ns1__addAuthorisation(soap, nullptr, nullptr,
                                          "ns1:addAuthorisation");
   case SOAP_TYPE_ICat3_ns1__createDataFilesResponse:
-    return soap_in_ns1__createDataFilesResponse(soap, NULL, NULL,
+    return soap_in_ns1__createDataFilesResponse(soap, nullptr, nullptr,
                                                 "ns1:createDataFilesResponse");
   case SOAP_TYPE_ICat3_ns1__createDataFiles:
-    return soap_in_ns1__createDataFiles(soap, NULL, NULL,
+    return soap_in_ns1__createDataFiles(soap, nullptr, nullptr,
                                         "ns1:createDataFiles");
   case SOAP_TYPE_ICat3_ns1__addDataSetParameterResponse:
     return soap_in_ns1__addDataSetParameterResponse(
-        soap, NULL, NULL, "ns1:addDataSetParameterResponse");
+        soap, nullptr, nullptr, "ns1:addDataSetParameterResponse");
   case SOAP_TYPE_ICat3_ns1__addDataSetParameter:
-    return soap_in_ns1__addDataSetParameter(soap, NULL, NULL,
+    return soap_in_ns1__addDataSetParameter(soap, nullptr, nullptr,
                                             "ns1:addDataSetParameter");
   case SOAP_TYPE_ICat3_ns1__modifyInvestigatorResponse:
     return soap_in_ns1__modifyInvestigatorResponse(
-        soap, NULL, NULL, "ns1:modifyInvestigatorResponse");
+        soap, nullptr, nullptr, "ns1:modifyInvestigatorResponse");
   case SOAP_TYPE_ICat3_ns1__modifyInvestigator:
-    return soap_in_ns1__modifyInvestigator(soap, NULL, NULL,
+    return soap_in_ns1__modifyInvestigator(soap, nullptr, nullptr,
                                            "ns1:modifyInvestigator");
   case SOAP_TYPE_ICat3_ns1__modifySampleParameterResponse:
     return soap_in_ns1__modifySampleParameterResponse(
-        soap, NULL, NULL, "ns1:modifySampleParameterResponse");
+        soap, nullptr, nullptr, "ns1:modifySampleParameterResponse");
   case SOAP_TYPE_ICat3_ns1__modifySampleParameter:
-    return soap_in_ns1__modifySampleParameter(soap, NULL, NULL,
+    return soap_in_ns1__modifySampleParameter(soap, nullptr, nullptr,
                                               "ns1:modifySampleParameter");
   case SOAP_TYPE_ICat3_ns1__listDatafileFormatsResponse:
     return soap_in_ns1__listDatafileFormatsResponse(
-        soap, NULL, NULL, "ns1:listDatafileFormatsResponse");
+        soap, nullptr, nullptr, "ns1:listDatafileFormatsResponse");
   case SOAP_TYPE_ICat3_ns1__listDatafileFormats:
-    return soap_in_ns1__listDatafileFormats(soap, NULL, NULL,
+    return soap_in_ns1__listDatafileFormats(soap, nullptr, nullptr,
                                             "ns1:listDatafileFormats");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterResponse:
     return soap_in_ns1__searchInvestigationByParameterResponse(
-        soap, NULL, NULL, "ns1:searchInvestigationByParameterResponse");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByParameterResponse");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByParameter:
     return soap_in_ns1__searchInvestigationByParameter(
-        soap, NULL, NULL, "ns1:searchInvestigationByParameter");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByParameter");
   case SOAP_TYPE_ICat3_ns1__searchByAdvancedResponse:
     return soap_in_ns1__searchByAdvancedResponse(
-        soap, NULL, NULL, "ns1:searchByAdvancedResponse");
+        soap, nullptr, nullptr, "ns1:searchByAdvancedResponse");
   case SOAP_TYPE_ICat3_ns1__searchByAdvanced:
-    return soap_in_ns1__searchByAdvanced(soap, NULL, NULL,
+    return soap_in_ns1__searchByAdvanced(soap, nullptr, nullptr,
                                          "ns1:searchByAdvanced");
   case SOAP_TYPE_ICat3_ns1__searchByAdvancedPaginationResponse:
     return soap_in_ns1__searchByAdvancedPaginationResponse(
-        soap, NULL, NULL, "ns1:searchByAdvancedPaginationResponse");
+        soap, nullptr, nullptr, "ns1:searchByAdvancedPaginationResponse");
   case SOAP_TYPE_ICat3_ns1__advancedSearchDetails:
-    return soap_in_ns1__advancedSearchDetails(soap, NULL, NULL,
+    return soap_in_ns1__advancedSearchDetails(soap, nullptr, nullptr,
                                               "ns1:advancedSearchDetails");
   case SOAP_TYPE_ICat3_ns1__searchByAdvancedPagination:
     return soap_in_ns1__searchByAdvancedPagination(
-        soap, NULL, NULL, "ns1:searchByAdvancedPagination");
+        soap, nullptr, nullptr, "ns1:searchByAdvancedPagination");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByParameterComparisonResponse:
     return soap_in_ns1__searchDatafileByParameterComparisonResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterComparisonResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatafileByParameterComparisonResponse");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByParameterComparison:
     return soap_in_ns1__searchDatafileByParameterComparison(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterComparison");
+        soap, nullptr, nullptr, "ns1:searchDatafileByParameterComparison");
   case SOAP_TYPE_ICat3_ns1__searchByRunNumberResponse:
     return soap_in_ns1__searchByRunNumberResponse(
-        soap, NULL, NULL, "ns1:searchByRunNumberResponse");
+        soap, nullptr, nullptr, "ns1:searchByRunNumberResponse");
   case SOAP_TYPE_ICat3_ns1__searchByRunNumber:
-    return soap_in_ns1__searchByRunNumber(soap, NULL, NULL,
+    return soap_in_ns1__searchByRunNumber(soap, nullptr, nullptr,
                                           "ns1:searchByRunNumber");
   case SOAP_TYPE_ICat3_ns1__searchByRunNumberPaginationResponse:
     return soap_in_ns1__searchByRunNumberPaginationResponse(
-        soap, NULL, NULL, "ns1:searchByRunNumberPaginationResponse");
+        soap, nullptr, nullptr, "ns1:searchByRunNumberPaginationResponse");
   case SOAP_TYPE_ICat3_ns1__searchByRunNumberPagination:
     return soap_in_ns1__searchByRunNumberPagination(
-        soap, NULL, NULL, "ns1:searchByRunNumberPagination");
+        soap, nullptr, nullptr, "ns1:searchByRunNumberPagination");
   case SOAP_TYPE_ICat3_ns1__addDataSetParametersResponse:
     return soap_in_ns1__addDataSetParametersResponse(
-        soap, NULL, NULL, "ns1:addDataSetParametersResponse");
+        soap, nullptr, nullptr, "ns1:addDataSetParametersResponse");
   case SOAP_TYPE_ICat3_ns1__addDataSetParameters:
-    return soap_in_ns1__addDataSetParameters(soap, NULL, NULL,
+    return soap_in_ns1__addDataSetParameters(soap, nullptr, nullptr,
                                              "ns1:addDataSetParameters");
   case SOAP_TYPE_ICat3_ns1__deleteKeywordResponse:
-    return soap_in_ns1__deleteKeywordResponse(soap, NULL, NULL,
+    return soap_in_ns1__deleteKeywordResponse(soap, nullptr, nullptr,
                                               "ns1:deleteKeywordResponse");
   case SOAP_TYPE_ICat3_ns1__deleteKeyword:
-    return soap_in_ns1__deleteKeyword(soap, NULL, NULL, "ns1:deleteKeyword");
+    return soap_in_ns1__deleteKeyword(soap, nullptr, nullptr,
+                                      "ns1:deleteKeyword");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByParameterResponse:
     return soap_in_ns1__searchDatasetByParameterResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterResponse");
+        soap, nullptr, nullptr, "ns1:searchDatasetByParameterResponse");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByParameter:
     return soap_in_ns1__searchDatasetByParameter(
-        soap, NULL, NULL, "ns1:searchDatasetByParameter");
+        soap, nullptr, nullptr, "ns1:searchDatasetByParameter");
   case SOAP_TYPE_ICat3_ns1__deleteSampleResponse:
-    return soap_in_ns1__deleteSampleResponse(soap, NULL, NULL,
+    return soap_in_ns1__deleteSampleResponse(soap, nullptr, nullptr,
                                              "ns1:deleteSampleResponse");
   case SOAP_TYPE_ICat3_ns1__deleteSample:
-    return soap_in_ns1__deleteSample(soap, NULL, NULL, "ns1:deleteSample");
+    return soap_in_ns1__deleteSample(soap, nullptr, nullptr,
+                                     "ns1:deleteSample");
   case SOAP_TYPE_ICat3_ns1__listDatasetStatusResponse:
     return soap_in_ns1__listDatasetStatusResponse(
-        soap, NULL, NULL, "ns1:listDatasetStatusResponse");
+        soap, nullptr, nullptr, "ns1:listDatasetStatusResponse");
   case SOAP_TYPE_ICat3_ns1__listDatasetStatus:
-    return soap_in_ns1__listDatasetStatus(soap, NULL, NULL,
+    return soap_in_ns1__listDatasetStatus(soap, nullptr, nullptr,
                                           "ns1:listDatasetStatus");
   case SOAP_TYPE_ICat3_ns1__modifyInvestigationResponse:
     return soap_in_ns1__modifyInvestigationResponse(
-        soap, NULL, NULL, "ns1:modifyInvestigationResponse");
+        soap, nullptr, nullptr, "ns1:modifyInvestigationResponse");
   case SOAP_TYPE_ICat3_ns1__modifyInvestigation:
-    return soap_in_ns1__modifyInvestigation(soap, NULL, NULL,
+    return soap_in_ns1__modifyInvestigation(soap, nullptr, nullptr,
                                             "ns1:modifyInvestigation");
   case SOAP_TYPE_ICat3_ns1__icatAuthorisation:
-    return soap_in_ns1__icatAuthorisation(soap, NULL, NULL,
+    return soap_in_ns1__icatAuthorisation(soap, nullptr, nullptr,
                                           "ns1:icatAuthorisation");
   case SOAP_TYPE_ICat3_ns1__getAuthorisationsResponse:
     return soap_in_ns1__getAuthorisationsResponse(
-        soap, NULL, NULL, "ns1:getAuthorisationsResponse");
+        soap, nullptr, nullptr, "ns1:getAuthorisationsResponse");
   case SOAP_TYPE_ICat3_ns1__getAuthorisations:
-    return soap_in_ns1__getAuthorisations(soap, NULL, NULL,
+    return soap_in_ns1__getAuthorisations(soap, nullptr, nullptr,
                                           "ns1:getAuthorisations");
   case SOAP_TYPE_ICat3_ns1__addKeywordResponse:
-    return soap_in_ns1__addKeywordResponse(soap, NULL, NULL,
+    return soap_in_ns1__addKeywordResponse(soap, nullptr, nullptr,
                                            "ns1:addKeywordResponse");
   case SOAP_TYPE_ICat3_ns1__addKeyword:
-    return soap_in_ns1__addKeyword(soap, NULL, NULL, "ns1:addKeyword");
+    return soap_in_ns1__addKeyword(soap, nullptr, nullptr, "ns1:addKeyword");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionComparisonResponse:
     return soap_in_ns1__searchDatasetByRestrictionComparisonResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByRestrictionComparisonResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatasetByRestrictionComparisonResponse");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionComparison:
     return soap_in_ns1__searchDatasetByRestrictionComparison(
-        soap, NULL, NULL, "ns1:searchDatasetByRestrictionComparison");
+        soap, nullptr, nullptr, "ns1:searchDatasetByRestrictionComparison");
   case SOAP_TYPE_ICat3_ns1__searchSampleByParameterLogicalResponse:
     return soap_in_ns1__searchSampleByParameterLogicalResponse(
-        soap, NULL, NULL, "ns1:searchSampleByParameterLogicalResponse");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameterLogicalResponse");
   case SOAP_TYPE_ICat3_ns1__searchSampleByParameterLogical:
     return soap_in_ns1__searchSampleByParameterLogical(
-        soap, NULL, NULL, "ns1:searchSampleByParameterLogical");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameterLogical");
   case SOAP_TYPE_ICat3_ns1__removeDataSetResponse:
-    return soap_in_ns1__removeDataSetResponse(soap, NULL, NULL,
+    return soap_in_ns1__removeDataSetResponse(soap, nullptr, nullptr,
                                               "ns1:removeDataSetResponse");
   case SOAP_TYPE_ICat3_ns1__removeDataSet:
-    return soap_in_ns1__removeDataSet(soap, NULL, NULL, "ns1:removeDataSet");
+    return soap_in_ns1__removeDataSet(soap, nullptr, nullptr,
+                                      "ns1:removeDataSet");
   case SOAP_TYPE_ICat3_ns1__modifyDataSetParameterResponse:
     return soap_in_ns1__modifyDataSetParameterResponse(
-        soap, NULL, NULL, "ns1:modifyDataSetParameterResponse");
+        soap, nullptr, nullptr, "ns1:modifyDataSetParameterResponse");
   case SOAP_TYPE_ICat3_ns1__modifyDataSetParameter:
-    return soap_in_ns1__modifyDataSetParameter(soap, NULL, NULL,
+    return soap_in_ns1__modifyDataSetParameter(soap, nullptr, nullptr,
                                                "ns1:modifyDataSetParameter");
   case SOAP_TYPE_ICat3_ns1__listInvestigationTypesResponse:
     return soap_in_ns1__listInvestigationTypesResponse(
-        soap, NULL, NULL, "ns1:listInvestigationTypesResponse");
+        soap, nullptr, nullptr, "ns1:listInvestigationTypesResponse");
   case SOAP_TYPE_ICat3_ns1__listInvestigationTypes:
-    return soap_in_ns1__listInvestigationTypes(soap, NULL, NULL,
+    return soap_in_ns1__listInvestigationTypes(soap, nullptr, nullptr,
                                                "ns1:listInvestigationTypes");
   case SOAP_TYPE_ICat3_ns1__getKeywordsForUserResponse:
     return soap_in_ns1__getKeywordsForUserResponse(
-        soap, NULL, NULL, "ns1:getKeywordsForUserResponse");
+        soap, nullptr, nullptr, "ns1:getKeywordsForUserResponse");
   case SOAP_TYPE_ICat3_ns1__getKeywordsForUser:
-    return soap_in_ns1__getKeywordsForUser(soap, NULL, NULL,
+    return soap_in_ns1__getKeywordsForUser(soap, nullptr, nullptr,
                                            "ns1:getKeywordsForUser");
   case SOAP_TYPE_ICat3_ns1__getKeywordsForUserStartWithMaxResponse:
     return soap_in_ns1__getKeywordsForUserStartWithMaxResponse(
-        soap, NULL, NULL, "ns1:getKeywordsForUserStartWithMaxResponse");
+        soap, nullptr, nullptr, "ns1:getKeywordsForUserStartWithMaxResponse");
   case SOAP_TYPE_ICat3_ns1__getKeywordsForUserStartWithMax:
     return soap_in_ns1__getKeywordsForUserStartWithMax(
-        soap, NULL, NULL, "ns1:getKeywordsForUserStartWithMax");
+        soap, nullptr, nullptr, "ns1:getKeywordsForUserStartWithMax");
   case SOAP_TYPE_ICat3_ns1__getKeywordsForUserMaxResponse:
     return soap_in_ns1__getKeywordsForUserMaxResponse(
-        soap, NULL, NULL, "ns1:getKeywordsForUserMaxResponse");
+        soap, nullptr, nullptr, "ns1:getKeywordsForUserMaxResponse");
   case SOAP_TYPE_ICat3_ns1__getKeywordsForUserMax:
-    return soap_in_ns1__getKeywordsForUserMax(soap, NULL, NULL,
+    return soap_in_ns1__getKeywordsForUserMax(soap, nullptr, nullptr,
                                               "ns1:getKeywordsForUserMax");
   case SOAP_TYPE_ICat3_ns1__getKeywordsForUserTypeResponse:
     return soap_in_ns1__getKeywordsForUserTypeResponse(
-        soap, NULL, NULL, "ns1:getKeywordsForUserTypeResponse");
+        soap, nullptr, nullptr, "ns1:getKeywordsForUserTypeResponse");
   case SOAP_TYPE_ICat3_ns1__getKeywordsForUserType:
-    return soap_in_ns1__getKeywordsForUserType(soap, NULL, NULL,
+    return soap_in_ns1__getKeywordsForUserType(soap, nullptr, nullptr,
                                                "ns1:getKeywordsForUserType");
   case SOAP_TYPE_ICat3_ns1__getParameterByNameResponse:
     return soap_in_ns1__getParameterByNameResponse(
-        soap, NULL, NULL, "ns1:getParameterByNameResponse");
+        soap, nullptr, nullptr, "ns1:getParameterByNameResponse");
   case SOAP_TYPE_ICat3_ns1__getParameterByName:
-    return soap_in_ns1__getParameterByName(soap, NULL, NULL,
+    return soap_in_ns1__getParameterByName(soap, nullptr, nullptr,
                                            "ns1:getParameterByName");
   case SOAP_TYPE_ICat3_ns1__downloadDatafileResponse:
     return soap_in_ns1__downloadDatafileResponse(
-        soap, NULL, NULL, "ns1:downloadDatafileResponse");
+        soap, nullptr, nullptr, "ns1:downloadDatafileResponse");
   case SOAP_TYPE_ICat3_ns1__downloadDatafile:
-    return soap_in_ns1__downloadDatafile(soap, NULL, NULL,
+    return soap_in_ns1__downloadDatafile(soap, nullptr, nullptr,
                                          "ns1:downloadDatafile");
   case SOAP_TYPE_ICat3_ns1__setDataSetSampleResponse:
     return soap_in_ns1__setDataSetSampleResponse(
-        soap, NULL, NULL, "ns1:setDataSetSampleResponse");
+        soap, nullptr, nullptr, "ns1:setDataSetSampleResponse");
   case SOAP_TYPE_ICat3_ns1__setDataSetSample:
-    return soap_in_ns1__setDataSetSample(soap, NULL, NULL,
+    return soap_in_ns1__setDataSetSample(soap, nullptr, nullptr,
                                          "ns1:setDataSetSample");
   case SOAP_TYPE_ICat3_ns1__deleteDataSetParameterResponse:
     return soap_in_ns1__deleteDataSetParameterResponse(
-        soap, NULL, NULL, "ns1:deleteDataSetParameterResponse");
+        soap, nullptr, nullptr, "ns1:deleteDataSetParameterResponse");
   case SOAP_TYPE_ICat3_ns1__deleteDataSetParameter:
-    return soap_in_ns1__deleteDataSetParameter(soap, NULL, NULL,
+    return soap_in_ns1__deleteDataSetParameter(soap, nullptr, nullptr,
                                                "ns1:deleteDataSetParameter");
   case SOAP_TYPE_ICat3_ns1__removeSampleParameterResponse:
     return soap_in_ns1__removeSampleParameterResponse(
-        soap, NULL, NULL, "ns1:removeSampleParameterResponse");
+        soap, nullptr, nullptr, "ns1:removeSampleParameterResponse");
   case SOAP_TYPE_ICat3_ns1__removeSampleParameter:
-    return soap_in_ns1__removeSampleParameter(soap, NULL, NULL,
+    return soap_in_ns1__removeSampleParameter(soap, nullptr, nullptr,
                                               "ns1:removeSampleParameter");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionLogicalResponse:
     return soap_in_ns1__searchInvestigationByRestrictionLogicalResponse(
-        soap, NULL, NULL,
+        soap, nullptr, nullptr,
         "ns1:searchInvestigationByRestrictionLogicalResponse");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionLogical:
     return soap_in_ns1__searchInvestigationByRestrictionLogical(
-        soap, NULL, NULL, "ns1:searchInvestigationByRestrictionLogical");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByRestrictionLogical");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByParameterRestrictionResponse:
     return soap_in_ns1__searchDatafileByParameterRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterRestrictionResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatafileByParameterRestrictionResponse");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByParameterRestriction:
     return soap_in_ns1__searchDatafileByParameterRestriction(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterRestriction");
+        soap, nullptr, nullptr, "ns1:searchDatafileByParameterRestriction");
   case SOAP_TYPE_ICat3_ns1__createDataSetResponse:
-    return soap_in_ns1__createDataSetResponse(soap, NULL, NULL,
+    return soap_in_ns1__createDataSetResponse(soap, nullptr, nullptr,
                                               "ns1:createDataSetResponse");
   case SOAP_TYPE_ICat3_ns1__createDataSet:
-    return soap_in_ns1__createDataSet(soap, NULL, NULL, "ns1:createDataSet");
+    return soap_in_ns1__createDataSet(soap, nullptr, nullptr,
+                                      "ns1:createDataSet");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByParameterLogicalResponse:
     return soap_in_ns1__searchDatafileByParameterLogicalResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterLogicalResponse");
+        soap, nullptr, nullptr, "ns1:searchDatafileByParameterLogicalResponse");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByParameterLogical:
     return soap_in_ns1__searchDatafileByParameterLogical(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterLogical");
+        soap, nullptr, nullptr, "ns1:searchDatafileByParameterLogical");
   case SOAP_TYPE_ICat3_ns1__addInvestigatorResponse:
-    return soap_in_ns1__addInvestigatorResponse(soap, NULL, NULL,
+    return soap_in_ns1__addInvestigatorResponse(soap, nullptr, nullptr,
                                                 "ns1:addInvestigatorResponse");
   case SOAP_TYPE_ICat3_ns1__addInvestigator:
-    return soap_in_ns1__addInvestigator(soap, NULL, NULL,
+    return soap_in_ns1__addInvestigator(soap, nullptr, nullptr,
                                         "ns1:addInvestigator");
   case SOAP_TYPE_ICat3_ns1__deleteInvestigatorResponse:
     return soap_in_ns1__deleteInvestigatorResponse(
-        soap, NULL, NULL, "ns1:deleteInvestigatorResponse");
+        soap, nullptr, nullptr, "ns1:deleteInvestigatorResponse");
   case SOAP_TYPE_ICat3_ns1__deleteInvestigator:
-    return soap_in_ns1__deleteInvestigator(soap, NULL, NULL,
+    return soap_in_ns1__deleteInvestigator(soap, nullptr, nullptr,
                                            "ns1:deleteInvestigator");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionResponse:
     return soap_in_ns1__searchInvestigationByRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchInvestigationByRestrictionResponse");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByRestrictionResponse");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByRestriction:
     return soap_in_ns1__searchInvestigationByRestriction(
-        soap, NULL, NULL, "ns1:searchInvestigationByRestriction");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByRestriction");
   case SOAP_TYPE_ICat3_ns1__getICATAPIVersionResponse:
     return soap_in_ns1__getICATAPIVersionResponse(
-        soap, NULL, NULL, "ns1:getICATAPIVersionResponse");
+        soap, nullptr, nullptr, "ns1:getICATAPIVersionResponse");
   case SOAP_TYPE_ICat3_ns1__getICATAPIVersion:
-    return soap_in_ns1__getICATAPIVersion(soap, NULL, NULL,
+    return soap_in_ns1__getICATAPIVersion(soap, nullptr, nullptr,
                                           "ns1:getICATAPIVersion");
   case SOAP_TYPE_ICat3_ns1__getDatafilesResponse:
-    return soap_in_ns1__getDatafilesResponse(soap, NULL, NULL,
+    return soap_in_ns1__getDatafilesResponse(soap, nullptr, nullptr,
                                              "ns1:getDatafilesResponse");
   case SOAP_TYPE_ICat3_ns1__getDatafiles:
-    return soap_in_ns1__getDatafiles(soap, NULL, NULL, "ns1:getDatafiles");
+    return soap_in_ns1__getDatafiles(soap, nullptr, nullptr,
+                                     "ns1:getDatafiles");
   case SOAP_TYPE_ICat3_ns1__isSessionValidResponse:
-    return soap_in_ns1__isSessionValidResponse(soap, NULL, NULL,
+    return soap_in_ns1__isSessionValidResponse(soap, nullptr, nullptr,
                                                "ns1:isSessionValidResponse");
   case SOAP_TYPE_ICat3_ns1__isSessionValid:
-    return soap_in_ns1__isSessionValid(soap, NULL, NULL, "ns1:isSessionValid");
+    return soap_in_ns1__isSessionValid(soap, nullptr, nullptr,
+                                       "ns1:isSessionValid");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterComparisonResponse:
     return soap_in_ns1__searchInvestigationByParameterComparisonResponse(
-        soap, NULL, NULL,
+        soap, nullptr, nullptr,
         "ns1:searchInvestigationByParameterComparisonResponse");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterComparison:
     return soap_in_ns1__searchInvestigationByParameterComparison(
-        soap, NULL, NULL, "ns1:searchInvestigationByParameterComparison");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByParameterComparison");
   case SOAP_TYPE_ICat3_ns1__deleteDataSetResponse:
-    return soap_in_ns1__deleteDataSetResponse(soap, NULL, NULL,
+    return soap_in_ns1__deleteDataSetResponse(soap, nullptr, nullptr,
                                               "ns1:deleteDataSetResponse");
   case SOAP_TYPE_ICat3_ns1__deleteDataSet:
-    return soap_in_ns1__deleteDataSet(soap, NULL, NULL, "ns1:deleteDataSet");
+    return soap_in_ns1__deleteDataSet(soap, nullptr, nullptr,
+                                      "ns1:deleteDataSet");
   case SOAP_TYPE_ICat3_ns1__getInvestigationsResponse:
     return soap_in_ns1__getInvestigationsResponse(
-        soap, NULL, NULL, "ns1:getInvestigationsResponse");
+        soap, nullptr, nullptr, "ns1:getInvestigationsResponse");
   case SOAP_TYPE_ICat3_ns1__getInvestigations:
-    return soap_in_ns1__getInvestigations(soap, NULL, NULL,
+    return soap_in_ns1__getInvestigations(soap, nullptr, nullptr,
                                           "ns1:getInvestigations");
   case SOAP_TYPE_ICat3_ns1__getInvestigationsIncludesResponse:
     return soap_in_ns1__getInvestigationsIncludesResponse(
-        soap, NULL, NULL, "ns1:getInvestigationsIncludesResponse");
+        soap, nullptr, nullptr, "ns1:getInvestigationsIncludesResponse");
   case SOAP_TYPE_ICat3_ns1__getInvestigationsIncludes:
     return soap_in_ns1__getInvestigationsIncludes(
-        soap, NULL, NULL, "ns1:getInvestigationsIncludes");
+        soap, nullptr, nullptr, "ns1:getInvestigationsIncludes");
   case SOAP_TYPE_ICat3_ns1__searchSampleByParameterResponse:
     return soap_in_ns1__searchSampleByParameterResponse(
-        soap, NULL, NULL, "ns1:searchSampleByParameterResponse");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameterResponse");
   case SOAP_TYPE_ICat3_ns1__searchSampleByParameter:
-    return soap_in_ns1__searchSampleByParameter(soap, NULL, NULL,
+    return soap_in_ns1__searchSampleByParameter(soap, nullptr, nullptr,
                                                 "ns1:searchSampleByParameter");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByParameterConditionResponse:
     return soap_in_ns1__searchDatasetByParameterConditionResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterConditionResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatasetByParameterConditionResponse");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByParameterCondition:
     return soap_in_ns1__searchDatasetByParameterCondition(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterCondition");
+        soap, nullptr, nullptr, "ns1:searchDatasetByParameterCondition");
   case SOAP_TYPE_ICat3_ns1__removeDataFileParameterResponse:
     return soap_in_ns1__removeDataFileParameterResponse(
-        soap, NULL, NULL, "ns1:removeDataFileParameterResponse");
+        soap, nullptr, nullptr, "ns1:removeDataFileParameterResponse");
   case SOAP_TYPE_ICat3_ns1__removeDataFileParameter:
-    return soap_in_ns1__removeDataFileParameter(soap, NULL, NULL,
+    return soap_in_ns1__removeDataFileParameter(soap, nullptr, nullptr,
                                                 "ns1:removeDataFileParameter");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByParameterLogicalResponse:
     return soap_in_ns1__searchDatasetByParameterLogicalResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterLogicalResponse");
+        soap, nullptr, nullptr, "ns1:searchDatasetByParameterLogicalResponse");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByParameterLogical:
     return soap_in_ns1__searchDatasetByParameterLogical(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterLogical");
+        soap, nullptr, nullptr, "ns1:searchDatasetByParameterLogical");
   case SOAP_TYPE_ICat3_ns1__searchByUserIDPaginationResponse:
     return soap_in_ns1__searchByUserIDPaginationResponse(
-        soap, NULL, NULL, "ns1:searchByUserIDPaginationResponse");
+        soap, nullptr, nullptr, "ns1:searchByUserIDPaginationResponse");
   case SOAP_TYPE_ICat3_ns1__searchByUserIDPagination:
     return soap_in_ns1__searchByUserIDPagination(
-        soap, NULL, NULL, "ns1:searchByUserIDPagination");
+        soap, nullptr, nullptr, "ns1:searchByUserIDPagination");
   case SOAP_TYPE_ICat3_ns1__searchByUserIDResponse:
-    return soap_in_ns1__searchByUserIDResponse(soap, NULL, NULL,
+    return soap_in_ns1__searchByUserIDResponse(soap, nullptr, nullptr,
                                                "ns1:searchByUserIDResponse");
   case SOAP_TYPE_ICat3_ns1__searchByUserID:
-    return soap_in_ns1__searchByUserID(soap, NULL, NULL, "ns1:searchByUserID");
+    return soap_in_ns1__searchByUserID(soap, nullptr, nullptr,
+                                       "ns1:searchByUserID");
   case SOAP_TYPE_ICat3_ns1__modifyPublicationResponse:
     return soap_in_ns1__modifyPublicationResponse(
-        soap, NULL, NULL, "ns1:modifyPublicationResponse");
+        soap, nullptr, nullptr, "ns1:modifyPublicationResponse");
   case SOAP_TYPE_ICat3_ns1__modifyPublication:
-    return soap_in_ns1__modifyPublication(soap, NULL, NULL,
+    return soap_in_ns1__modifyPublication(soap, nullptr, nullptr,
                                           "ns1:modifyPublication");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterRestrictionResponse:
     return soap_in_ns1__searchInvestigationByParameterRestrictionResponse(
-        soap, NULL, NULL,
+        soap, nullptr, nullptr,
         "ns1:searchInvestigationByParameterRestrictionResponse");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterRestriction:
     return soap_in_ns1__searchInvestigationByParameterRestriction(
-        soap, NULL, NULL, "ns1:searchInvestigationByParameterRestriction");
+        soap, nullptr, nullptr,
+        "ns1:searchInvestigationByParameterRestriction");
   case SOAP_TYPE_ICat3_ns1__searchSampleByParameterConditionResponse:
     return soap_in_ns1__searchSampleByParameterConditionResponse(
-        soap, NULL, NULL, "ns1:searchSampleByParameterConditionResponse");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameterConditionResponse");
   case SOAP_TYPE_ICat3_ns1__searchSampleByParameterCondition:
     return soap_in_ns1__searchSampleByParameterCondition(
-        soap, NULL, NULL, "ns1:searchSampleByParameterCondition");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameterCondition");
   case SOAP_TYPE_ICat3_ns1__removeDataSetParameterResponse:
     return soap_in_ns1__removeDataSetParameterResponse(
-        soap, NULL, NULL, "ns1:removeDataSetParameterResponse");
+        soap, nullptr, nullptr, "ns1:removeDataSetParameterResponse");
   case SOAP_TYPE_ICat3_ns1__removeDataSetParameter:
-    return soap_in_ns1__removeDataSetParameter(soap, NULL, NULL,
+    return soap_in_ns1__removeDataSetParameter(soap, nullptr, nullptr,
                                                "ns1:removeDataSetParameter");
   case SOAP_TYPE_ICat3_ns1__searchSampleByParameterRestrictionResponse:
     return soap_in_ns1__searchSampleByParameterRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchSampleByParameterRestrictionResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchSampleByParameterRestrictionResponse");
   case SOAP_TYPE_ICat3_ns1__searchSampleByParameterRestriction:
     return soap_in_ns1__searchSampleByParameterRestriction(
-        soap, NULL, NULL, "ns1:searchSampleByParameterRestriction");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameterRestriction");
   case SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesPaginationResponse:
     return soap_in_ns1__getMyInvestigationsIncludesPaginationResponse(
-        soap, NULL, NULL, "ns1:getMyInvestigationsIncludesPaginationResponse");
+        soap, nullptr, nullptr,
+        "ns1:getMyInvestigationsIncludesPaginationResponse");
   case SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesPagination:
     return soap_in_ns1__getMyInvestigationsIncludesPagination(
-        soap, NULL, NULL, "ns1:getMyInvestigationsIncludesPagination");
+        soap, nullptr, nullptr, "ns1:getMyInvestigationsIncludesPagination");
   case SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesResponse:
     return soap_in_ns1__getMyInvestigationsIncludesResponse(
-        soap, NULL, NULL, "ns1:getMyInvestigationsIncludesResponse");
+        soap, nullptr, nullptr, "ns1:getMyInvestigationsIncludesResponse");
   case SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludes:
     return soap_in_ns1__getMyInvestigationsIncludes(
-        soap, NULL, NULL, "ns1:getMyInvestigationsIncludes");
+        soap, nullptr, nullptr, "ns1:getMyInvestigationsIncludes");
   case SOAP_TYPE_ICat3_ns1__getMyInvestigationsResponse:
     return soap_in_ns1__getMyInvestigationsResponse(
-        soap, NULL, NULL, "ns1:getMyInvestigationsResponse");
+        soap, nullptr, nullptr, "ns1:getMyInvestigationsResponse");
   case SOAP_TYPE_ICat3_ns1__getMyInvestigations:
-    return soap_in_ns1__getMyInvestigations(soap, NULL, NULL,
+    return soap_in_ns1__getMyInvestigations(soap, nullptr, nullptr,
                                             "ns1:getMyInvestigations");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionLogicalResponse:
     return soap_in_ns1__searchDatafileByRestrictionLogicalResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByRestrictionLogicalResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatafileByRestrictionLogicalResponse");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionLogical:
     return soap_in_ns1__searchDatafileByRestrictionLogical(
-        soap, NULL, NULL, "ns1:searchDatafileByRestrictionLogical");
+        soap, nullptr, nullptr, "ns1:searchDatafileByRestrictionLogical");
   case SOAP_TYPE_ICat3_ns1__getAllInstrumentsResponse:
     return soap_in_ns1__getAllInstrumentsResponse(
-        soap, NULL, NULL, "ns1:getAllInstrumentsResponse");
+        soap, nullptr, nullptr, "ns1:getAllInstrumentsResponse");
   case SOAP_TYPE_ICat3_ns1__getAllInstruments:
-    return soap_in_ns1__getAllInstruments(soap, NULL, NULL,
+    return soap_in_ns1__getAllInstruments(soap, nullptr, nullptr,
                                           "ns1:getAllInstruments");
   case SOAP_TYPE_ICat3_ns1__searchByKeywordsAllResponse:
     return soap_in_ns1__searchByKeywordsAllResponse(
-        soap, NULL, NULL, "ns1:searchByKeywordsAllResponse");
+        soap, nullptr, nullptr, "ns1:searchByKeywordsAllResponse");
   case SOAP_TYPE_ICat3_ns1__keywordDetails:
-    return soap_in_ns1__keywordDetails(soap, NULL, NULL, "ns1:keywordDetails");
+    return soap_in_ns1__keywordDetails(soap, nullptr, nullptr,
+                                       "ns1:keywordDetails");
   case SOAP_TYPE_ICat3_ns1__searchByKeywordsAll:
-    return soap_in_ns1__searchByKeywordsAll(soap, NULL, NULL,
+    return soap_in_ns1__searchByKeywordsAll(soap, nullptr, nullptr,
                                             "ns1:searchByKeywordsAll");
   case SOAP_TYPE_ICat3_ns1__searchByKeywordsResponse:
     return soap_in_ns1__searchByKeywordsResponse(
-        soap, NULL, NULL, "ns1:searchByKeywordsResponse");
+        soap, nullptr, nullptr, "ns1:searchByKeywordsResponse");
   case SOAP_TYPE_ICat3_ns1__searchByKeywords:
-    return soap_in_ns1__searchByKeywords(soap, NULL, NULL,
+    return soap_in_ns1__searchByKeywords(soap, nullptr, nullptr,
                                          "ns1:searchByKeywords");
   case SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccessResponse:
     return soap_in_ns1__checkDatasetDownloadAccessResponse(
-        soap, NULL, NULL, "ns1:checkDatasetDownloadAccessResponse");
+        soap, nullptr, nullptr, "ns1:checkDatasetDownloadAccessResponse");
   case SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccess:
     return soap_in_ns1__checkDatasetDownloadAccess(
-        soap, NULL, NULL, "ns1:checkDatasetDownloadAccess");
+        soap, nullptr, nullptr, "ns1:checkDatasetDownloadAccess");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByParameterConditionResponse:
     return soap_in_ns1__searchDatafileByParameterConditionResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterConditionResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatafileByParameterConditionResponse");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByParameterCondition:
     return soap_in_ns1__searchDatafileByParameterCondition(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterCondition");
+        soap, nullptr, nullptr, "ns1:searchDatafileByParameterCondition");
   case SOAP_TYPE_ICat3_ns1__searchByUserSurnamePaginationResponse:
     return soap_in_ns1__searchByUserSurnamePaginationResponse(
-        soap, NULL, NULL, "ns1:searchByUserSurnamePaginationResponse");
+        soap, nullptr, nullptr, "ns1:searchByUserSurnamePaginationResponse");
   case SOAP_TYPE_ICat3_ns1__searchByUserSurnamePagination:
     return soap_in_ns1__searchByUserSurnamePagination(
-        soap, NULL, NULL, "ns1:searchByUserSurnamePagination");
+        soap, nullptr, nullptr, "ns1:searchByUserSurnamePagination");
   case SOAP_TYPE_ICat3_ns1__shiftPK:
-    return soap_in_ns1__shiftPK(soap, NULL, NULL, "ns1:shiftPK");
+    return soap_in_ns1__shiftPK(soap, nullptr, nullptr, "ns1:shiftPK");
   case SOAP_TYPE_ICat3_ns1__shift:
-    return soap_in_ns1__shift(soap, NULL, NULL, "ns1:shift");
+    return soap_in_ns1__shift(soap, nullptr, nullptr, "ns1:shift");
   case SOAP_TYPE_ICat3_ns1__publication:
-    return soap_in_ns1__publication(soap, NULL, NULL, "ns1:publication");
+    return soap_in_ns1__publication(soap, nullptr, nullptr, "ns1:publication");
   case SOAP_TYPE_ICat3_ns1__keyword:
-    return soap_in_ns1__keyword(soap, NULL, NULL, "ns1:keyword");
+    return soap_in_ns1__keyword(soap, nullptr, nullptr, "ns1:keyword");
   case SOAP_TYPE_ICat3_ns1__investigator:
-    return soap_in_ns1__investigator(soap, NULL, NULL, "ns1:investigator");
+    return soap_in_ns1__investigator(soap, nullptr, nullptr,
+                                     "ns1:investigator");
   case SOAP_TYPE_ICat3_ns1__investigation:
-    return soap_in_ns1__investigation(soap, NULL, NULL, "ns1:investigation");
+    return soap_in_ns1__investigation(soap, nullptr, nullptr,
+                                      "ns1:investigation");
   case SOAP_TYPE_ICat3_ns1__searchByUserSurnameResponse:
     return soap_in_ns1__searchByUserSurnameResponse(
-        soap, NULL, NULL, "ns1:searchByUserSurnameResponse");
+        soap, nullptr, nullptr, "ns1:searchByUserSurnameResponse");
   case SOAP_TYPE_ICat3_ns1__searchByUserSurname:
-    return soap_in_ns1__searchByUserSurname(soap, NULL, NULL,
+    return soap_in_ns1__searchByUserSurname(soap, nullptr, nullptr,
                                             "ns1:searchByUserSurname");
   case SOAP_TYPE_ICat3_ns1__deleteDataFileResponse:
-    return soap_in_ns1__deleteDataFileResponse(soap, NULL, NULL,
+    return soap_in_ns1__deleteDataFileResponse(soap, nullptr, nullptr,
                                                "ns1:deleteDataFileResponse");
   case SOAP_TYPE_ICat3_ns1__deleteDataFile:
-    return soap_in_ns1__deleteDataFile(soap, NULL, NULL, "ns1:deleteDataFile");
+    return soap_in_ns1__deleteDataFile(soap, nullptr, nullptr,
+                                       "ns1:deleteDataFile");
   case SOAP_TYPE_ICat3_ns1__downloadInfo:
-    return soap_in_ns1__downloadInfo(soap, NULL, NULL, "ns1:downloadInfo");
+    return soap_in_ns1__downloadInfo(soap, nullptr, nullptr,
+                                     "ns1:downloadInfo");
   case SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccessResponse:
     return soap_in_ns1__checkDatafileDownloadAccessResponse(
-        soap, NULL, NULL, "ns1:checkDatafileDownloadAccessResponse");
+        soap, nullptr, nullptr, "ns1:checkDatafileDownloadAccessResponse");
   case SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccess:
     return soap_in_ns1__checkDatafileDownloadAccess(
-        soap, NULL, NULL, "ns1:checkDatafileDownloadAccess");
+        soap, nullptr, nullptr, "ns1:checkDatafileDownloadAccess");
   case SOAP_TYPE_ICat3_ns1__getFacilityUserByFacilityUserIdResponse:
     return soap_in_ns1__getFacilityUserByFacilityUserIdResponse(
-        soap, NULL, NULL, "ns1:getFacilityUserByFacilityUserIdResponse");
+        soap, nullptr, nullptr, "ns1:getFacilityUserByFacilityUserIdResponse");
   case SOAP_TYPE_ICat3_ns1__getFacilityUserByFacilityUserId:
     return soap_in_ns1__getFacilityUserByFacilityUserId(
-        soap, NULL, NULL, "ns1:getFacilityUserByFacilityUserId");
+        soap, nullptr, nullptr, "ns1:getFacilityUserByFacilityUserId");
   case SOAP_TYPE_ICat3_ns1__getFacilityCyclesWithDataForInstrumentResponse:
     return soap_in_ns1__getFacilityCyclesWithDataForInstrumentResponse(
-        soap, NULL, NULL, "ns1:getFacilityCyclesWithDataForInstrumentResponse");
+        soap, nullptr, nullptr,
+        "ns1:getFacilityCyclesWithDataForInstrumentResponse");
   case SOAP_TYPE_ICat3_ns1__getFacilityCyclesWithDataForInstrument:
     return soap_in_ns1__getFacilityCyclesWithDataForInstrument(
-        soap, NULL, NULL, "ns1:getFacilityCyclesWithDataForInstrument");
+        soap, nullptr, nullptr, "ns1:getFacilityCyclesWithDataForInstrument");
   case SOAP_TYPE_ICat3_ns1__addSampleParameterResponse:
     return soap_in_ns1__addSampleParameterResponse(
-        soap, NULL, NULL, "ns1:addSampleParameterResponse");
+        soap, nullptr, nullptr, "ns1:addSampleParameterResponse");
   case SOAP_TYPE_ICat3_ns1__addSampleParameter:
-    return soap_in_ns1__addSampleParameter(soap, NULL, NULL,
+    return soap_in_ns1__addSampleParameter(soap, nullptr, nullptr,
                                            "ns1:addSampleParameter");
   case SOAP_TYPE_ICat3_ns1__modifyDataSetResponse:
-    return soap_in_ns1__modifyDataSetResponse(soap, NULL, NULL,
+    return soap_in_ns1__modifyDataSetResponse(soap, nullptr, nullptr,
                                               "ns1:modifyDataSetResponse");
   case SOAP_TYPE_ICat3_ns1__modifyDataSet:
-    return soap_in_ns1__modifyDataSet(soap, NULL, NULL, "ns1:modifyDataSet");
+    return soap_in_ns1__modifyDataSet(soap, nullptr, nullptr,
+                                      "ns1:modifyDataSet");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByParameterComparisonResponse:
     return soap_in_ns1__searchDatasetByParameterComparisonResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterComparisonResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatasetByParameterComparisonResponse");
   case SOAP_TYPE_ICat3_ns1__parameterComparisonCondition:
     return soap_in_ns1__parameterComparisonCondition(
-        soap, NULL, NULL, "ns1:parameterComparisonCondition");
+        soap, nullptr, nullptr, "ns1:parameterComparisonCondition");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByParameterComparison:
     return soap_in_ns1__searchDatasetByParameterComparison(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterComparison");
+        soap, nullptr, nullptr, "ns1:searchDatasetByParameterComparison");
   case SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionResponse:
     return soap_in_ns1__searchSampleByRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchSampleByRestrictionResponse");
+        soap, nullptr, nullptr, "ns1:searchSampleByRestrictionResponse");
   case SOAP_TYPE_ICat3_ns1__searchSampleByRestriction:
     return soap_in_ns1__searchSampleByRestriction(
-        soap, NULL, NULL, "ns1:searchSampleByRestriction");
+        soap, nullptr, nullptr, "ns1:searchSampleByRestriction");
   case SOAP_TYPE_ICat3_ns1__downloadDatafilesResponse:
     return soap_in_ns1__downloadDatafilesResponse(
-        soap, NULL, NULL, "ns1:downloadDatafilesResponse");
+        soap, nullptr, nullptr, "ns1:downloadDatafilesResponse");
   case SOAP_TYPE_ICat3_ns1__downloadDatafiles:
-    return soap_in_ns1__downloadDatafiles(soap, NULL, NULL,
+    return soap_in_ns1__downloadDatafiles(soap, nullptr, nullptr,
                                           "ns1:downloadDatafiles");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterConditionResponse:
     return soap_in_ns1__searchInvestigationByParameterConditionResponse(
-        soap, NULL, NULL,
+        soap, nullptr, nullptr,
         "ns1:searchInvestigationByParameterConditionResponse");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterCondition:
     return soap_in_ns1__searchInvestigationByParameterCondition(
-        soap, NULL, NULL, "ns1:searchInvestigationByParameterCondition");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByParameterCondition");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByParameterResponse:
     return soap_in_ns1__searchDatafileByParameterResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterResponse");
+        soap, nullptr, nullptr, "ns1:searchDatafileByParameterResponse");
   case SOAP_TYPE_ICat3_ns1__parameterSearch:
-    return soap_in_ns1__parameterSearch(soap, NULL, NULL,
+    return soap_in_ns1__parameterSearch(soap, nullptr, nullptr,
                                         "ns1:parameterSearch");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByParameter:
     return soap_in_ns1__searchDatafileByParameter(
-        soap, NULL, NULL, "ns1:searchDatafileByParameter");
+        soap, nullptr, nullptr, "ns1:searchDatafileByParameter");
   case SOAP_TYPE_ICat3_ns1__userDetails:
-    return soap_in_ns1__userDetails(soap, NULL, NULL, "ns1:userDetails");
+    return soap_in_ns1__userDetails(soap, nullptr, nullptr, "ns1:userDetails");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionComparisonResponse:
     return soap_in_ns1__searchDatafileByRestrictionComparisonResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByRestrictionComparisonResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatafileByRestrictionComparisonResponse");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionComparison:
     return soap_in_ns1__searchDatafileByRestrictionComparison(
-        soap, NULL, NULL, "ns1:searchDatafileByRestrictionComparison");
+        soap, nullptr, nullptr, "ns1:searchDatafileByRestrictionComparison");
   case SOAP_TYPE_ICat3_ns1__getAllKeywordsResponse:
-    return soap_in_ns1__getAllKeywordsResponse(soap, NULL, NULL,
+    return soap_in_ns1__getAllKeywordsResponse(soap, nullptr, nullptr,
                                                "ns1:getAllKeywordsResponse");
   case SOAP_TYPE_ICat3_ns1__getAllKeywords:
-    return soap_in_ns1__getAllKeywords(soap, NULL, NULL, "ns1:getAllKeywords");
+    return soap_in_ns1__getAllKeywords(soap, nullptr, nullptr,
+                                       "ns1:getAllKeywords");
   case SOAP_TYPE_ICat3_ns1__removePublicationResponse:
     return soap_in_ns1__removePublicationResponse(
-        soap, NULL, NULL, "ns1:removePublicationResponse");
+        soap, nullptr, nullptr, "ns1:removePublicationResponse");
   case SOAP_TYPE_ICat3_ns1__removePublication:
-    return soap_in_ns1__removePublication(soap, NULL, NULL,
+    return soap_in_ns1__removePublication(soap, nullptr, nullptr,
                                           "ns1:removePublication");
   case SOAP_TYPE_ICat3_ns1__createDataSetsResponse:
-    return soap_in_ns1__createDataSetsResponse(soap, NULL, NULL,
+    return soap_in_ns1__createDataSetsResponse(soap, nullptr, nullptr,
                                                "ns1:createDataSetsResponse");
   case SOAP_TYPE_ICat3_ns1__datasetParameterPK:
-    return soap_in_ns1__datasetParameterPK(soap, NULL, NULL,
+    return soap_in_ns1__datasetParameterPK(soap, nullptr, nullptr,
                                            "ns1:datasetParameterPK");
   case SOAP_TYPE_ICat3_ns1__datasetParameter:
-    return soap_in_ns1__datasetParameter(soap, NULL, NULL,
+    return soap_in_ns1__datasetParameter(soap, nullptr, nullptr,
                                          "ns1:datasetParameter");
   case SOAP_TYPE_ICat3_ns1__dataset:
-    return soap_in_ns1__dataset(soap, NULL, NULL, "ns1:dataset");
+    return soap_in_ns1__dataset(soap, nullptr, nullptr, "ns1:dataset");
   case SOAP_TYPE_ICat3_ns1__createDataSets:
-    return soap_in_ns1__createDataSets(soap, NULL, NULL, "ns1:createDataSets");
+    return soap_in_ns1__createDataSets(soap, nullptr, nullptr,
+                                       "ns1:createDataSets");
   case SOAP_TYPE_ICat3_ns1__deleteInvestigationResponse:
     return soap_in_ns1__deleteInvestigationResponse(
-        soap, NULL, NULL, "ns1:deleteInvestigationResponse");
+        soap, nullptr, nullptr, "ns1:deleteInvestigationResponse");
   case SOAP_TYPE_ICat3_ns1__deleteInvestigation:
-    return soap_in_ns1__deleteInvestigation(soap, NULL, NULL,
+    return soap_in_ns1__deleteInvestigation(soap, nullptr, nullptr,
                                             "ns1:deleteInvestigation");
   case SOAP_TYPE_ICat3_ns1__removeKeywordResponse:
-    return soap_in_ns1__removeKeywordResponse(soap, NULL, NULL,
+    return soap_in_ns1__removeKeywordResponse(soap, nullptr, nullptr,
                                               "ns1:removeKeywordResponse");
   case SOAP_TYPE_ICat3_ns1__keywordPK:
-    return soap_in_ns1__keywordPK(soap, NULL, NULL, "ns1:keywordPK");
+    return soap_in_ns1__keywordPK(soap, nullptr, nullptr, "ns1:keywordPK");
   case SOAP_TYPE_ICat3_ns1__removeKeyword:
-    return soap_in_ns1__removeKeyword(soap, NULL, NULL, "ns1:removeKeyword");
+    return soap_in_ns1__removeKeyword(soap, nullptr, nullptr,
+                                      "ns1:removeKeyword");
   case SOAP_TYPE_ICat3_ns1__getParameterByRestrictionResponse:
     return soap_in_ns1__getParameterByRestrictionResponse(
-        soap, NULL, NULL, "ns1:getParameterByRestrictionResponse");
+        soap, nullptr, nullptr, "ns1:getParameterByRestrictionResponse");
   case SOAP_TYPE_ICat3_ns1__getParameterByRestriction:
     return soap_in_ns1__getParameterByRestriction(
-        soap, NULL, NULL, "ns1:getParameterByRestriction");
+        soap, nullptr, nullptr, "ns1:getParameterByRestriction");
   case SOAP_TYPE_ICat3_ns1__removeInvestigatorResponse:
     return soap_in_ns1__removeInvestigatorResponse(
-        soap, NULL, NULL, "ns1:removeInvestigatorResponse");
+        soap, nullptr, nullptr, "ns1:removeInvestigatorResponse");
   case SOAP_TYPE_ICat3_ns1__investigatorPK:
-    return soap_in_ns1__investigatorPK(soap, NULL, NULL, "ns1:investigatorPK");
+    return soap_in_ns1__investigatorPK(soap, nullptr, nullptr,
+                                       "ns1:investigatorPK");
   case SOAP_TYPE_ICat3_ns1__removeInvestigator:
-    return soap_in_ns1__removeInvestigator(soap, NULL, NULL,
+    return soap_in_ns1__removeInvestigator(soap, nullptr, nullptr,
                                            "ns1:removeInvestigator");
   case SOAP_TYPE_ICat3_ns1__removeInvestigationResponse:
     return soap_in_ns1__removeInvestigationResponse(
-        soap, NULL, NULL, "ns1:removeInvestigationResponse");
+        soap, nullptr, nullptr, "ns1:removeInvestigationResponse");
   case SOAP_TYPE_ICat3_ns1__removeInvestigation:
-    return soap_in_ns1__removeInvestigation(soap, NULL, NULL,
+    return soap_in_ns1__removeInvestigation(soap, nullptr, nullptr,
                                             "ns1:removeInvestigation");
   case SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalIdResponse:
     return soap_in_ns1__getFacilityUserByFederalIdResponse(
-        soap, NULL, NULL, "ns1:getFacilityUserByFederalIdResponse");
+        soap, nullptr, nullptr, "ns1:getFacilityUserByFederalIdResponse");
   case SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalId:
     return soap_in_ns1__getFacilityUserByFederalId(
-        soap, NULL, NULL, "ns1:getFacilityUserByFederalId");
+        soap, nullptr, nullptr, "ns1:getFacilityUserByFederalId");
   case SOAP_TYPE_ICat3_ns1__downloadDatasetResponse:
-    return soap_in_ns1__downloadDatasetResponse(soap, NULL, NULL,
+    return soap_in_ns1__downloadDatasetResponse(soap, nullptr, nullptr,
                                                 "ns1:downloadDatasetResponse");
   case SOAP_TYPE_ICat3_ns1__downloadDataset:
-    return soap_in_ns1__downloadDataset(soap, NULL, NULL,
+    return soap_in_ns1__downloadDataset(soap, nullptr, nullptr,
                                         "ns1:downloadDataset");
   case SOAP_TYPE_ICat3_ns1__instrument:
-    return soap_in_ns1__instrument(soap, NULL, NULL, "ns1:instrument");
+    return soap_in_ns1__instrument(soap, nullptr, nullptr, "ns1:instrument");
   case SOAP_TYPE_ICat3_ns1__getInstrumentsWithDataResponse:
     return soap_in_ns1__getInstrumentsWithDataResponse(
-        soap, NULL, NULL, "ns1:getInstrumentsWithDataResponse");
+        soap, nullptr, nullptr, "ns1:getInstrumentsWithDataResponse");
   case SOAP_TYPE_ICat3_ns1__getInstrumentsWithData:
-    return soap_in_ns1__getInstrumentsWithData(soap, NULL, NULL,
+    return soap_in_ns1__getInstrumentsWithData(soap, nullptr, nullptr,
                                                "ns1:getInstrumentsWithData");
   case SOAP_TYPE_ICat3_ns1__logoutResponse:
-    return soap_in_ns1__logoutResponse(soap, NULL, NULL, "ns1:logoutResponse");
+    return soap_in_ns1__logoutResponse(soap, nullptr, nullptr,
+                                       "ns1:logoutResponse");
   case SOAP_TYPE_ICat3_ns1__logout:
-    return soap_in_ns1__logout(soap, NULL, NULL, "ns1:logout");
+    return soap_in_ns1__logout(soap, nullptr, nullptr, "ns1:logout");
   case SOAP_TYPE_ICat3_ns1__addDataFileParametersResponse:
     return soap_in_ns1__addDataFileParametersResponse(
-        soap, NULL, NULL, "ns1:addDataFileParametersResponse");
+        soap, nullptr, nullptr, "ns1:addDataFileParametersResponse");
   case SOAP_TYPE_ICat3_ns1__addDataFileParameters:
-    return soap_in_ns1__addDataFileParameters(soap, NULL, NULL,
+    return soap_in_ns1__addDataFileParameters(soap, nullptr, nullptr,
                                               "ns1:addDataFileParameters");
   case SOAP_TYPE_ICat3_ns1__facilityCycle:
-    return soap_in_ns1__facilityCycle(soap, NULL, NULL, "ns1:facilityCycle");
+    return soap_in_ns1__facilityCycle(soap, nullptr, nullptr,
+                                      "ns1:facilityCycle");
   case SOAP_TYPE_ICat3_ns1__listFacilityCyclesResponse:
     return soap_in_ns1__listFacilityCyclesResponse(
-        soap, NULL, NULL, "ns1:listFacilityCyclesResponse");
+        soap, nullptr, nullptr, "ns1:listFacilityCyclesResponse");
   case SOAP_TYPE_ICat3_ns1__listFacilityCycles:
-    return soap_in_ns1__listFacilityCycles(soap, NULL, NULL,
+    return soap_in_ns1__listFacilityCycles(soap, nullptr, nullptr,
                                            "ns1:listFacilityCycles");
   case SOAP_TYPE_ICat3_ns1__removeAuthorisationResponse:
     return soap_in_ns1__removeAuthorisationResponse(
-        soap, NULL, NULL, "ns1:removeAuthorisationResponse");
+        soap, nullptr, nullptr, "ns1:removeAuthorisationResponse");
   case SOAP_TYPE_ICat3_ns1__removeAuthorisation:
-    return soap_in_ns1__removeAuthorisation(soap, NULL, NULL,
+    return soap_in_ns1__removeAuthorisation(soap, nullptr, nullptr,
                                             "ns1:removeAuthorisation");
   case SOAP_TYPE_ICat3_ns1__removeDataFileResponse:
-    return soap_in_ns1__removeDataFileResponse(soap, NULL, NULL,
+    return soap_in_ns1__removeDataFileResponse(soap, nullptr, nullptr,
                                                "ns1:removeDataFileResponse");
   case SOAP_TYPE_ICat3_ns1__removeDataFile:
-    return soap_in_ns1__removeDataFile(soap, NULL, NULL, "ns1:removeDataFile");
+    return soap_in_ns1__removeDataFile(soap, nullptr, nullptr,
+                                       "ns1:removeDataFile");
   case SOAP_TYPE_ICat3_ns1__parameterPK:
-    return soap_in_ns1__parameterPK(soap, NULL, NULL, "ns1:parameterPK");
+    return soap_in_ns1__parameterPK(soap, nullptr, nullptr, "ns1:parameterPK");
   case SOAP_TYPE_ICat3_ns1__parameter:
-    return soap_in_ns1__parameter(soap, NULL, NULL, "ns1:parameter");
+    return soap_in_ns1__parameter(soap, nullptr, nullptr, "ns1:parameter");
   case SOAP_TYPE_ICat3_ns1__getParameterByNameUnitsResponse:
     return soap_in_ns1__getParameterByNameUnitsResponse(
-        soap, NULL, NULL, "ns1:getParameterByNameUnitsResponse");
+        soap, nullptr, nullptr, "ns1:getParameterByNameUnitsResponse");
   case SOAP_TYPE_ICat3_ns1__getParameterByNameUnits:
-    return soap_in_ns1__getParameterByNameUnits(soap, NULL, NULL,
+    return soap_in_ns1__getParameterByNameUnits(soap, nullptr, nullptr,
                                                 "ns1:getParameterByNameUnits");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterLogicalResponse:
     return soap_in_ns1__searchInvestigationByParameterLogicalResponse(
-        soap, NULL, NULL, "ns1:searchInvestigationByParameterLogicalResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchInvestigationByParameterLogicalResponse");
   case SOAP_TYPE_ICat3_ns1__parameterLogicalCondition:
     return soap_in_ns1__parameterLogicalCondition(
-        soap, NULL, NULL, "ns1:parameterLogicalCondition");
+        soap, nullptr, nullptr, "ns1:parameterLogicalCondition");
   case SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterLogical:
     return soap_in_ns1__searchInvestigationByParameterLogical(
-        soap, NULL, NULL, "ns1:searchInvestigationByParameterLogical");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByParameterLogical");
   case SOAP_TYPE_ICat3_ns1__modifySampleResponse:
-    return soap_in_ns1__modifySampleResponse(soap, NULL, NULL,
+    return soap_in_ns1__modifySampleResponse(soap, nullptr, nullptr,
                                              "ns1:modifySampleResponse");
   case SOAP_TYPE_ICat3_ns1__modifySample:
-    return soap_in_ns1__modifySample(soap, NULL, NULL, "ns1:modifySample");
+    return soap_in_ns1__modifySample(soap, nullptr, nullptr,
+                                     "ns1:modifySample");
   case SOAP_TYPE_ICat3_ns1__createDataFileResponse:
-    return soap_in_ns1__createDataFileResponse(soap, NULL, NULL,
+    return soap_in_ns1__createDataFileResponse(soap, nullptr, nullptr,
                                                "ns1:createDataFileResponse");
   case SOAP_TYPE_ICat3_ns1__relatedDatafilesPK:
-    return soap_in_ns1__relatedDatafilesPK(soap, NULL, NULL,
+    return soap_in_ns1__relatedDatafilesPK(soap, nullptr, nullptr,
                                            "ns1:relatedDatafilesPK");
   case SOAP_TYPE_ICat3_ns1__relatedDatafiles:
-    return soap_in_ns1__relatedDatafiles(soap, NULL, NULL,
+    return soap_in_ns1__relatedDatafiles(soap, nullptr, nullptr,
                                          "ns1:relatedDatafiles");
   case SOAP_TYPE_ICat3_ns1__datafileParameterPK:
-    return soap_in_ns1__datafileParameterPK(soap, NULL, NULL,
+    return soap_in_ns1__datafileParameterPK(soap, nullptr, nullptr,
                                             "ns1:datafileParameterPK");
   case SOAP_TYPE_ICat3_ns1__datafileParameter:
-    return soap_in_ns1__datafileParameter(soap, NULL, NULL,
+    return soap_in_ns1__datafileParameter(soap, nullptr, nullptr,
                                           "ns1:datafileParameter");
   case SOAP_TYPE_ICat3_ns1__datafileFormatPK:
-    return soap_in_ns1__datafileFormatPK(soap, NULL, NULL,
+    return soap_in_ns1__datafileFormatPK(soap, nullptr, nullptr,
                                          "ns1:datafileFormatPK");
   case SOAP_TYPE_ICat3_ns1__datafileFormat:
-    return soap_in_ns1__datafileFormat(soap, NULL, NULL, "ns1:datafileFormat");
+    return soap_in_ns1__datafileFormat(soap, nullptr, nullptr,
+                                       "ns1:datafileFormat");
   case SOAP_TYPE_ICat3_ns1__datafile:
-    return soap_in_ns1__datafile(soap, NULL, NULL, "ns1:datafile");
+    return soap_in_ns1__datafile(soap, nullptr, nullptr, "ns1:datafile");
   case SOAP_TYPE_ICat3_ns1__createDataFile:
-    return soap_in_ns1__createDataFile(soap, NULL, NULL, "ns1:createDataFile");
+    return soap_in_ns1__createDataFile(soap, nullptr, nullptr,
+                                       "ns1:createDataFile");
   case SOAP_TYPE_ICat3_ns1__InsufficientPrivilegesException:
     return soap_in_ns1__InsufficientPrivilegesException(
-        soap, NULL, NULL, "ns1:InsufficientPrivilegesException");
+        soap, nullptr, nullptr, "ns1:InsufficientPrivilegesException");
   case SOAP_TYPE_ICat3_ns1__removeSampleResponse:
-    return soap_in_ns1__removeSampleResponse(soap, NULL, NULL,
+    return soap_in_ns1__removeSampleResponse(soap, nullptr, nullptr,
                                              "ns1:removeSampleResponse");
   case SOAP_TYPE_ICat3_ns1__removeSample:
-    return soap_in_ns1__removeSample(soap, NULL, NULL, "ns1:removeSample");
+    return soap_in_ns1__removeSample(soap, nullptr, nullptr,
+                                     "ns1:removeSample");
   case SOAP_TYPE_ICat3_ns1__listInstrumentsResponse:
-    return soap_in_ns1__listInstrumentsResponse(soap, NULL, NULL,
+    return soap_in_ns1__listInstrumentsResponse(soap, nullptr, nullptr,
                                                 "ns1:listInstrumentsResponse");
   case SOAP_TYPE_ICat3_ns1__listInstruments:
-    return soap_in_ns1__listInstruments(soap, NULL, NULL,
+    return soap_in_ns1__listInstruments(soap, nullptr, nullptr,
                                         "ns1:listInstruments");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionResponse:
     return soap_in_ns1__searchDatafileByRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByRestrictionResponse");
+        soap, nullptr, nullptr, "ns1:searchDatafileByRestrictionResponse");
   case SOAP_TYPE_ICat3_ns1__searchDatafileByRestriction:
     return soap_in_ns1__searchDatafileByRestriction(
-        soap, NULL, NULL, "ns1:searchDatafileByRestriction");
+        soap, nullptr, nullptr, "ns1:searchDatafileByRestriction");
   case SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionComparisonResponse:
     return soap_in_ns1__searchSampleByRestrictionComparisonResponse(
-        soap, NULL, NULL, "ns1:searchSampleByRestrictionComparisonResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchSampleByRestrictionComparisonResponse");
   case SOAP_TYPE_ICat3_ns1__restrictionComparisonCondition:
     return soap_in_ns1__restrictionComparisonCondition(
-        soap, NULL, NULL, "ns1:restrictionComparisonCondition");
+        soap, nullptr, nullptr, "ns1:restrictionComparisonCondition");
   case SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionComparison:
     return soap_in_ns1__searchSampleByRestrictionComparison(
-        soap, NULL, NULL, "ns1:searchSampleByRestrictionComparison");
+        soap, nullptr, nullptr, "ns1:searchSampleByRestrictionComparison");
   case SOAP_TYPE_ICat3_ns1__entityPrimaryKeyBaseBean:
     return soap_in_ns1__entityPrimaryKeyBaseBean(
-        soap, NULL, NULL, "ns1:entityPrimaryKeyBaseBean");
+        soap, nullptr, nullptr, "ns1:entityPrimaryKeyBaseBean");
   case SOAP_TYPE_ICat3_ns1__sampleParameterPK:
-    return soap_in_ns1__sampleParameterPK(soap, NULL, NULL,
+    return soap_in_ns1__sampleParameterPK(soap, nullptr, nullptr,
                                           "ns1:sampleParameterPK");
   case SOAP_TYPE_ICat3_ns1__sampleParameter:
-    return soap_in_ns1__sampleParameter(soap, NULL, NULL,
+    return soap_in_ns1__sampleParameter(soap, nullptr, nullptr,
                                         "ns1:sampleParameter");
   case SOAP_TYPE_ICat3_ns1__sample:
-    return soap_in_ns1__sample(soap, NULL, NULL, "ns1:sample");
+    return soap_in_ns1__sample(soap, nullptr, nullptr, "ns1:sample");
   case SOAP_TYPE_ICat3_ns1__searchSamplesBySampleNameResponse:
     return soap_in_ns1__searchSamplesBySampleNameResponse(
-        soap, NULL, NULL, "ns1:searchSamplesBySampleNameResponse");
+        soap, nullptr, nullptr, "ns1:searchSamplesBySampleNameResponse");
   case SOAP_TYPE_ICat3_ns1__searchSamplesBySampleName:
     return soap_in_ns1__searchSamplesBySampleName(
-        soap, NULL, NULL, "ns1:searchSamplesBySampleName");
+        soap, nullptr, nullptr, "ns1:searchSamplesBySampleName");
   case SOAP_TYPE_ICat3_ns1__icatRole:
-    return soap_in_ns1__icatRole(soap, NULL, NULL, "ns1:icatRole");
+    return soap_in_ns1__icatRole(soap, nullptr, nullptr, "ns1:icatRole");
   case SOAP_TYPE_ICat3_ns1__entityBaseBean:
-    return soap_in_ns1__entityBaseBean(soap, NULL, NULL, "ns1:entityBaseBean");
+    return soap_in_ns1__entityBaseBean(soap, nullptr, nullptr,
+                                       "ns1:entityBaseBean");
   case SOAP_TYPE_ICat3_ns1__facilityUser:
-    return soap_in_ns1__facilityUser(soap, NULL, NULL, "ns1:facilityUser");
+    return soap_in_ns1__facilityUser(soap, nullptr, nullptr,
+                                     "ns1:facilityUser");
   case SOAP_TYPE_ICat3_ns1__searchFacilityUserByRestrictionResponse:
     return soap_in_ns1__searchFacilityUserByRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchFacilityUserByRestrictionResponse");
+        soap, nullptr, nullptr, "ns1:searchFacilityUserByRestrictionResponse");
   case SOAP_TYPE_ICat3_ns1__searchFacilityUserByRestriction:
     return soap_in_ns1__searchFacilityUserByRestriction(
-        soap, NULL, NULL, "ns1:searchFacilityUserByRestriction");
+        soap, nullptr, nullptr, "ns1:searchFacilityUserByRestriction");
   case SOAP_TYPE_ICat3_ns1__listDatasetTypesResponse:
     return soap_in_ns1__listDatasetTypesResponse(
-        soap, NULL, NULL, "ns1:listDatasetTypesResponse");
+        soap, nullptr, nullptr, "ns1:listDatasetTypesResponse");
   case SOAP_TYPE_ICat3_ns1__listDatasetTypes:
-    return soap_in_ns1__listDatasetTypes(soap, NULL, NULL,
+    return soap_in_ns1__listDatasetTypes(soap, nullptr, nullptr,
                                          "ns1:listDatasetTypes");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByParameterRestrictionResponse:
     return soap_in_ns1__searchDatasetByParameterRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterRestrictionResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatasetByParameterRestrictionResponse");
   case SOAP_TYPE_ICat3_ns1__parameterCondition:
-    return soap_in_ns1__parameterCondition(soap, NULL, NULL,
+    return soap_in_ns1__parameterCondition(soap, nullptr, nullptr,
                                            "ns1:parameterCondition");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByParameterRestriction:
     return soap_in_ns1__searchDatasetByParameterRestriction(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterRestriction");
+        soap, nullptr, nullptr, "ns1:searchDatasetByParameterRestriction");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionLogicalResponse:
     return soap_in_ns1__searchDatasetByRestrictionLogicalResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByRestrictionLogicalResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatasetByRestrictionLogicalResponse");
   case SOAP_TYPE_ICat3_ns1__condition:
-    return soap_in_ns1__condition(soap, NULL, NULL, "ns1:condition");
+    return soap_in_ns1__condition(soap, nullptr, nullptr, "ns1:condition");
   case SOAP_TYPE_ICat3_ns1__restrictionCondition:
-    return soap_in_ns1__restrictionCondition(soap, NULL, NULL,
+    return soap_in_ns1__restrictionCondition(soap, nullptr, nullptr,
                                              "ns1:restrictionCondition");
   case SOAP_TYPE_ICat3_ns1__restrictionLogicalCondition:
     return soap_in_ns1__restrictionLogicalCondition(
-        soap, NULL, NULL, "ns1:restrictionLogicalCondition");
+        soap, nullptr, nullptr, "ns1:restrictionLogicalCondition");
   case SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionLogical:
     return soap_in_ns1__searchDatasetByRestrictionLogical(
-        soap, NULL, NULL, "ns1:searchDatasetByRestrictionLogical");
+        soap, nullptr, nullptr, "ns1:searchDatasetByRestrictionLogical");
   case SOAP_TYPE_ICat3_std__string:
-    return soap_in_std__string(soap, NULL, NULL, "xsd:string");
+    return soap_in_std__string(soap, nullptr, nullptr, "xsd:string");
   case SOAP_TYPE_ICat3_xsd__string:
-    return soap_in_xsd__string(soap, NULL, NULL, "xsd:string");
+    return soap_in_xsd__string(soap, nullptr, nullptr, "xsd:string");
   case SOAP_TYPE_ICat3_xsd__long:
-    return soap_in_xsd__long(soap, NULL, NULL, "xsd:long");
+    return soap_in_xsd__long(soap, nullptr, nullptr, "xsd:long");
   case SOAP_TYPE_ICat3_xsd__int:
-    return soap_in_xsd__int(soap, NULL, NULL, "xsd:int");
+    return soap_in_xsd__int(soap, nullptr, nullptr, "xsd:int");
   case SOAP_TYPE_ICat3_xsd__float:
-    return soap_in_xsd__float(soap, NULL, NULL, "xsd:float");
+    return soap_in_xsd__float(soap, nullptr, nullptr, "xsd:float");
   case SOAP_TYPE_ICat3_xsd__double:
-    return soap_in_xsd__double(soap, NULL, NULL, "xsd:double");
+    return soap_in_xsd__double(soap, nullptr, nullptr, "xsd:double");
   case SOAP_TYPE_ICat3_xsd__dateTime:
-    return soap_in_xsd__dateTime(soap, NULL, NULL, "xsd:dateTime");
+    return soap_in_xsd__dateTime(soap, nullptr, nullptr, "xsd:dateTime");
   case SOAP_TYPE_ICat3_xsd__boolean:
-    return soap_in_xsd__boolean(soap, NULL, NULL, "xsd:boolean");
+    return soap_in_xsd__boolean(soap, nullptr, nullptr, "xsd:boolean");
   case SOAP_TYPE_ICat3_xsd__anyType:
-    return soap_in_xsd__anyType(soap, NULL, NULL, "xsd:anyType");
+    return soap_in_xsd__anyType(soap, nullptr, nullptr, "xsd:anyType");
   case SOAP_TYPE_ICat3_PointerTons1__searchFacilityUserByRestrictionResponse:
     return soap_in_PointerTons1__searchFacilityUserByRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchFacilityUserByRestrictionResponse");
+        soap, nullptr, nullptr, "ns1:searchFacilityUserByRestrictionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchFacilityUserByRestriction:
     return soap_in_PointerTons1__searchFacilityUserByRestriction(
-        soap, NULL, NULL, "ns1:searchFacilityUserByRestriction");
+        soap, nullptr, nullptr, "ns1:searchFacilityUserByRestriction");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterLogicalResponse:
     return soap_in_PointerTons1__searchSampleByParameterLogicalResponse(
-        soap, NULL, NULL, "ns1:searchSampleByParameterLogicalResponse");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameterLogicalResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterLogical:
     return soap_in_PointerTons1__searchSampleByParameterLogical(
-        soap, NULL, NULL, "ns1:searchSampleByParameterLogical");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameterLogical");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterLogicalResponse:
     return soap_in_PointerTons1__searchDatasetByParameterLogicalResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterLogicalResponse");
+        soap, nullptr, nullptr, "ns1:searchDatasetByParameterLogicalResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterLogical:
     return soap_in_PointerTons1__searchDatasetByParameterLogical(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterLogical");
+        soap, nullptr, nullptr, "ns1:searchDatasetByParameterLogical");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterLogicalResponse:
     return soap_in_PointerTons1__searchDatafileByParameterLogicalResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterLogicalResponse");
+        soap, nullptr, nullptr, "ns1:searchDatafileByParameterLogicalResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterLogical:
     return soap_in_PointerTons1__searchDatafileByParameterLogical(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterLogical");
+        soap, nullptr, nullptr, "ns1:searchDatafileByParameterLogical");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterLogicalResponse:
     return soap_in_PointerTons1__searchInvestigationByParameterLogicalResponse(
-        soap, NULL, NULL, "ns1:searchInvestigationByParameterLogicalResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchInvestigationByParameterLogicalResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterLogical:
     return soap_in_PointerTons1__searchInvestigationByParameterLogical(
-        soap, NULL, NULL, "ns1:searchInvestigationByParameterLogical");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByParameterLogical");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByRestrictionLogicalResponse:
     return soap_in_PointerTons1__searchDatafileByRestrictionLogicalResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByRestrictionLogicalResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatafileByRestrictionLogicalResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByRestrictionLogical:
     return soap_in_PointerTons1__searchDatafileByRestrictionLogical(
-        soap, NULL, NULL, "ns1:searchDatafileByRestrictionLogical");
+        soap, nullptr, nullptr, "ns1:searchDatafileByRestrictionLogical");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByRestrictionLogicalResponse:
     return soap_in_PointerTons1__searchInvestigationByRestrictionLogicalResponse(
-        soap, NULL, NULL,
+        soap, nullptr, nullptr,
         "ns1:searchInvestigationByRestrictionLogicalResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByRestrictionLogical:
     return soap_in_PointerTons1__searchInvestigationByRestrictionLogical(
-        soap, NULL, NULL, "ns1:searchInvestigationByRestrictionLogical");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByRestrictionLogical");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByRestrictionLogicalResponse:
     return soap_in_PointerTons1__searchDatasetByRestrictionLogicalResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByRestrictionLogicalResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatasetByRestrictionLogicalResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByRestrictionLogical:
     return soap_in_PointerTons1__searchDatasetByRestrictionLogical(
-        soap, NULL, NULL, "ns1:searchDatasetByRestrictionLogical");
+        soap, nullptr, nullptr, "ns1:searchDatasetByRestrictionLogical");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByRestrictionLogicalResponse:
     return soap_in_PointerTons1__searchSampleByRestrictionLogicalResponse(
-        soap, NULL, NULL, "ns1:searchSampleByRestrictionLogicalResponse");
+        soap, nullptr, nullptr, "ns1:searchSampleByRestrictionLogicalResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByRestrictionLogical:
     return soap_in_PointerTons1__searchSampleByRestrictionLogical(
-        soap, NULL, NULL, "ns1:searchSampleByRestrictionLogical");
+        soap, nullptr, nullptr, "ns1:searchSampleByRestrictionLogical");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByRestrictionComparisonResponse:
     return soap_in_PointerTons1__searchSampleByRestrictionComparisonResponse(
-        soap, NULL, NULL, "ns1:searchSampleByRestrictionComparisonResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchSampleByRestrictionComparisonResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByRestrictionComparison:
     return soap_in_PointerTons1__searchSampleByRestrictionComparison(
-        soap, NULL, NULL, "ns1:searchSampleByRestrictionComparison");
+        soap, nullptr, nullptr, "ns1:searchSampleByRestrictionComparison");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByRestrictionComparisonResponse:
     return soap_in_PointerTons1__searchDatafileByRestrictionComparisonResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByRestrictionComparisonResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatafileByRestrictionComparisonResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByRestrictionComparison:
     return soap_in_PointerTons1__searchDatafileByRestrictionComparison(
-        soap, NULL, NULL, "ns1:searchDatafileByRestrictionComparison");
+        soap, nullptr, nullptr, "ns1:searchDatafileByRestrictionComparison");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByRestrictionComparisonResponse:
     return soap_in_PointerTons1__searchDatasetByRestrictionComparisonResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByRestrictionComparisonResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatasetByRestrictionComparisonResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByRestrictionComparison:
     return soap_in_PointerTons1__searchDatasetByRestrictionComparison(
-        soap, NULL, NULL, "ns1:searchDatasetByRestrictionComparison");
+        soap, nullptr, nullptr, "ns1:searchDatasetByRestrictionComparison");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByRestrictionComparasionResponse:
     return soap_in_PointerTons1__searchInvestigationByRestrictionComparasionResponse(
-        soap, NULL, NULL,
+        soap, nullptr, nullptr,
         "ns1:searchInvestigationByRestrictionComparasionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByRestrictionComparasion:
     return soap_in_PointerTons1__searchInvestigationByRestrictionComparasion(
-        soap, NULL, NULL, "ns1:searchInvestigationByRestrictionComparasion");
+        soap, nullptr, nullptr,
+        "ns1:searchInvestigationByRestrictionComparasion");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByRestrictionResponse:
     return soap_in_PointerTons1__searchSampleByRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchSampleByRestrictionResponse");
+        soap, nullptr, nullptr, "ns1:searchSampleByRestrictionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByRestriction:
     return soap_in_PointerTons1__searchSampleByRestriction(
-        soap, NULL, NULL, "ns1:searchSampleByRestriction");
+        soap, nullptr, nullptr, "ns1:searchSampleByRestriction");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByRestrictionResponse:
     return soap_in_PointerTons1__searchDatafileByRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByRestrictionResponse");
+        soap, nullptr, nullptr, "ns1:searchDatafileByRestrictionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByRestriction:
     return soap_in_PointerTons1__searchDatafileByRestriction(
-        soap, NULL, NULL, "ns1:searchDatafileByRestriction");
+        soap, nullptr, nullptr, "ns1:searchDatafileByRestriction");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByRestrictionResponse:
     return soap_in_PointerTons1__searchDatasetByRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByRestrictionResponse");
+        soap, nullptr, nullptr, "ns1:searchDatasetByRestrictionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByRestriction:
     return soap_in_PointerTons1__searchDatasetByRestriction(
-        soap, NULL, NULL, "ns1:searchDatasetByRestriction");
+        soap, nullptr, nullptr, "ns1:searchDatasetByRestriction");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByRestrictionResponse:
     return soap_in_PointerTons1__searchInvestigationByRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchInvestigationByRestrictionResponse");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByRestrictionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByRestriction:
     return soap_in_PointerTons1__searchInvestigationByRestriction(
-        soap, NULL, NULL, "ns1:searchInvestigationByRestriction");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByRestriction");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterRestrictionResponse:
     return soap_in_PointerTons1__searchInvestigationByParameterRestrictionResponse(
-        soap, NULL, NULL,
+        soap, nullptr, nullptr,
         "ns1:searchInvestigationByParameterRestrictionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterRestriction:
     return soap_in_PointerTons1__searchInvestigationByParameterRestriction(
-        soap, NULL, NULL, "ns1:searchInvestigationByParameterRestriction");
+        soap, nullptr, nullptr,
+        "ns1:searchInvestigationByParameterRestriction");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterRestrictionResponse:
     return soap_in_PointerTons1__searchDatafileByParameterRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterRestrictionResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatafileByParameterRestrictionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterRestriction:
     return soap_in_PointerTons1__searchDatafileByParameterRestriction(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterRestriction");
+        soap, nullptr, nullptr, "ns1:searchDatafileByParameterRestriction");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterRestrictionResponse:
     return soap_in_PointerTons1__searchSampleByParameterRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchSampleByParameterRestrictionResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchSampleByParameterRestrictionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterRestriction:
     return soap_in_PointerTons1__searchSampleByParameterRestriction(
-        soap, NULL, NULL, "ns1:searchSampleByParameterRestriction");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameterRestriction");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterRestrictionResponse:
     return soap_in_PointerTons1__searchDatasetByParameterRestrictionResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterRestrictionResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatasetByParameterRestrictionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterRestriction:
     return soap_in_PointerTons1__searchDatasetByParameterRestriction(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterRestriction");
+        soap, nullptr, nullptr, "ns1:searchDatasetByParameterRestriction");
   case SOAP_TYPE_ICat3_PointerTons1__getParameterByUnitsResponse:
     return soap_in_PointerTons1__getParameterByUnitsResponse(
-        soap, NULL, NULL, "ns1:getParameterByUnitsResponse");
+        soap, nullptr, nullptr, "ns1:getParameterByUnitsResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getParameterByUnits:
-    return soap_in_PointerTons1__getParameterByUnits(soap, NULL, NULL,
+    return soap_in_PointerTons1__getParameterByUnits(soap, nullptr, nullptr,
                                                      "ns1:getParameterByUnits");
   case SOAP_TYPE_ICat3_PointerTons1__getParameterByRestrictionResponse:
     return soap_in_PointerTons1__getParameterByRestrictionResponse(
-        soap, NULL, NULL, "ns1:getParameterByRestrictionResponse");
+        soap, nullptr, nullptr, "ns1:getParameterByRestrictionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getParameterByRestriction:
     return soap_in_PointerTons1__getParameterByRestriction(
-        soap, NULL, NULL, "ns1:getParameterByRestriction");
+        soap, nullptr, nullptr, "ns1:getParameterByRestriction");
   case SOAP_TYPE_ICat3_PointerTons1__getParameterByNameResponse:
     return soap_in_PointerTons1__getParameterByNameResponse(
-        soap, NULL, NULL, "ns1:getParameterByNameResponse");
+        soap, nullptr, nullptr, "ns1:getParameterByNameResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getParameterByName:
-    return soap_in_PointerTons1__getParameterByName(soap, NULL, NULL,
+    return soap_in_PointerTons1__getParameterByName(soap, nullptr, nullptr,
                                                     "ns1:getParameterByName");
   case SOAP_TYPE_ICat3_PointerTons1__getParameterByNameUnitsResponse:
     return soap_in_PointerTons1__getParameterByNameUnitsResponse(
-        soap, NULL, NULL, "ns1:getParameterByNameUnitsResponse");
+        soap, nullptr, nullptr, "ns1:getParameterByNameUnitsResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getParameterByNameUnits:
     return soap_in_PointerTons1__getParameterByNameUnits(
-        soap, NULL, NULL, "ns1:getParameterByNameUnits");
+        soap, nullptr, nullptr, "ns1:getParameterByNameUnits");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterResponse:
     return soap_in_PointerTons1__searchSampleByParameterResponse(
-        soap, NULL, NULL, "ns1:searchSampleByParameterResponse");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameter:
     return soap_in_PointerTons1__searchSampleByParameter(
-        soap, NULL, NULL, "ns1:searchSampleByParameter");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameter");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterResponse:
     return soap_in_PointerTons1__searchDatasetByParameterResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterResponse");
+        soap, nullptr, nullptr, "ns1:searchDatasetByParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameter:
     return soap_in_PointerTons1__searchDatasetByParameter(
-        soap, NULL, NULL, "ns1:searchDatasetByParameter");
+        soap, nullptr, nullptr, "ns1:searchDatasetByParameter");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterResponse:
     return soap_in_PointerTons1__searchDatafileByParameterResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterResponse");
+        soap, nullptr, nullptr, "ns1:searchDatafileByParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameter:
     return soap_in_PointerTons1__searchDatafileByParameter(
-        soap, NULL, NULL, "ns1:searchDatafileByParameter");
+        soap, nullptr, nullptr, "ns1:searchDatafileByParameter");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterResponse:
     return soap_in_PointerTons1__searchInvestigationByParameterResponse(
-        soap, NULL, NULL, "ns1:searchInvestigationByParameterResponse");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameter:
     return soap_in_PointerTons1__searchInvestigationByParameter(
-        soap, NULL, NULL, "ns1:searchInvestigationByParameter");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByParameter");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterComparisonResponse:
     return soap_in_PointerTons1__searchSampleByParameterComparisonResponse(
-        soap, NULL, NULL, "ns1:searchSampleByParameterComparisonResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchSampleByParameterComparisonResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterComparison:
     return soap_in_PointerTons1__searchSampleByParameterComparison(
-        soap, NULL, NULL, "ns1:searchSampleByParameterComparison");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameterComparison");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterComparisonResponse:
     return soap_in_PointerTons1__searchDatasetByParameterComparisonResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterComparisonResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatasetByParameterComparisonResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterComparison:
     return soap_in_PointerTons1__searchDatasetByParameterComparison(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterComparison");
+        soap, nullptr, nullptr, "ns1:searchDatasetByParameterComparison");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterComparisonResponse:
     return soap_in_PointerTons1__searchDatafileByParameterComparisonResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterComparisonResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatafileByParameterComparisonResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterComparison:
     return soap_in_PointerTons1__searchDatafileByParameterComparison(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterComparison");
+        soap, nullptr, nullptr, "ns1:searchDatafileByParameterComparison");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterComparisonResponse:
     return soap_in_PointerTons1__searchInvestigationByParameterComparisonResponse(
-        soap, NULL, NULL,
+        soap, nullptr, nullptr,
         "ns1:searchInvestigationByParameterComparisonResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterComparison:
     return soap_in_PointerTons1__searchInvestigationByParameterComparison(
-        soap, NULL, NULL, "ns1:searchInvestigationByParameterComparison");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByParameterComparison");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterConditionResponse:
     return soap_in_PointerTons1__searchSampleByParameterConditionResponse(
-        soap, NULL, NULL, "ns1:searchSampleByParameterConditionResponse");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameterConditionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterCondition:
     return soap_in_PointerTons1__searchSampleByParameterCondition(
-        soap, NULL, NULL, "ns1:searchSampleByParameterCondition");
+        soap, nullptr, nullptr, "ns1:searchSampleByParameterCondition");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterConditionResponse:
     return soap_in_PointerTons1__searchDatasetByParameterConditionResponse(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterConditionResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatasetByParameterConditionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterCondition:
     return soap_in_PointerTons1__searchDatasetByParameterCondition(
-        soap, NULL, NULL, "ns1:searchDatasetByParameterCondition");
+        soap, nullptr, nullptr, "ns1:searchDatasetByParameterCondition");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterConditionResponse:
     return soap_in_PointerTons1__searchDatafileByParameterConditionResponse(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterConditionResponse");
+        soap, nullptr, nullptr,
+        "ns1:searchDatafileByParameterConditionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterCondition:
     return soap_in_PointerTons1__searchDatafileByParameterCondition(
-        soap, NULL, NULL, "ns1:searchDatafileByParameterCondition");
+        soap, nullptr, nullptr, "ns1:searchDatafileByParameterCondition");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterConditionResponse:
     return soap_in_PointerTons1__searchInvestigationByParameterConditionResponse(
-        soap, NULL, NULL,
+        soap, nullptr, nullptr,
         "ns1:searchInvestigationByParameterConditionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterCondition:
     return soap_in_PointerTons1__searchInvestigationByParameterCondition(
-        soap, NULL, NULL, "ns1:searchInvestigationByParameterCondition");
+        soap, nullptr, nullptr, "ns1:searchInvestigationByParameterCondition");
   case SOAP_TYPE_ICat3_PointerTons1__getFacilityUserByFederalIdResponse:
     return soap_in_PointerTons1__getFacilityUserByFederalIdResponse(
-        soap, NULL, NULL, "ns1:getFacilityUserByFederalIdResponse");
+        soap, nullptr, nullptr, "ns1:getFacilityUserByFederalIdResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getFacilityUserByFederalId:
     return soap_in_PointerTons1__getFacilityUserByFederalId(
-        soap, NULL, NULL, "ns1:getFacilityUserByFederalId");
+        soap, nullptr, nullptr, "ns1:getFacilityUserByFederalId");
   case SOAP_TYPE_ICat3_PointerTons1__getFacilityUserByFacilityUserIdResponse:
     return soap_in_PointerTons1__getFacilityUserByFacilityUserIdResponse(
-        soap, NULL, NULL, "ns1:getFacilityUserByFacilityUserIdResponse");
+        soap, nullptr, nullptr, "ns1:getFacilityUserByFacilityUserIdResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getFacilityUserByFacilityUserId:
     return soap_in_PointerTons1__getFacilityUserByFacilityUserId(
-        soap, NULL, NULL, "ns1:getFacilityUserByFacilityUserId");
+        soap, nullptr, nullptr, "ns1:getFacilityUserByFacilityUserId");
   case SOAP_TYPE_ICat3_PointerTons1__getICATAPIVersionResponse:
     return soap_in_PointerTons1__getICATAPIVersionResponse(
-        soap, NULL, NULL, "ns1:getICATAPIVersionResponse");
+        soap, nullptr, nullptr, "ns1:getICATAPIVersionResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getICATAPIVersion:
-    return soap_in_PointerTons1__getICATAPIVersion(soap, NULL, NULL,
+    return soap_in_PointerTons1__getICATAPIVersion(soap, nullptr, nullptr,
                                                    "ns1:getICATAPIVersion");
   case SOAP_TYPE_ICat3_PointerTons1__checkDatasetDownloadAccessResponse:
     return soap_in_PointerTons1__checkDatasetDownloadAccessResponse(
-        soap, NULL, NULL, "ns1:checkDatasetDownloadAccessResponse");
+        soap, nullptr, nullptr, "ns1:checkDatasetDownloadAccessResponse");
   case SOAP_TYPE_ICat3_PointerTons1__checkDatasetDownloadAccess:
     return soap_in_PointerTons1__checkDatasetDownloadAccess(
-        soap, NULL, NULL, "ns1:checkDatasetDownloadAccess");
+        soap, nullptr, nullptr, "ns1:checkDatasetDownloadAccess");
   case SOAP_TYPE_ICat3_PointerTons1__checkDatafileDownloadAccessResponse:
     return soap_in_PointerTons1__checkDatafileDownloadAccessResponse(
-        soap, NULL, NULL, "ns1:checkDatafileDownloadAccessResponse");
+        soap, nullptr, nullptr, "ns1:checkDatafileDownloadAccessResponse");
   case SOAP_TYPE_ICat3_PointerTons1__checkDatafileDownloadAccess:
     return soap_in_PointerTons1__checkDatafileDownloadAccess(
-        soap, NULL, NULL, "ns1:checkDatafileDownloadAccess");
+        soap, nullptr, nullptr, "ns1:checkDatafileDownloadAccess");
   case SOAP_TYPE_ICat3_PointerTons1__downloadDatafilesResponse:
     return soap_in_PointerTons1__downloadDatafilesResponse(
-        soap, NULL, NULL, "ns1:downloadDatafilesResponse");
+        soap, nullptr, nullptr, "ns1:downloadDatafilesResponse");
   case SOAP_TYPE_ICat3_PointerTons1__downloadDatafiles:
-    return soap_in_PointerTons1__downloadDatafiles(soap, NULL, NULL,
+    return soap_in_PointerTons1__downloadDatafiles(soap, nullptr, nullptr,
                                                    "ns1:downloadDatafiles");
   case SOAP_TYPE_ICat3_PointerTons1__downloadDatasetResponse:
     return soap_in_PointerTons1__downloadDatasetResponse(
-        soap, NULL, NULL, "ns1:downloadDatasetResponse");
+        soap, nullptr, nullptr, "ns1:downloadDatasetResponse");
   case SOAP_TYPE_ICat3_PointerTons1__downloadDataset:
-    return soap_in_PointerTons1__downloadDataset(soap, NULL, NULL,
+    return soap_in_PointerTons1__downloadDataset(soap, nullptr, nullptr,
                                                  "ns1:downloadDataset");
   case SOAP_TYPE_ICat3_PointerTons1__downloadDatafileResponse:
     return soap_in_PointerTons1__downloadDatafileResponse(
-        soap, NULL, NULL, "ns1:downloadDatafileResponse");
+        soap, nullptr, nullptr, "ns1:downloadDatafileResponse");
   case SOAP_TYPE_ICat3_PointerTons1__downloadDatafile:
-    return soap_in_PointerTons1__downloadDatafile(soap, NULL, NULL,
+    return soap_in_PointerTons1__downloadDatafile(soap, nullptr, nullptr,
                                                   "ns1:downloadDatafile");
   case SOAP_TYPE_ICat3_PointerTons1__ingestMetadataResponse:
     return soap_in_PointerTons1__ingestMetadataResponse(
-        soap, NULL, NULL, "ns1:ingestMetadataResponse");
+        soap, nullptr, nullptr, "ns1:ingestMetadataResponse");
   case SOAP_TYPE_ICat3_PointerTons1__ingestMetadata:
-    return soap_in_PointerTons1__ingestMetadata(soap, NULL, NULL,
+    return soap_in_PointerTons1__ingestMetadata(soap, nullptr, nullptr,
                                                 "ns1:ingestMetadata");
   case SOAP_TYPE_ICat3_PointerTons1__updateAuthorisationResponse:
     return soap_in_PointerTons1__updateAuthorisationResponse(
-        soap, NULL, NULL, "ns1:updateAuthorisationResponse");
+        soap, nullptr, nullptr, "ns1:updateAuthorisationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__updateAuthorisation:
-    return soap_in_PointerTons1__updateAuthorisation(soap, NULL, NULL,
+    return soap_in_PointerTons1__updateAuthorisation(soap, nullptr, nullptr,
                                                      "ns1:updateAuthorisation");
   case SOAP_TYPE_ICat3_PointerTons1__removeAuthorisationResponse:
     return soap_in_PointerTons1__removeAuthorisationResponse(
-        soap, NULL, NULL, "ns1:removeAuthorisationResponse");
+        soap, nullptr, nullptr, "ns1:removeAuthorisationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__removeAuthorisation:
-    return soap_in_PointerTons1__removeAuthorisation(soap, NULL, NULL,
+    return soap_in_PointerTons1__removeAuthorisation(soap, nullptr, nullptr,
                                                      "ns1:removeAuthorisation");
   case SOAP_TYPE_ICat3_PointerTons1__deleteAuthorisationResponse:
     return soap_in_PointerTons1__deleteAuthorisationResponse(
-        soap, NULL, NULL, "ns1:deleteAuthorisationResponse");
+        soap, nullptr, nullptr, "ns1:deleteAuthorisationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__deleteAuthorisation:
-    return soap_in_PointerTons1__deleteAuthorisation(soap, NULL, NULL,
+    return soap_in_PointerTons1__deleteAuthorisation(soap, nullptr, nullptr,
                                                      "ns1:deleteAuthorisation");
   case SOAP_TYPE_ICat3_PointerTons1__addAuthorisationResponse:
     return soap_in_PointerTons1__addAuthorisationResponse(
-        soap, NULL, NULL, "ns1:addAuthorisationResponse");
+        soap, nullptr, nullptr, "ns1:addAuthorisationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__addAuthorisation:
-    return soap_in_PointerTons1__addAuthorisation(soap, NULL, NULL,
+    return soap_in_PointerTons1__addAuthorisation(soap, nullptr, nullptr,
                                                   "ns1:addAuthorisation");
   case SOAP_TYPE_ICat3_PointerTons1__getAuthorisationsResponse:
     return soap_in_PointerTons1__getAuthorisationsResponse(
-        soap, NULL, NULL, "ns1:getAuthorisationsResponse");
+        soap, nullptr, nullptr, "ns1:getAuthorisationsResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getAuthorisations:
-    return soap_in_PointerTons1__getAuthorisations(soap, NULL, NULL,
+    return soap_in_PointerTons1__getAuthorisations(soap, nullptr, nullptr,
                                                    "ns1:getAuthorisations");
   case SOAP_TYPE_ICat3_PointerTons1__removeDataFileParameterResponse:
     return soap_in_PointerTons1__removeDataFileParameterResponse(
-        soap, NULL, NULL, "ns1:removeDataFileParameterResponse");
+        soap, nullptr, nullptr, "ns1:removeDataFileParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__removeDataFileParameter:
     return soap_in_PointerTons1__removeDataFileParameter(
-        soap, NULL, NULL, "ns1:removeDataFileParameter");
+        soap, nullptr, nullptr, "ns1:removeDataFileParameter");
   case SOAP_TYPE_ICat3_PointerTons1__removeDataFileResponse:
     return soap_in_PointerTons1__removeDataFileResponse(
-        soap, NULL, NULL, "ns1:removeDataFileResponse");
+        soap, nullptr, nullptr, "ns1:removeDataFileResponse");
   case SOAP_TYPE_ICat3_PointerTons1__removeDataFile:
-    return soap_in_PointerTons1__removeDataFile(soap, NULL, NULL,
+    return soap_in_PointerTons1__removeDataFile(soap, nullptr, nullptr,
                                                 "ns1:removeDataFile");
   case SOAP_TYPE_ICat3_PointerTons1__deleteDataFileParameterResponse:
     return soap_in_PointerTons1__deleteDataFileParameterResponse(
-        soap, NULL, NULL, "ns1:deleteDataFileParameterResponse");
+        soap, nullptr, nullptr, "ns1:deleteDataFileParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__deleteDataFileParameter:
     return soap_in_PointerTons1__deleteDataFileParameter(
-        soap, NULL, NULL, "ns1:deleteDataFileParameter");
+        soap, nullptr, nullptr, "ns1:deleteDataFileParameter");
   case SOAP_TYPE_ICat3_PointerTons1__modifyDataFileParameterResponse:
     return soap_in_PointerTons1__modifyDataFileParameterResponse(
-        soap, NULL, NULL, "ns1:modifyDataFileParameterResponse");
+        soap, nullptr, nullptr, "ns1:modifyDataFileParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__modifyDataFileParameter:
     return soap_in_PointerTons1__modifyDataFileParameter(
-        soap, NULL, NULL, "ns1:modifyDataFileParameter");
+        soap, nullptr, nullptr, "ns1:modifyDataFileParameter");
   case SOAP_TYPE_ICat3_PointerTons1__addDataFileParametersResponse:
     return soap_in_PointerTons1__addDataFileParametersResponse(
-        soap, NULL, NULL, "ns1:addDataFileParametersResponse");
+        soap, nullptr, nullptr, "ns1:addDataFileParametersResponse");
   case SOAP_TYPE_ICat3_PointerTons1__addDataFileParameters:
     return soap_in_PointerTons1__addDataFileParameters(
-        soap, NULL, NULL, "ns1:addDataFileParameters");
+        soap, nullptr, nullptr, "ns1:addDataFileParameters");
   case SOAP_TYPE_ICat3_PointerTons1__addDataFileParameterResponse:
     return soap_in_PointerTons1__addDataFileParameterResponse(
-        soap, NULL, NULL, "ns1:addDataFileParameterResponse");
+        soap, nullptr, nullptr, "ns1:addDataFileParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__addDataFileParameter:
     return soap_in_PointerTons1__addDataFileParameter(
-        soap, NULL, NULL, "ns1:addDataFileParameter");
+        soap, nullptr, nullptr, "ns1:addDataFileParameter");
   case SOAP_TYPE_ICat3_PointerTons1__modifyDataFileResponse:
     return soap_in_PointerTons1__modifyDataFileResponse(
-        soap, NULL, NULL, "ns1:modifyDataFileResponse");
+        soap, nullptr, nullptr, "ns1:modifyDataFileResponse");
   case SOAP_TYPE_ICat3_PointerTons1__modifyDataFile:
-    return soap_in_PointerTons1__modifyDataFile(soap, NULL, NULL,
+    return soap_in_PointerTons1__modifyDataFile(soap, nullptr, nullptr,
                                                 "ns1:modifyDataFile");
   case SOAP_TYPE_ICat3_PointerTons1__deleteDataFileResponse:
     return soap_in_PointerTons1__deleteDataFileResponse(
-        soap, NULL, NULL, "ns1:deleteDataFileResponse");
+        soap, nullptr, nullptr, "ns1:deleteDataFileResponse");
   case SOAP_TYPE_ICat3_PointerTons1__deleteDataFile:
-    return soap_in_PointerTons1__deleteDataFile(soap, NULL, NULL,
+    return soap_in_PointerTons1__deleteDataFile(soap, nullptr, nullptr,
                                                 "ns1:deleteDataFile");
   case SOAP_TYPE_ICat3_PointerTons1__createDataFilesResponse:
     return soap_in_PointerTons1__createDataFilesResponse(
-        soap, NULL, NULL, "ns1:createDataFilesResponse");
+        soap, nullptr, nullptr, "ns1:createDataFilesResponse");
   case SOAP_TYPE_ICat3_PointerTons1__createDataFiles:
-    return soap_in_PointerTons1__createDataFiles(soap, NULL, NULL,
+    return soap_in_PointerTons1__createDataFiles(soap, nullptr, nullptr,
                                                  "ns1:createDataFiles");
   case SOAP_TYPE_ICat3_PointerTons1__createDataFileResponse:
     return soap_in_PointerTons1__createDataFileResponse(
-        soap, NULL, NULL, "ns1:createDataFileResponse");
+        soap, nullptr, nullptr, "ns1:createDataFileResponse");
   case SOAP_TYPE_ICat3_PointerTons1__createDataFile:
-    return soap_in_PointerTons1__createDataFile(soap, NULL, NULL,
+    return soap_in_PointerTons1__createDataFile(soap, nullptr, nullptr,
                                                 "ns1:createDataFile");
   case SOAP_TYPE_ICat3_PointerTons1__getDatafilesResponse:
     return soap_in_PointerTons1__getDatafilesResponse(
-        soap, NULL, NULL, "ns1:getDatafilesResponse");
+        soap, nullptr, nullptr, "ns1:getDatafilesResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getDatafiles:
-    return soap_in_PointerTons1__getDatafiles(soap, NULL, NULL,
+    return soap_in_PointerTons1__getDatafiles(soap, nullptr, nullptr,
                                               "ns1:getDatafiles");
   case SOAP_TYPE_ICat3_PointerTons1__getDatafileResponse:
-    return soap_in_PointerTons1__getDatafileResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__getDatafileResponse(soap, nullptr, nullptr,
                                                      "ns1:getDatafileResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getDatafile:
-    return soap_in_PointerTons1__getDatafile(soap, NULL, NULL,
+    return soap_in_PointerTons1__getDatafile(soap, nullptr, nullptr,
                                              "ns1:getDatafile");
   case SOAP_TYPE_ICat3_PointerTons1__removeDataSetParameterResponse:
     return soap_in_PointerTons1__removeDataSetParameterResponse(
-        soap, NULL, NULL, "ns1:removeDataSetParameterResponse");
+        soap, nullptr, nullptr, "ns1:removeDataSetParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__removeDataSetParameter:
     return soap_in_PointerTons1__removeDataSetParameter(
-        soap, NULL, NULL, "ns1:removeDataSetParameter");
+        soap, nullptr, nullptr, "ns1:removeDataSetParameter");
   case SOAP_TYPE_ICat3_PointerTons1__removeDataSetResponse:
     return soap_in_PointerTons1__removeDataSetResponse(
-        soap, NULL, NULL, "ns1:removeDataSetResponse");
+        soap, nullptr, nullptr, "ns1:removeDataSetResponse");
   case SOAP_TYPE_ICat3_PointerTons1__removeDataSet:
-    return soap_in_PointerTons1__removeDataSet(soap, NULL, NULL,
+    return soap_in_PointerTons1__removeDataSet(soap, nullptr, nullptr,
                                                "ns1:removeDataSet");
   case SOAP_TYPE_ICat3_PointerTons1__addDataSetParametersResponse:
     return soap_in_PointerTons1__addDataSetParametersResponse(
-        soap, NULL, NULL, "ns1:addDataSetParametersResponse");
+        soap, nullptr, nullptr, "ns1:addDataSetParametersResponse");
   case SOAP_TYPE_ICat3_PointerTons1__addDataSetParameters:
     return soap_in_PointerTons1__addDataSetParameters(
-        soap, NULL, NULL, "ns1:addDataSetParameters");
+        soap, nullptr, nullptr, "ns1:addDataSetParameters");
   case SOAP_TYPE_ICat3_PointerTons1__addDataSetParameterResponse:
     return soap_in_PointerTons1__addDataSetParameterResponse(
-        soap, NULL, NULL, "ns1:addDataSetParameterResponse");
+        soap, nullptr, nullptr, "ns1:addDataSetParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__addDataSetParameter:
-    return soap_in_PointerTons1__addDataSetParameter(soap, NULL, NULL,
+    return soap_in_PointerTons1__addDataSetParameter(soap, nullptr, nullptr,
                                                      "ns1:addDataSetParameter");
   case SOAP_TYPE_ICat3_PointerTons1__setDataSetSampleResponse:
     return soap_in_PointerTons1__setDataSetSampleResponse(
-        soap, NULL, NULL, "ns1:setDataSetSampleResponse");
+        soap, nullptr, nullptr, "ns1:setDataSetSampleResponse");
   case SOAP_TYPE_ICat3_PointerTons1__setDataSetSample:
-    return soap_in_PointerTons1__setDataSetSample(soap, NULL, NULL,
+    return soap_in_PointerTons1__setDataSetSample(soap, nullptr, nullptr,
                                                   "ns1:setDataSetSample");
   case SOAP_TYPE_ICat3_PointerTons1__modifyDataSetParameterResponse:
     return soap_in_PointerTons1__modifyDataSetParameterResponse(
-        soap, NULL, NULL, "ns1:modifyDataSetParameterResponse");
+        soap, nullptr, nullptr, "ns1:modifyDataSetParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__modifyDataSetParameter:
     return soap_in_PointerTons1__modifyDataSetParameter(
-        soap, NULL, NULL, "ns1:modifyDataSetParameter");
+        soap, nullptr, nullptr, "ns1:modifyDataSetParameter");
   case SOAP_TYPE_ICat3_PointerTons1__modifyDataSetResponse:
     return soap_in_PointerTons1__modifyDataSetResponse(
-        soap, NULL, NULL, "ns1:modifyDataSetResponse");
+        soap, nullptr, nullptr, "ns1:modifyDataSetResponse");
   case SOAP_TYPE_ICat3_PointerTons1__modifyDataSet:
-    return soap_in_PointerTons1__modifyDataSet(soap, NULL, NULL,
+    return soap_in_PointerTons1__modifyDataSet(soap, nullptr, nullptr,
                                                "ns1:modifyDataSet");
   case SOAP_TYPE_ICat3_PointerTons1__deleteDataSetParameterResponse:
     return soap_in_PointerTons1__deleteDataSetParameterResponse(
-        soap, NULL, NULL, "ns1:deleteDataSetParameterResponse");
+        soap, nullptr, nullptr, "ns1:deleteDataSetParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__deleteDataSetParameter:
     return soap_in_PointerTons1__deleteDataSetParameter(
-        soap, NULL, NULL, "ns1:deleteDataSetParameter");
+        soap, nullptr, nullptr, "ns1:deleteDataSetParameter");
   case SOAP_TYPE_ICat3_PointerTons1__deleteDataSetResponse:
     return soap_in_PointerTons1__deleteDataSetResponse(
-        soap, NULL, NULL, "ns1:deleteDataSetResponse");
+        soap, nullptr, nullptr, "ns1:deleteDataSetResponse");
   case SOAP_TYPE_ICat3_PointerTons1__deleteDataSet:
-    return soap_in_PointerTons1__deleteDataSet(soap, NULL, NULL,
+    return soap_in_PointerTons1__deleteDataSet(soap, nullptr, nullptr,
                                                "ns1:deleteDataSet");
   case SOAP_TYPE_ICat3_PointerTons1__createDataSetsResponse:
     return soap_in_PointerTons1__createDataSetsResponse(
-        soap, NULL, NULL, "ns1:createDataSetsResponse");
+        soap, nullptr, nullptr, "ns1:createDataSetsResponse");
   case SOAP_TYPE_ICat3_PointerTons1__createDataSets:
-    return soap_in_PointerTons1__createDataSets(soap, NULL, NULL,
+    return soap_in_PointerTons1__createDataSets(soap, nullptr, nullptr,
                                                 "ns1:createDataSets");
   case SOAP_TYPE_ICat3_PointerTons1__createDataSetResponse:
     return soap_in_PointerTons1__createDataSetResponse(
-        soap, NULL, NULL, "ns1:createDataSetResponse");
+        soap, nullptr, nullptr, "ns1:createDataSetResponse");
   case SOAP_TYPE_ICat3_PointerTons1__createDataSet:
-    return soap_in_PointerTons1__createDataSet(soap, NULL, NULL,
+    return soap_in_PointerTons1__createDataSet(soap, nullptr, nullptr,
                                                "ns1:createDataSet");
   case SOAP_TYPE_ICat3_PointerTons1__getDatasetsResponse:
-    return soap_in_PointerTons1__getDatasetsResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__getDatasetsResponse(soap, nullptr, nullptr,
                                                      "ns1:getDatasetsResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getDatasets:
-    return soap_in_PointerTons1__getDatasets(soap, NULL, NULL,
+    return soap_in_PointerTons1__getDatasets(soap, nullptr, nullptr,
                                              "ns1:getDatasets");
   case SOAP_TYPE_ICat3_PointerTons1__getDatasetIncludesResponse:
     return soap_in_PointerTons1__getDatasetIncludesResponse(
-        soap, NULL, NULL, "ns1:getDatasetIncludesResponse");
+        soap, nullptr, nullptr, "ns1:getDatasetIncludesResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getDatasetIncludes:
-    return soap_in_PointerTons1__getDatasetIncludes(soap, NULL, NULL,
+    return soap_in_PointerTons1__getDatasetIncludes(soap, nullptr, nullptr,
                                                     "ns1:getDatasetIncludes");
   case SOAP_TYPE_ICat3_PointerTons1__getDatasetResponse:
-    return soap_in_PointerTons1__getDatasetResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__getDatasetResponse(soap, nullptr, nullptr,
                                                     "ns1:getDatasetResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getDataset:
-    return soap_in_PointerTons1__getDataset(soap, NULL, NULL, "ns1:getDataset");
+    return soap_in_PointerTons1__getDataset(soap, nullptr, nullptr,
+                                            "ns1:getDataset");
   case SOAP_TYPE_ICat3_PointerTons1__removeSampleParameterResponse:
     return soap_in_PointerTons1__removeSampleParameterResponse(
-        soap, NULL, NULL, "ns1:removeSampleParameterResponse");
+        soap, nullptr, nullptr, "ns1:removeSampleParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__removeSampleParameter:
     return soap_in_PointerTons1__removeSampleParameter(
-        soap, NULL, NULL, "ns1:removeSampleParameter");
+        soap, nullptr, nullptr, "ns1:removeSampleParameter");
   case SOAP_TYPE_ICat3_PointerTons1__removeSampleResponse:
     return soap_in_PointerTons1__removeSampleResponse(
-        soap, NULL, NULL, "ns1:removeSampleResponse");
+        soap, nullptr, nullptr, "ns1:removeSampleResponse");
   case SOAP_TYPE_ICat3_PointerTons1__removeSample:
-    return soap_in_PointerTons1__removeSample(soap, NULL, NULL,
+    return soap_in_PointerTons1__removeSample(soap, nullptr, nullptr,
                                               "ns1:removeSample");
   case SOAP_TYPE_ICat3_PointerTons1__removePublicationResponse:
     return soap_in_PointerTons1__removePublicationResponse(
-        soap, NULL, NULL, "ns1:removePublicationResponse");
+        soap, nullptr, nullptr, "ns1:removePublicationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__removePublication:
-    return soap_in_PointerTons1__removePublication(soap, NULL, NULL,
+    return soap_in_PointerTons1__removePublication(soap, nullptr, nullptr,
                                                    "ns1:removePublication");
   case SOAP_TYPE_ICat3_PointerTons1__removeInvestigatorResponse:
     return soap_in_PointerTons1__removeInvestigatorResponse(
-        soap, NULL, NULL, "ns1:removeInvestigatorResponse");
+        soap, nullptr, nullptr, "ns1:removeInvestigatorResponse");
   case SOAP_TYPE_ICat3_PointerTons1__removeInvestigator:
-    return soap_in_PointerTons1__removeInvestigator(soap, NULL, NULL,
+    return soap_in_PointerTons1__removeInvestigator(soap, nullptr, nullptr,
                                                     "ns1:removeInvestigator");
   case SOAP_TYPE_ICat3_PointerTons1__removeKeywordResponse:
     return soap_in_PointerTons1__removeKeywordResponse(
-        soap, NULL, NULL, "ns1:removeKeywordResponse");
+        soap, nullptr, nullptr, "ns1:removeKeywordResponse");
   case SOAP_TYPE_ICat3_PointerTons1__removeKeyword:
-    return soap_in_PointerTons1__removeKeyword(soap, NULL, NULL,
+    return soap_in_PointerTons1__removeKeyword(soap, nullptr, nullptr,
                                                "ns1:removeKeyword");
   case SOAP_TYPE_ICat3_PointerTons1__modifySampleParameterResponse:
     return soap_in_PointerTons1__modifySampleParameterResponse(
-        soap, NULL, NULL, "ns1:modifySampleParameterResponse");
+        soap, nullptr, nullptr, "ns1:modifySampleParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__modifySampleParameter:
     return soap_in_PointerTons1__modifySampleParameter(
-        soap, NULL, NULL, "ns1:modifySampleParameter");
+        soap, nullptr, nullptr, "ns1:modifySampleParameter");
   case SOAP_TYPE_ICat3_PointerTons1__modifyPublicationResponse:
     return soap_in_PointerTons1__modifyPublicationResponse(
-        soap, NULL, NULL, "ns1:modifyPublicationResponse");
+        soap, nullptr, nullptr, "ns1:modifyPublicationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__modifyPublication:
-    return soap_in_PointerTons1__modifyPublication(soap, NULL, NULL,
+    return soap_in_PointerTons1__modifyPublication(soap, nullptr, nullptr,
                                                    "ns1:modifyPublication");
   case SOAP_TYPE_ICat3_PointerTons1__modifySampleResponse:
     return soap_in_PointerTons1__modifySampleResponse(
-        soap, NULL, NULL, "ns1:modifySampleResponse");
+        soap, nullptr, nullptr, "ns1:modifySampleResponse");
   case SOAP_TYPE_ICat3_PointerTons1__modifySample:
-    return soap_in_PointerTons1__modifySample(soap, NULL, NULL,
+    return soap_in_PointerTons1__modifySample(soap, nullptr, nullptr,
                                               "ns1:modifySample");
   case SOAP_TYPE_ICat3_PointerTons1__modifyInvestigatorResponse:
     return soap_in_PointerTons1__modifyInvestigatorResponse(
-        soap, NULL, NULL, "ns1:modifyInvestigatorResponse");
+        soap, nullptr, nullptr, "ns1:modifyInvestigatorResponse");
   case SOAP_TYPE_ICat3_PointerTons1__modifyInvestigator:
-    return soap_in_PointerTons1__modifyInvestigator(soap, NULL, NULL,
+    return soap_in_PointerTons1__modifyInvestigator(soap, nullptr, nullptr,
                                                     "ns1:modifyInvestigator");
   case SOAP_TYPE_ICat3_PointerTons1__modifyInvestigationResponse:
     return soap_in_PointerTons1__modifyInvestigationResponse(
-        soap, NULL, NULL, "ns1:modifyInvestigationResponse");
+        soap, nullptr, nullptr, "ns1:modifyInvestigationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__modifyInvestigation:
-    return soap_in_PointerTons1__modifyInvestigation(soap, NULL, NULL,
+    return soap_in_PointerTons1__modifyInvestigation(soap, nullptr, nullptr,
                                                      "ns1:modifyInvestigation");
   case SOAP_TYPE_ICat3_PointerTons1__deleteSampleParameterResponse:
     return soap_in_PointerTons1__deleteSampleParameterResponse(
-        soap, NULL, NULL, "ns1:deleteSampleParameterResponse");
+        soap, nullptr, nullptr, "ns1:deleteSampleParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__deleteSampleParameter:
     return soap_in_PointerTons1__deleteSampleParameter(
-        soap, NULL, NULL, "ns1:deleteSampleParameter");
+        soap, nullptr, nullptr, "ns1:deleteSampleParameter");
   case SOAP_TYPE_ICat3_PointerTons1__deleteSampleResponse:
     return soap_in_PointerTons1__deleteSampleResponse(
-        soap, NULL, NULL, "ns1:deleteSampleResponse");
+        soap, nullptr, nullptr, "ns1:deleteSampleResponse");
   case SOAP_TYPE_ICat3_PointerTons1__deleteSample:
-    return soap_in_PointerTons1__deleteSample(soap, NULL, NULL,
+    return soap_in_PointerTons1__deleteSample(soap, nullptr, nullptr,
                                               "ns1:deleteSample");
   case SOAP_TYPE_ICat3_PointerTons1__deletePublicationResponse:
     return soap_in_PointerTons1__deletePublicationResponse(
-        soap, NULL, NULL, "ns1:deletePublicationResponse");
+        soap, nullptr, nullptr, "ns1:deletePublicationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__deletePublication:
-    return soap_in_PointerTons1__deletePublication(soap, NULL, NULL,
+    return soap_in_PointerTons1__deletePublication(soap, nullptr, nullptr,
                                                    "ns1:deletePublication");
   case SOAP_TYPE_ICat3_PointerTons1__deleteKeywordResponse:
     return soap_in_PointerTons1__deleteKeywordResponse(
-        soap, NULL, NULL, "ns1:deleteKeywordResponse");
+        soap, nullptr, nullptr, "ns1:deleteKeywordResponse");
   case SOAP_TYPE_ICat3_PointerTons1__deleteKeyword:
-    return soap_in_PointerTons1__deleteKeyword(soap, NULL, NULL,
+    return soap_in_PointerTons1__deleteKeyword(soap, nullptr, nullptr,
                                                "ns1:deleteKeyword");
   case SOAP_TYPE_ICat3_PointerTons1__deleteInvestigatorResponse:
     return soap_in_PointerTons1__deleteInvestigatorResponse(
-        soap, NULL, NULL, "ns1:deleteInvestigatorResponse");
+        soap, nullptr, nullptr, "ns1:deleteInvestigatorResponse");
   case SOAP_TYPE_ICat3_PointerTons1__deleteInvestigator:
-    return soap_in_PointerTons1__deleteInvestigator(soap, NULL, NULL,
+    return soap_in_PointerTons1__deleteInvestigator(soap, nullptr, nullptr,
                                                     "ns1:deleteInvestigator");
   case SOAP_TYPE_ICat3_PointerTons1__addSampleParameterResponse:
     return soap_in_PointerTons1__addSampleParameterResponse(
-        soap, NULL, NULL, "ns1:addSampleParameterResponse");
+        soap, nullptr, nullptr, "ns1:addSampleParameterResponse");
   case SOAP_TYPE_ICat3_PointerTons1__addSampleParameter:
-    return soap_in_PointerTons1__addSampleParameter(soap, NULL, NULL,
+    return soap_in_PointerTons1__addSampleParameter(soap, nullptr, nullptr,
                                                     "ns1:addSampleParameter");
   case SOAP_TYPE_ICat3_PointerTons1__addPublicationResponse:
     return soap_in_PointerTons1__addPublicationResponse(
-        soap, NULL, NULL, "ns1:addPublicationResponse");
+        soap, nullptr, nullptr, "ns1:addPublicationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__addPublication:
-    return soap_in_PointerTons1__addPublication(soap, NULL, NULL,
+    return soap_in_PointerTons1__addPublication(soap, nullptr, nullptr,
                                                 "ns1:addPublication");
   case SOAP_TYPE_ICat3_PointerTons1__addSampleResponse:
-    return soap_in_PointerTons1__addSampleResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__addSampleResponse(soap, nullptr, nullptr,
                                                    "ns1:addSampleResponse");
   case SOAP_TYPE_ICat3_PointerTons1__addSample:
-    return soap_in_PointerTons1__addSample(soap, NULL, NULL, "ns1:addSample");
+    return soap_in_PointerTons1__addSample(soap, nullptr, nullptr,
+                                           "ns1:addSample");
   case SOAP_TYPE_ICat3_PointerTons1__addInvestigatorResponse:
     return soap_in_PointerTons1__addInvestigatorResponse(
-        soap, NULL, NULL, "ns1:addInvestigatorResponse");
+        soap, nullptr, nullptr, "ns1:addInvestigatorResponse");
   case SOAP_TYPE_ICat3_PointerTons1__addInvestigator:
-    return soap_in_PointerTons1__addInvestigator(soap, NULL, NULL,
+    return soap_in_PointerTons1__addInvestigator(soap, nullptr, nullptr,
                                                  "ns1:addInvestigator");
   case SOAP_TYPE_ICat3_PointerTons1__addKeywordResponse:
-    return soap_in_PointerTons1__addKeywordResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__addKeywordResponse(soap, nullptr, nullptr,
                                                     "ns1:addKeywordResponse");
   case SOAP_TYPE_ICat3_PointerTons1__addKeyword:
-    return soap_in_PointerTons1__addKeyword(soap, NULL, NULL, "ns1:addKeyword");
+    return soap_in_PointerTons1__addKeyword(soap, nullptr, nullptr,
+                                            "ns1:addKeyword");
   case SOAP_TYPE_ICat3_PointerTons1__removeInvestigationResponse:
     return soap_in_PointerTons1__removeInvestigationResponse(
-        soap, NULL, NULL, "ns1:removeInvestigationResponse");
+        soap, nullptr, nullptr, "ns1:removeInvestigationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__removeInvestigation:
-    return soap_in_PointerTons1__removeInvestigation(soap, NULL, NULL,
+    return soap_in_PointerTons1__removeInvestigation(soap, nullptr, nullptr,
                                                      "ns1:removeInvestigation");
   case SOAP_TYPE_ICat3_PointerTons1__deleteInvestigationResponse:
     return soap_in_PointerTons1__deleteInvestigationResponse(
-        soap, NULL, NULL, "ns1:deleteInvestigationResponse");
+        soap, nullptr, nullptr, "ns1:deleteInvestigationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__deleteInvestigation:
-    return soap_in_PointerTons1__deleteInvestigation(soap, NULL, NULL,
+    return soap_in_PointerTons1__deleteInvestigation(soap, nullptr, nullptr,
                                                      "ns1:deleteInvestigation");
   case SOAP_TYPE_ICat3_PointerTons1__createInvestigationResponse:
     return soap_in_PointerTons1__createInvestigationResponse(
-        soap, NULL, NULL, "ns1:createInvestigationResponse");
+        soap, nullptr, nullptr, "ns1:createInvestigationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__createInvestigation:
-    return soap_in_PointerTons1__createInvestigation(soap, NULL, NULL,
+    return soap_in_PointerTons1__createInvestigation(soap, nullptr, nullptr,
                                                      "ns1:createInvestigation");
   case SOAP_TYPE_ICat3_PointerTons1__getInvestigationsIncludesResponse:
     return soap_in_PointerTons1__getInvestigationsIncludesResponse(
-        soap, NULL, NULL, "ns1:getInvestigationsIncludesResponse");
+        soap, nullptr, nullptr, "ns1:getInvestigationsIncludesResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getInvestigationsIncludes:
     return soap_in_PointerTons1__getInvestigationsIncludes(
-        soap, NULL, NULL, "ns1:getInvestigationsIncludes");
+        soap, nullptr, nullptr, "ns1:getInvestigationsIncludes");
   case SOAP_TYPE_ICat3_PointerTons1__getInvestigationsResponse:
     return soap_in_PointerTons1__getInvestigationsResponse(
-        soap, NULL, NULL, "ns1:getInvestigationsResponse");
+        soap, nullptr, nullptr, "ns1:getInvestigationsResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getInvestigations:
-    return soap_in_PointerTons1__getInvestigations(soap, NULL, NULL,
+    return soap_in_PointerTons1__getInvestigations(soap, nullptr, nullptr,
                                                    "ns1:getInvestigations");
   case SOAP_TYPE_ICat3_PointerTons1__getInvestigationIncludesResponse:
     return soap_in_PointerTons1__getInvestigationIncludesResponse(
-        soap, NULL, NULL, "ns1:getInvestigationIncludesResponse");
+        soap, nullptr, nullptr, "ns1:getInvestigationIncludesResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getInvestigationIncludes:
     return soap_in_PointerTons1__getInvestigationIncludes(
-        soap, NULL, NULL, "ns1:getInvestigationIncludes");
+        soap, nullptr, nullptr, "ns1:getInvestigationIncludes");
   case SOAP_TYPE_ICat3_PointerTons1__getInvestigationResponse:
     return soap_in_PointerTons1__getInvestigationResponse(
-        soap, NULL, NULL, "ns1:getInvestigationResponse");
+        soap, nullptr, nullptr, "ns1:getInvestigationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getInvestigation:
-    return soap_in_PointerTons1__getInvestigation(soap, NULL, NULL,
+    return soap_in_PointerTons1__getInvestigation(soap, nullptr, nullptr,
                                                   "ns1:getInvestigation");
   case SOAP_TYPE_ICat3_PointerTons1__listDatafileFormatsResponse:
     return soap_in_PointerTons1__listDatafileFormatsResponse(
-        soap, NULL, NULL, "ns1:listDatafileFormatsResponse");
+        soap, nullptr, nullptr, "ns1:listDatafileFormatsResponse");
   case SOAP_TYPE_ICat3_PointerTons1__listDatafileFormats:
-    return soap_in_PointerTons1__listDatafileFormats(soap, NULL, NULL,
+    return soap_in_PointerTons1__listDatafileFormats(soap, nullptr, nullptr,
                                                      "ns1:listDatafileFormats");
   case SOAP_TYPE_ICat3_PointerTons1__searchByRunNumberPaginationResponse:
     return soap_in_PointerTons1__searchByRunNumberPaginationResponse(
-        soap, NULL, NULL, "ns1:searchByRunNumberPaginationResponse");
+        soap, nullptr, nullptr, "ns1:searchByRunNumberPaginationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchByRunNumberPagination:
     return soap_in_PointerTons1__searchByRunNumberPagination(
-        soap, NULL, NULL, "ns1:searchByRunNumberPagination");
+        soap, nullptr, nullptr, "ns1:searchByRunNumberPagination");
   case SOAP_TYPE_ICat3_PointerTons1__searchByRunNumberResponse:
     return soap_in_PointerTons1__searchByRunNumberResponse(
-        soap, NULL, NULL, "ns1:searchByRunNumberResponse");
+        soap, nullptr, nullptr, "ns1:searchByRunNumberResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchByRunNumber:
-    return soap_in_PointerTons1__searchByRunNumber(soap, NULL, NULL,
+    return soap_in_PointerTons1__searchByRunNumber(soap, nullptr, nullptr,
                                                    "ns1:searchByRunNumber");
   case SOAP_TYPE_ICat3_PointerTons1__listDatasetStatusResponse:
     return soap_in_PointerTons1__listDatasetStatusResponse(
-        soap, NULL, NULL, "ns1:listDatasetStatusResponse");
+        soap, nullptr, nullptr, "ns1:listDatasetStatusResponse");
   case SOAP_TYPE_ICat3_PointerTons1__listDatasetStatus:
-    return soap_in_PointerTons1__listDatasetStatus(soap, NULL, NULL,
+    return soap_in_PointerTons1__listDatasetStatus(soap, nullptr, nullptr,
                                                    "ns1:listDatasetStatus");
   case SOAP_TYPE_ICat3_PointerTons1__listDatasetTypesResponse:
     return soap_in_PointerTons1__listDatasetTypesResponse(
-        soap, NULL, NULL, "ns1:listDatasetTypesResponse");
+        soap, nullptr, nullptr, "ns1:listDatasetTypesResponse");
   case SOAP_TYPE_ICat3_PointerTons1__listDatasetTypes:
-    return soap_in_PointerTons1__listDatasetTypes(soap, NULL, NULL,
+    return soap_in_PointerTons1__listDatasetTypes(soap, nullptr, nullptr,
                                                   "ns1:listDatasetTypes");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetsBySampleResponse:
     return soap_in_PointerTons1__searchDatasetsBySampleResponse(
-        soap, NULL, NULL, "ns1:searchDatasetsBySampleResponse");
+        soap, nullptr, nullptr, "ns1:searchDatasetsBySampleResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchDatasetsBySample:
     return soap_in_PointerTons1__searchDatasetsBySample(
-        soap, NULL, NULL, "ns1:searchDatasetsBySample");
+        soap, nullptr, nullptr, "ns1:searchDatasetsBySample");
   case SOAP_TYPE_ICat3_PointerTons1__searchSamplesBySampleNameResponse:
     return soap_in_PointerTons1__searchSamplesBySampleNameResponse(
-        soap, NULL, NULL, "ns1:searchSamplesBySampleNameResponse");
+        soap, nullptr, nullptr, "ns1:searchSamplesBySampleNameResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchSamplesBySampleName:
     return soap_in_PointerTons1__searchSamplesBySampleName(
-        soap, NULL, NULL, "ns1:searchSamplesBySampleName");
+        soap, nullptr, nullptr, "ns1:searchSamplesBySampleName");
   case SOAP_TYPE_ICat3_PointerTons1__listInvestigationTypesResponse:
     return soap_in_PointerTons1__listInvestigationTypesResponse(
-        soap, NULL, NULL, "ns1:listInvestigationTypesResponse");
+        soap, nullptr, nullptr, "ns1:listInvestigationTypesResponse");
   case SOAP_TYPE_ICat3_PointerTons1__listInvestigationTypes:
     return soap_in_PointerTons1__listInvestigationTypes(
-        soap, NULL, NULL, "ns1:listInvestigationTypes");
+        soap, nullptr, nullptr, "ns1:listInvestigationTypes");
   case SOAP_TYPE_ICat3_PointerTons1__getInstrumentsWithDataResponse:
     return soap_in_PointerTons1__getInstrumentsWithDataResponse(
-        soap, NULL, NULL, "ns1:getInstrumentsWithDataResponse");
+        soap, nullptr, nullptr, "ns1:getInstrumentsWithDataResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getInstrumentsWithData:
     return soap_in_PointerTons1__getInstrumentsWithData(
-        soap, NULL, NULL, "ns1:getInstrumentsWithData");
+        soap, nullptr, nullptr, "ns1:getInstrumentsWithData");
   case SOAP_TYPE_ICat3_PointerTons1__getFacilityCyclesWithDataForInstrumentResponse:
     return soap_in_PointerTons1__getFacilityCyclesWithDataForInstrumentResponse(
-        soap, NULL, NULL, "ns1:getFacilityCyclesWithDataForInstrumentResponse");
+        soap, nullptr, nullptr,
+        "ns1:getFacilityCyclesWithDataForInstrumentResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getFacilityCyclesWithDataForInstrument:
     return soap_in_PointerTons1__getFacilityCyclesWithDataForInstrument(
-        soap, NULL, NULL, "ns1:getFacilityCyclesWithDataForInstrument");
+        soap, nullptr, nullptr, "ns1:getFacilityCyclesWithDataForInstrument");
   case SOAP_TYPE_ICat3_PointerTons1__listFacilityCyclesResponse:
     return soap_in_PointerTons1__listFacilityCyclesResponse(
-        soap, NULL, NULL, "ns1:listFacilityCyclesResponse");
+        soap, nullptr, nullptr, "ns1:listFacilityCyclesResponse");
   case SOAP_TYPE_ICat3_PointerTons1__listFacilityCycles:
-    return soap_in_PointerTons1__listFacilityCycles(soap, NULL, NULL,
+    return soap_in_PointerTons1__listFacilityCycles(soap, nullptr, nullptr,
                                                     "ns1:listFacilityCycles");
   case SOAP_TYPE_ICat3_PointerTons1__listParametersResponse:
     return soap_in_PointerTons1__listParametersResponse(
-        soap, NULL, NULL, "ns1:listParametersResponse");
+        soap, nullptr, nullptr, "ns1:listParametersResponse");
   case SOAP_TYPE_ICat3_PointerTons1__listParameters:
-    return soap_in_PointerTons1__listParameters(soap, NULL, NULL,
+    return soap_in_PointerTons1__listParameters(soap, nullptr, nullptr,
                                                 "ns1:listParameters");
   case SOAP_TYPE_ICat3_PointerTons1__listRolesResponse:
-    return soap_in_PointerTons1__listRolesResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__listRolesResponse(soap, nullptr, nullptr,
                                                    "ns1:listRolesResponse");
   case SOAP_TYPE_ICat3_PointerTons1__listRoles:
-    return soap_in_PointerTons1__listRoles(soap, NULL, NULL, "ns1:listRoles");
+    return soap_in_PointerTons1__listRoles(soap, nullptr, nullptr,
+                                           "ns1:listRoles");
   case SOAP_TYPE_ICat3_PointerTons1__getAllInstrumentsResponse:
     return soap_in_PointerTons1__getAllInstrumentsResponse(
-        soap, NULL, NULL, "ns1:getAllInstrumentsResponse");
+        soap, nullptr, nullptr, "ns1:getAllInstrumentsResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getAllInstruments:
-    return soap_in_PointerTons1__getAllInstruments(soap, NULL, NULL,
+    return soap_in_PointerTons1__getAllInstruments(soap, nullptr, nullptr,
                                                    "ns1:getAllInstruments");
   case SOAP_TYPE_ICat3_PointerTons1__listInstrumentsResponse:
     return soap_in_PointerTons1__listInstrumentsResponse(
-        soap, NULL, NULL, "ns1:listInstrumentsResponse");
+        soap, nullptr, nullptr, "ns1:listInstrumentsResponse");
   case SOAP_TYPE_ICat3_PointerTons1__listInstruments:
-    return soap_in_PointerTons1__listInstruments(soap, NULL, NULL,
+    return soap_in_PointerTons1__listInstruments(soap, nullptr, nullptr,
                                                  "ns1:listInstruments");
   case SOAP_TYPE_ICat3_PointerTons1__searchByUserSurnamePaginationResponse:
     return soap_in_PointerTons1__searchByUserSurnamePaginationResponse(
-        soap, NULL, NULL, "ns1:searchByUserSurnamePaginationResponse");
+        soap, nullptr, nullptr, "ns1:searchByUserSurnamePaginationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchByUserSurnamePagination:
     return soap_in_PointerTons1__searchByUserSurnamePagination(
-        soap, NULL, NULL, "ns1:searchByUserSurnamePagination");
+        soap, nullptr, nullptr, "ns1:searchByUserSurnamePagination");
   case SOAP_TYPE_ICat3_PointerTons1__searchByUserSurnameResponse:
     return soap_in_PointerTons1__searchByUserSurnameResponse(
-        soap, NULL, NULL, "ns1:searchByUserSurnameResponse");
+        soap, nullptr, nullptr, "ns1:searchByUserSurnameResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchByUserSurname:
-    return soap_in_PointerTons1__searchByUserSurname(soap, NULL, NULL,
+    return soap_in_PointerTons1__searchByUserSurname(soap, nullptr, nullptr,
                                                      "ns1:searchByUserSurname");
   case SOAP_TYPE_ICat3_PointerTons1__searchByUserIDPaginationResponse:
     return soap_in_PointerTons1__searchByUserIDPaginationResponse(
-        soap, NULL, NULL, "ns1:searchByUserIDPaginationResponse");
+        soap, nullptr, nullptr, "ns1:searchByUserIDPaginationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchByUserIDPagination:
     return soap_in_PointerTons1__searchByUserIDPagination(
-        soap, NULL, NULL, "ns1:searchByUserIDPagination");
+        soap, nullptr, nullptr, "ns1:searchByUserIDPagination");
   case SOAP_TYPE_ICat3_PointerTons1__searchByUserIDResponse:
     return soap_in_PointerTons1__searchByUserIDResponse(
-        soap, NULL, NULL, "ns1:searchByUserIDResponse");
+        soap, nullptr, nullptr, "ns1:searchByUserIDResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchByUserID:
-    return soap_in_PointerTons1__searchByUserID(soap, NULL, NULL,
+    return soap_in_PointerTons1__searchByUserID(soap, nullptr, nullptr,
                                                 "ns1:searchByUserID");
   case SOAP_TYPE_ICat3_PointerTons1__getMyInvestigationsIncludesPaginationResponse:
     return soap_in_PointerTons1__getMyInvestigationsIncludesPaginationResponse(
-        soap, NULL, NULL, "ns1:getMyInvestigationsIncludesPaginationResponse");
+        soap, nullptr, nullptr,
+        "ns1:getMyInvestigationsIncludesPaginationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getMyInvestigationsIncludesPagination:
     return soap_in_PointerTons1__getMyInvestigationsIncludesPagination(
-        soap, NULL, NULL, "ns1:getMyInvestigationsIncludesPagination");
+        soap, nullptr, nullptr, "ns1:getMyInvestigationsIncludesPagination");
   case SOAP_TYPE_ICat3_PointerTons1__getMyInvestigationsIncludesResponse:
     return soap_in_PointerTons1__getMyInvestigationsIncludesResponse(
-        soap, NULL, NULL, "ns1:getMyInvestigationsIncludesResponse");
+        soap, nullptr, nullptr, "ns1:getMyInvestigationsIncludesResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getMyInvestigationsIncludes:
     return soap_in_PointerTons1__getMyInvestigationsIncludes(
-        soap, NULL, NULL, "ns1:getMyInvestigationsIncludes");
+        soap, nullptr, nullptr, "ns1:getMyInvestigationsIncludes");
   case SOAP_TYPE_ICat3_PointerTons1__getMyInvestigationsResponse:
     return soap_in_PointerTons1__getMyInvestigationsResponse(
-        soap, NULL, NULL, "ns1:getMyInvestigationsResponse");
+        soap, nullptr, nullptr, "ns1:getMyInvestigationsResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getMyInvestigations:
-    return soap_in_PointerTons1__getMyInvestigations(soap, NULL, NULL,
+    return soap_in_PointerTons1__getMyInvestigations(soap, nullptr, nullptr,
                                                      "ns1:getMyInvestigations");
   case SOAP_TYPE_ICat3_PointerTons1__searchByKeywordsAllResponse:
     return soap_in_PointerTons1__searchByKeywordsAllResponse(
-        soap, NULL, NULL, "ns1:searchByKeywordsAllResponse");
+        soap, nullptr, nullptr, "ns1:searchByKeywordsAllResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchByKeywordsAll:
-    return soap_in_PointerTons1__searchByKeywordsAll(soap, NULL, NULL,
+    return soap_in_PointerTons1__searchByKeywordsAll(soap, nullptr, nullptr,
                                                      "ns1:searchByKeywordsAll");
   case SOAP_TYPE_ICat3_PointerTons1__searchByKeywordsResponse:
     return soap_in_PointerTons1__searchByKeywordsResponse(
-        soap, NULL, NULL, "ns1:searchByKeywordsResponse");
+        soap, nullptr, nullptr, "ns1:searchByKeywordsResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchByKeywords:
-    return soap_in_PointerTons1__searchByKeywords(soap, NULL, NULL,
+    return soap_in_PointerTons1__searchByKeywords(soap, nullptr, nullptr,
                                                   "ns1:searchByKeywords");
   case SOAP_TYPE_ICat3_PointerTons1__searchByAdvancedPaginationResponse:
     return soap_in_PointerTons1__searchByAdvancedPaginationResponse(
-        soap, NULL, NULL, "ns1:searchByAdvancedPaginationResponse");
+        soap, nullptr, nullptr, "ns1:searchByAdvancedPaginationResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchByAdvancedPagination:
     return soap_in_PointerTons1__searchByAdvancedPagination(
-        soap, NULL, NULL, "ns1:searchByAdvancedPagination");
+        soap, nullptr, nullptr, "ns1:searchByAdvancedPagination");
   case SOAP_TYPE_ICat3_PointerTons1__searchByAdvancedResponse:
     return soap_in_PointerTons1__searchByAdvancedResponse(
-        soap, NULL, NULL, "ns1:searchByAdvancedResponse");
+        soap, nullptr, nullptr, "ns1:searchByAdvancedResponse");
   case SOAP_TYPE_ICat3_PointerTons1__searchByAdvanced:
-    return soap_in_PointerTons1__searchByAdvanced(soap, NULL, NULL,
+    return soap_in_PointerTons1__searchByAdvanced(soap, nullptr, nullptr,
                                                   "ns1:searchByAdvanced");
   case SOAP_TYPE_ICat3_PointerTons1__getAllKeywordsResponse:
     return soap_in_PointerTons1__getAllKeywordsResponse(
-        soap, NULL, NULL, "ns1:getAllKeywordsResponse");
+        soap, nullptr, nullptr, "ns1:getAllKeywordsResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getAllKeywords:
-    return soap_in_PointerTons1__getAllKeywords(soap, NULL, NULL,
+    return soap_in_PointerTons1__getAllKeywords(soap, nullptr, nullptr,
                                                 "ns1:getAllKeywords");
   case SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUserTypeResponse:
     return soap_in_PointerTons1__getKeywordsForUserTypeResponse(
-        soap, NULL, NULL, "ns1:getKeywordsForUserTypeResponse");
+        soap, nullptr, nullptr, "ns1:getKeywordsForUserTypeResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUserType:
     return soap_in_PointerTons1__getKeywordsForUserType(
-        soap, NULL, NULL, "ns1:getKeywordsForUserType");
+        soap, nullptr, nullptr, "ns1:getKeywordsForUserType");
   case SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUserMaxResponse:
     return soap_in_PointerTons1__getKeywordsForUserMaxResponse(
-        soap, NULL, NULL, "ns1:getKeywordsForUserMaxResponse");
+        soap, nullptr, nullptr, "ns1:getKeywordsForUserMaxResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUserMax:
     return soap_in_PointerTons1__getKeywordsForUserMax(
-        soap, NULL, NULL, "ns1:getKeywordsForUserMax");
+        soap, nullptr, nullptr, "ns1:getKeywordsForUserMax");
   case SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUserStartWithMaxResponse:
     return soap_in_PointerTons1__getKeywordsForUserStartWithMaxResponse(
-        soap, NULL, NULL, "ns1:getKeywordsForUserStartWithMaxResponse");
+        soap, nullptr, nullptr, "ns1:getKeywordsForUserStartWithMaxResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUserStartWithMax:
     return soap_in_PointerTons1__getKeywordsForUserStartWithMax(
-        soap, NULL, NULL, "ns1:getKeywordsForUserStartWithMax");
+        soap, nullptr, nullptr, "ns1:getKeywordsForUserStartWithMax");
   case SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUserResponse:
     return soap_in_PointerTons1__getKeywordsForUserResponse(
-        soap, NULL, NULL, "ns1:getKeywordsForUserResponse");
+        soap, nullptr, nullptr, "ns1:getKeywordsForUserResponse");
   case SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUser:
-    return soap_in_PointerTons1__getKeywordsForUser(soap, NULL, NULL,
+    return soap_in_PointerTons1__getKeywordsForUser(soap, nullptr, nullptr,
                                                     "ns1:getKeywordsForUser");
   case SOAP_TYPE_ICat3_PointerTons1__isSessionValidResponse:
     return soap_in_PointerTons1__isSessionValidResponse(
-        soap, NULL, NULL, "ns1:isSessionValidResponse");
+        soap, nullptr, nullptr, "ns1:isSessionValidResponse");
   case SOAP_TYPE_ICat3_PointerTons1__isSessionValid:
-    return soap_in_PointerTons1__isSessionValid(soap, NULL, NULL,
+    return soap_in_PointerTons1__isSessionValid(soap, nullptr, nullptr,
                                                 "ns1:isSessionValid");
   case SOAP_TYPE_ICat3_PointerTons3__getUserDetailsResponse:
     return soap_in_PointerTons3__getUserDetailsResponse(
-        soap, NULL, NULL, "ns3:getUserDetailsResponse");
+        soap, nullptr, nullptr, "ns3:getUserDetailsResponse");
   case SOAP_TYPE_ICat3_PointerTons3__getUserDetails:
-    return soap_in_PointerTons3__getUserDetails(soap, NULL, NULL,
+    return soap_in_PointerTons3__getUserDetails(soap, nullptr, nullptr,
                                                 "ns3:getUserDetails");
   case SOAP_TYPE_ICat3_PointerTons1__logoutResponse:
-    return soap_in_PointerTons1__logoutResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__logoutResponse(soap, nullptr, nullptr,
                                                 "ns1:logoutResponse");
   case SOAP_TYPE_ICat3_PointerTons1__logout:
-    return soap_in_PointerTons1__logout(soap, NULL, NULL, "ns1:logout");
+    return soap_in_PointerTons1__logout(soap, nullptr, nullptr, "ns1:logout");
   case SOAP_TYPE_ICat3_PointerTons1__loginLifetimeResponse:
     return soap_in_PointerTons1__loginLifetimeResponse(
-        soap, NULL, NULL, "ns1:loginLifetimeResponse");
+        soap, nullptr, nullptr, "ns1:loginLifetimeResponse");
   case SOAP_TYPE_ICat3_PointerTons1__loginLifetime:
-    return soap_in_PointerTons1__loginLifetime(soap, NULL, NULL,
+    return soap_in_PointerTons1__loginLifetime(soap, nullptr, nullptr,
                                                "ns1:loginLifetime");
   case SOAP_TYPE_ICat3_PointerTons1__loginResponse:
-    return soap_in_PointerTons1__loginResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__loginResponse(soap, nullptr, nullptr,
                                                "ns1:loginResponse");
   case SOAP_TYPE_ICat3_PointerTons1__login:
-    return soap_in_PointerTons1__login(soap, NULL, NULL, "ns1:login");
+    return soap_in_PointerTons1__login(soap, nullptr, nullptr, "ns1:login");
   case SOAP_TYPE_ICat3_PointerTons3__ValidationException:
-    return soap_in_PointerTons3__ValidationException(soap, NULL, NULL,
+    return soap_in_PointerTons3__ValidationException(soap, nullptr, nullptr,
                                                      "ns3:ValidationException");
   case SOAP_TYPE_ICat3_PointerTons3__SessionException:
-    return soap_in_PointerTons3__SessionException(soap, NULL, NULL,
+    return soap_in_PointerTons3__SessionException(soap, nullptr, nullptr,
                                                   "ns3:SessionException");
   case SOAP_TYPE_ICat3_PointerTons3__NoSuchUserException:
-    return soap_in_PointerTons3__NoSuchUserException(soap, NULL, NULL,
+    return soap_in_PointerTons3__NoSuchUserException(soap, nullptr, nullptr,
                                                      "ns3:NoSuchUserException");
   case SOAP_TYPE_ICat3_PointerTons3__NoSuchObjectFoundException:
     return soap_in_PointerTons3__NoSuchObjectFoundException(
-        soap, NULL, NULL, "ns3:NoSuchObjectFoundException");
+        soap, nullptr, nullptr, "ns3:NoSuchObjectFoundException");
   case SOAP_TYPE_ICat3_PointerTons1__InsufficientPrivilegesException:
     return soap_in_PointerTons1__InsufficientPrivilegesException(
-        soap, NULL, NULL, "ns1:InsufficientPrivilegesException");
+        soap, nullptr, nullptr, "ns1:InsufficientPrivilegesException");
   case SOAP_TYPE_ICat3_PointerTons1__ICATAPIException:
-    return soap_in_PointerTons1__ICATAPIException(soap, NULL, NULL,
+    return soap_in_PointerTons1__ICATAPIException(soap, nullptr, nullptr,
                                                   "ns1:ICATAPIException");
   case SOAP_TYPE_ICat3_PointerTons1__parameterType:
-    return soap_in_PointerTons1__parameterType(soap, NULL, NULL,
+    return soap_in_PointerTons1__parameterType(soap, nullptr, nullptr,
                                                "ns1:parameterType");
   case SOAP_TYPE_ICat3_PointerTons1__comparisonOperator:
-    return soap_in_PointerTons1__comparisonOperator(soap, NULL, NULL,
+    return soap_in_PointerTons1__comparisonOperator(soap, nullptr, nullptr,
                                                     "ns1:comparisonOperator");
   case SOAP_TYPE_ICat3_PointerTons1__logicalOperator:
-    return soap_in_PointerTons1__logicalOperator(soap, NULL, NULL,
+    return soap_in_PointerTons1__logicalOperator(soap, nullptr, nullptr,
                                                  "ns1:logicalOperator");
   case SOAP_TYPE_ICat3_PointerTons1__shiftPK:
-    return soap_in_PointerTons1__shiftPK(soap, NULL, NULL, "ns1:shiftPK");
+    return soap_in_PointerTons1__shiftPK(soap, nullptr, nullptr, "ns1:shiftPK");
   case SOAP_TYPE_ICat3_PointerTons1__shift:
-    return soap_in_PointerTons1__shift(soap, NULL, NULL, "ns1:shift");
+    return soap_in_PointerTons1__shift(soap, nullptr, nullptr, "ns1:shift");
   case SOAP_TYPE_ICat3_PointerTons1__parameterPK:
-    return soap_in_PointerTons1__parameterPK(soap, NULL, NULL,
+    return soap_in_PointerTons1__parameterPK(soap, nullptr, nullptr,
                                              "ns1:parameterPK");
   case SOAP_TYPE_ICat3_PointerTons1__relatedDatafilesPK:
-    return soap_in_PointerTons1__relatedDatafilesPK(soap, NULL, NULL,
+    return soap_in_PointerTons1__relatedDatafilesPK(soap, nullptr, nullptr,
                                                     "ns1:relatedDatafilesPK");
   case SOAP_TYPE_ICat3_PointerTons1__datafileFormatPK:
-    return soap_in_PointerTons1__datafileFormatPK(soap, NULL, NULL,
+    return soap_in_PointerTons1__datafileFormatPK(soap, nullptr, nullptr,
                                                   "ns1:datafileFormatPK");
   case SOAP_TYPE_ICat3_PointerTons1__relatedDatafiles:
-    return soap_in_PointerTons1__relatedDatafiles(soap, NULL, NULL,
+    return soap_in_PointerTons1__relatedDatafiles(soap, nullptr, nullptr,
                                                   "ns1:relatedDatafiles");
   case SOAP_TYPE_ICat3_PointerTons1__parameterValueType:
-    return soap_in_PointerTons1__parameterValueType(soap, NULL, NULL,
+    return soap_in_PointerTons1__parameterValueType(soap, nullptr, nullptr,
                                                     "ns1:parameterValueType");
   case SOAP_TYPE_ICat3_PointerTons1__sampleInclude:
-    return soap_in_PointerTons1__sampleInclude(soap, NULL, NULL,
+    return soap_in_PointerTons1__sampleInclude(soap, nullptr, nullptr,
                                                "ns1:sampleInclude");
   case SOAP_TYPE_ICat3_PointerTons1__restrictionAttributes:
     return soap_in_PointerTons1__restrictionAttributes(
-        soap, NULL, NULL, "ns1:restrictionAttributes");
+        soap, nullptr, nullptr, "ns1:restrictionAttributes");
   case SOAP_TYPE_ICat3_PointerToint:
-    return soap_in_PointerToint(soap, NULL, NULL, "xsd:int");
+    return soap_in_PointerToint(soap, nullptr, nullptr, "xsd:int");
   case SOAP_TYPE_ICat3_PointerTons1__datafileInclude:
-    return soap_in_PointerTons1__datafileInclude(soap, NULL, NULL,
+    return soap_in_PointerTons1__datafileInclude(soap, nullptr, nullptr,
                                                  "ns1:datafileInclude");
   case SOAP_TYPE_ICat3_PointerTons1__userDetails:
-    return soap_in_PointerTons1__userDetails(soap, NULL, NULL,
+    return soap_in_PointerTons1__userDetails(soap, nullptr, nullptr,
                                              "ns1:userDetails");
   case SOAP_TYPE_ICat3_PointerTons1__datasetInclude:
-    return soap_in_PointerTons1__datasetInclude(soap, NULL, NULL,
+    return soap_in_PointerTons1__datasetInclude(soap, nullptr, nullptr,
                                                 "ns1:datasetInclude");
   case SOAP_TYPE_ICat3_PointerTons1__datafileFormat:
-    return soap_in_PointerTons1__datafileFormat(soap, NULL, NULL,
+    return soap_in_PointerTons1__datafileFormat(soap, nullptr, nullptr,
                                                 "ns1:datafileFormat");
   case SOAP_TYPE_ICat3_PointerTodouble:
-    return soap_in_PointerTodouble(soap, NULL, NULL, "xsd:double");
+    return soap_in_PointerTodouble(soap, nullptr, nullptr, "xsd:double");
   case SOAP_TYPE_ICat3_PointerTotime:
-    return soap_in_PointerTotime(soap, NULL, NULL, "xsd:dateTime");
+    return soap_in_PointerTotime(soap, nullptr, nullptr, "xsd:dateTime");
   case SOAP_TYPE_ICat3_PointerTons1__advancedSearchDetails:
     return soap_in_PointerTons1__advancedSearchDetails(
-        soap, NULL, NULL, "ns1:advancedSearchDetails");
+        soap, nullptr, nullptr, "ns1:advancedSearchDetails");
   case SOAP_TYPE_ICat3_PointerTons1__icatAuthorisation:
-    return soap_in_PointerTons1__icatAuthorisation(soap, NULL, NULL,
+    return soap_in_PointerTons1__icatAuthorisation(soap, nullptr, nullptr,
                                                    "ns1:icatAuthorisation");
   case SOAP_TYPE_ICat3_PointerTons1__elementType:
-    return soap_in_PointerTons1__elementType(soap, NULL, NULL,
+    return soap_in_PointerTons1__elementType(soap, nullptr, nullptr,
                                              "ns1:elementType");
   case SOAP_TYPE_ICat3_PointerTons1__keyword:
-    return soap_in_PointerTons1__keyword(soap, NULL, NULL, "ns1:keyword");
+    return soap_in_PointerTons1__keyword(soap, nullptr, nullptr, "ns1:keyword");
   case SOAP_TYPE_ICat3_PointerTons1__datasetParameter:
-    return soap_in_PointerTons1__datasetParameter(soap, NULL, NULL,
+    return soap_in_PointerTons1__datasetParameter(soap, nullptr, nullptr,
                                                   "ns1:datasetParameter");
   case SOAP_TYPE_ICat3_PointerTons1__sampleParameterPK:
-    return soap_in_PointerTons1__sampleParameterPK(soap, NULL, NULL,
+    return soap_in_PointerTons1__sampleParameterPK(soap, nullptr, nullptr,
                                                    "ns1:sampleParameterPK");
   case SOAP_TYPE_ICat3_PointerTons1__investigator:
-    return soap_in_PointerTons1__investigator(soap, NULL, NULL,
+    return soap_in_PointerTons1__investigator(soap, nullptr, nullptr,
                                               "ns1:investigator");
   case SOAP_TYPE_ICat3_PointerTons1__datafileParameterPK:
-    return soap_in_PointerTons1__datafileParameterPK(soap, NULL, NULL,
+    return soap_in_PointerTons1__datafileParameterPK(soap, nullptr, nullptr,
                                                      "ns1:datafileParameterPK");
   case SOAP_TYPE_ICat3_PointerTons1__publication:
-    return soap_in_PointerTons1__publication(soap, NULL, NULL,
+    return soap_in_PointerTons1__publication(soap, nullptr, nullptr,
                                              "ns1:publication");
   case SOAP_TYPE_ICat3_PointerTons1__datasetParameterPK:
-    return soap_in_PointerTons1__datasetParameterPK(soap, NULL, NULL,
+    return soap_in_PointerTons1__datasetParameterPK(soap, nullptr, nullptr,
                                                     "ns1:datasetParameterPK");
   case SOAP_TYPE_ICat3_PointerTons1__investigationInclude:
     return soap_in_PointerTons1__investigationInclude(
-        soap, NULL, NULL, "ns1:investigationInclude");
+        soap, nullptr, nullptr, "ns1:investigationInclude");
   case SOAP_TYPE_ICat3_PointerTons1__keywordDetails:
-    return soap_in_PointerTons1__keywordDetails(soap, NULL, NULL,
+    return soap_in_PointerTons1__keywordDetails(soap, nullptr, nullptr,
                                                 "ns1:keywordDetails");
   case SOAP_TYPE_ICat3_PointerTons1__investigation:
-    return soap_in_PointerTons1__investigation(soap, NULL, NULL,
+    return soap_in_PointerTons1__investigation(soap, nullptr, nullptr,
                                                "ns1:investigation");
   case SOAP_TYPE_ICat3_PointerTons1__downloadInfo:
-    return soap_in_PointerTons1__downloadInfo(soap, NULL, NULL,
+    return soap_in_PointerTons1__downloadInfo(soap, nullptr, nullptr,
                                               "ns1:downloadInfo");
   case SOAP_TYPE_ICat3_PointerTons1__sampleParameter:
-    return soap_in_PointerTons1__sampleParameter(soap, NULL, NULL,
+    return soap_in_PointerTons1__sampleParameter(soap, nullptr, nullptr,
                                                  "ns1:sampleParameter");
   case SOAP_TYPE_ICat3_PointerTons1__parameterComparisonCondition:
     return soap_in_PointerTons1__parameterComparisonCondition(
-        soap, NULL, NULL, "ns1:parameterComparisonCondition");
+        soap, nullptr, nullptr, "ns1:parameterComparisonCondition");
   case SOAP_TYPE_ICat3_PointerTons1__parameterSearch:
-    return soap_in_PointerTons1__parameterSearch(soap, NULL, NULL,
+    return soap_in_PointerTons1__parameterSearch(soap, nullptr, nullptr,
                                                  "ns1:parameterSearch");
   case SOAP_TYPE_ICat3_PointerTons1__keywordType:
-    return soap_in_PointerTons1__keywordType(soap, NULL, NULL,
+    return soap_in_PointerTons1__keywordType(soap, nullptr, nullptr,
                                              "ns1:keywordType");
   case SOAP_TYPE_ICat3_PointerTons1__dataset:
-    return soap_in_PointerTons1__dataset(soap, NULL, NULL, "ns1:dataset");
+    return soap_in_PointerTons1__dataset(soap, nullptr, nullptr, "ns1:dataset");
   case SOAP_TYPE_ICat3_PointerTons1__keywordPK:
-    return soap_in_PointerTons1__keywordPK(soap, NULL, NULL, "ns1:keywordPK");
+    return soap_in_PointerTons1__keywordPK(soap, nullptr, nullptr,
+                                           "ns1:keywordPK");
   case SOAP_TYPE_ICat3_PointerTons1__investigatorPK:
-    return soap_in_PointerTons1__investigatorPK(soap, NULL, NULL,
+    return soap_in_PointerTons1__investigatorPK(soap, nullptr, nullptr,
                                                 "ns1:investigatorPK");
   case SOAP_TYPE_ICat3_PointerTons1__instrument:
-    return soap_in_PointerTons1__instrument(soap, NULL, NULL, "ns1:instrument");
+    return soap_in_PointerTons1__instrument(soap, nullptr, nullptr,
+                                            "ns1:instrument");
   case SOAP_TYPE_ICat3_PointerTons1__datafileParameter:
-    return soap_in_PointerTons1__datafileParameter(soap, NULL, NULL,
+    return soap_in_PointerTons1__datafileParameter(soap, nullptr, nullptr,
                                                    "ns1:datafileParameter");
   case SOAP_TYPE_ICat3_PointerTons1__facilityCycle:
-    return soap_in_PointerTons1__facilityCycle(soap, NULL, NULL,
+    return soap_in_PointerTons1__facilityCycle(soap, nullptr, nullptr,
                                                "ns1:facilityCycle");
   case SOAP_TYPE_ICat3_PointerTons1__parameter:
-    return soap_in_PointerTons1__parameter(soap, NULL, NULL, "ns1:parameter");
+    return soap_in_PointerTons1__parameter(soap, nullptr, nullptr,
+                                           "ns1:parameter");
   case SOAP_TYPE_ICat3_PointerTons1__parameterLogicalCondition:
     return soap_in_PointerTons1__parameterLogicalCondition(
-        soap, NULL, NULL, "ns1:parameterLogicalCondition");
+        soap, nullptr, nullptr, "ns1:parameterLogicalCondition");
   case SOAP_TYPE_ICat3_PointerTons1__datafile:
-    return soap_in_PointerTons1__datafile(soap, NULL, NULL, "ns1:datafile");
+    return soap_in_PointerTons1__datafile(soap, nullptr, nullptr,
+                                          "ns1:datafile");
   case SOAP_TYPE_ICat3_PointerToLONG64:
-    return soap_in_PointerToLONG64(soap, NULL, NULL, "xsd:long");
+    return soap_in_PointerToLONG64(soap, nullptr, nullptr, "xsd:long");
   case SOAP_TYPE_ICat3_PointerTons1__restrictionComparisonCondition:
     return soap_in_PointerTons1__restrictionComparisonCondition(
-        soap, NULL, NULL, "ns1:restrictionComparisonCondition");
+        soap, nullptr, nullptr, "ns1:restrictionComparisonCondition");
   case SOAP_TYPE_ICat3_PointerTons1__sample:
-    return soap_in_PointerTons1__sample(soap, NULL, NULL, "ns1:sample");
+    return soap_in_PointerTons1__sample(soap, nullptr, nullptr, "ns1:sample");
   case SOAP_TYPE_ICat3_PointerTons1__icatRole:
-    return soap_in_PointerTons1__icatRole(soap, NULL, NULL, "ns1:icatRole");
+    return soap_in_PointerTons1__icatRole(soap, nullptr, nullptr,
+                                          "ns1:icatRole");
   case SOAP_TYPE_ICat3_PointerTons1__facilityUser:
-    return soap_in_PointerTons1__facilityUser(soap, NULL, NULL,
+    return soap_in_PointerTons1__facilityUser(soap, nullptr, nullptr,
                                               "ns1:facilityUser");
   case SOAP_TYPE_ICat3_PointerTons1__restrictionCondition:
     return soap_in_PointerTons1__restrictionCondition(
-        soap, NULL, NULL, "ns1:restrictionCondition");
+        soap, nullptr, nullptr, "ns1:restrictionCondition");
   case SOAP_TYPE_ICat3_PointerTons1__parameterCondition:
-    return soap_in_PointerTons1__parameterCondition(soap, NULL, NULL,
+    return soap_in_PointerTons1__parameterCondition(soap, nullptr, nullptr,
                                                     "ns1:parameterCondition");
   case SOAP_TYPE_ICat3_PointerToxsd__anyType:
-    return soap_in_PointerToxsd__anyType(soap, NULL, NULL, "xsd:anyType");
+    return soap_in_PointerToxsd__anyType(soap, nullptr, nullptr, "xsd:anyType");
   case SOAP_TYPE_ICat3_PointerTons1__restrictionLogicalCondition:
     return soap_in_PointerTons1__restrictionLogicalCondition(
-        soap, NULL, NULL, "ns1:restrictionLogicalCondition");
+        soap, nullptr, nullptr, "ns1:restrictionLogicalCondition");
   case SOAP_TYPE_ICat3_PointerTostd__string:
-    return soap_in_PointerTostd__string(soap, NULL, NULL, "xsd:string");
+    return soap_in_PointerTostd__string(soap, nullptr, nullptr, "xsd:string");
   case SOAP_TYPE_ICat3__QName: {
     char **s;
-    s = soap_in__QName(soap, NULL, NULL, "xsd:QName");
-    return s ? *s : NULL;
+    s = soap_in__QName(soap, nullptr, nullptr, "xsd:QName");
+    return s ? *s : nullptr;
   }
   case SOAP_TYPE_ICat3_string: {
     char **s;
-    s = soap_in_string(soap, NULL, NULL, "xsd:string");
-    return s ? *s : NULL;
+    s = soap_in_string(soap, nullptr, nullptr, "xsd:string");
+    return s ? *s : nullptr;
   }
   default:
 #endif
@@ -2225,71 +2310,75 @@ SOAP_FMAC3 void *SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) {
       t = soap->tag;
     if (!soap_match_tag(soap, t, "ns1:elementType")) {
       *type = SOAP_TYPE_ICat3_ns1__elementType_;
-      return soap_in_ns1__elementType_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__elementType_(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:parameterType")) {
       *type = SOAP_TYPE_ICat3_ns1__parameterType_;
-      return soap_in_ns1__parameterType_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__parameterType_(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:keywordType")) {
       *type = SOAP_TYPE_ICat3_ns1__keywordType_;
-      return soap_in_ns1__keywordType_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__keywordType_(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:comparisonOperator")) {
       *type = SOAP_TYPE_ICat3_ns1__comparisonOperator_;
-      return soap_in_ns1__comparisonOperator_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__comparisonOperator_(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:parameterValueType")) {
       *type = SOAP_TYPE_ICat3_ns1__parameterValueType_;
-      return soap_in_ns1__parameterValueType_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__parameterValueType_(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:sampleInclude")) {
       *type = SOAP_TYPE_ICat3_ns1__sampleInclude_;
-      return soap_in_ns1__sampleInclude_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__sampleInclude_(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:restrictionAttributes")) {
       *type = SOAP_TYPE_ICat3_ns1__restrictionAttributes_;
-      return soap_in_ns1__restrictionAttributes_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__restrictionAttributes_(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:investigationInclude")) {
       *type = SOAP_TYPE_ICat3_ns1__investigationInclude_;
-      return soap_in_ns1__investigationInclude_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__investigationInclude_(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datasetInclude")) {
       *type = SOAP_TYPE_ICat3_ns1__datasetInclude_;
-      return soap_in_ns1__datasetInclude_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datasetInclude_(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datafileInclude")) {
       *type = SOAP_TYPE_ICat3_ns1__datafileInclude_;
-      return soap_in_ns1__datafileInclude_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datafileInclude_(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:logicalOperator")) {
       *type = SOAP_TYPE_ICat3_ns1__logicalOperator_;
-      return soap_in_ns1__logicalOperator_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__logicalOperator_(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns3:NoSuchUserException")) {
       *type = SOAP_TYPE_ICat3_ns3__NoSuchUserException;
-      return soap_in_ns3__NoSuchUserException(soap, NULL, NULL, NULL);
+      return soap_in_ns3__NoSuchUserException(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns3:getUserDetailsResponse")) {
       *type = SOAP_TYPE_ICat3_ns3__getUserDetailsResponse;
-      return soap_in_ns3__getUserDetailsResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns3__getUserDetailsResponse(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns3:getUserDetails")) {
       *type = SOAP_TYPE_ICat3_ns3__getUserDetails;
-      return soap_in_ns3__getUserDetails(soap, NULL, NULL, NULL);
+      return soap_in_ns3__getUserDetails(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns3:ValidationException")) {
       *type = SOAP_TYPE_ICat3_ns3__ValidationException;
-      return soap_in_ns3__ValidationException(soap, NULL, NULL, NULL);
+      return soap_in_ns3__ValidationException(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns3:NoSuchObjectFoundException")) {
       *type = SOAP_TYPE_ICat3_ns3__NoSuchObjectFoundException;
-      return soap_in_ns3__NoSuchObjectFoundException(soap, NULL, NULL, NULL);
+      return soap_in_ns3__NoSuchObjectFoundException(soap, nullptr, nullptr,
+                                                     nullptr);
     }
     if (!soap_match_tag(soap, t, "ns3:SessionException")) {
       *type = SOAP_TYPE_ICat3_ns3__SessionException;
-      return soap_in_ns3__SessionException(soap, NULL, NULL, NULL);
+      return soap_in_ns3__SessionException(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(
             soap, t,
@@ -2297,1547 +2386,1654 @@ SOAP_FMAC3 void *SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) {
       *type =
           SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionComparasionResponse;
       return soap_in_ns1__searchInvestigationByRestrictionComparasionResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchInvestigationByRestrictionComparasion")) {
       *type = SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionComparasion;
       return soap_in_ns1__searchInvestigationByRestrictionComparasion(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getDatasetsResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getDatasetsResponse;
-      return soap_in_ns1__getDatasetsResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getDatasetsResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getDatasets")) {
       *type = SOAP_TYPE_ICat3_ns1__getDatasets;
-      return soap_in_ns1__getDatasets(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getDatasets(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifyDataFileParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__modifyDataFileParameterResponse;
-      return soap_in_ns1__modifyDataFileParameterResponse(soap, NULL, NULL,
-                                                          NULL);
+      return soap_in_ns1__modifyDataFileParameterResponse(soap, nullptr,
+                                                          nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifyDataFileParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__modifyDataFileParameter;
-      return soap_in_ns1__modifyDataFileParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifyDataFileParameter(soap, nullptr, nullptr,
+                                                  nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listParametersResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__listParametersResponse;
-      return soap_in_ns1__listParametersResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listParametersResponse(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listParameters")) {
       *type = SOAP_TYPE_ICat3_ns1__listParameters;
-      return soap_in_ns1__listParameters(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listParameters(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchSampleByParameterComparisonResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByParameterComparisonResponse;
-      return soap_in_ns1__searchSampleByParameterComparisonResponse(soap, NULL,
-                                                                    NULL, NULL);
+      return soap_in_ns1__searchSampleByParameterComparisonResponse(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchSampleByParameterComparison")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByParameterComparison;
-      return soap_in_ns1__searchSampleByParameterComparison(soap, NULL, NULL,
-                                                            NULL);
+      return soap_in_ns1__searchSampleByParameterComparison(soap, nullptr,
+                                                            nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteSampleParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteSampleParameterResponse;
-      return soap_in_ns1__deleteSampleParameterResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteSampleParameterResponse(soap, nullptr, nullptr,
+                                                        nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteSampleParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteSampleParameter;
-      return soap_in_ns1__deleteSampleParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteSampleParameter(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchSampleByRestrictionLogicalResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionLogicalResponse;
-      return soap_in_ns1__searchSampleByRestrictionLogicalResponse(soap, NULL,
-                                                                   NULL, NULL);
+      return soap_in_ns1__searchSampleByRestrictionLogicalResponse(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchSampleByRestrictionLogical")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionLogical;
-      return soap_in_ns1__searchSampleByRestrictionLogical(soap, NULL, NULL,
-                                                           NULL);
+      return soap_in_ns1__searchSampleByRestrictionLogical(soap, nullptr,
+                                                           nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addDataFileParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__addDataFileParameterResponse;
-      return soap_in_ns1__addDataFileParameterResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addDataFileParameterResponse(soap, nullptr, nullptr,
+                                                       nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addDataFileParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__addDataFileParameter;
-      return soap_in_ns1__addDataFileParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addDataFileParameter(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatasetsBySampleResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetsBySampleResponse;
-      return soap_in_ns1__searchDatasetsBySampleResponse(soap, NULL, NULL,
-                                                         NULL);
+      return soap_in_ns1__searchDatasetsBySampleResponse(soap, nullptr, nullptr,
+                                                         nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatasetsBySample")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetsBySample;
-      return soap_in_ns1__searchDatasetsBySample(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchDatasetsBySample(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:createInvestigationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__createInvestigationResponse;
-      return soap_in_ns1__createInvestigationResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__createInvestigationResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:createInvestigation")) {
       *type = SOAP_TYPE_ICat3_ns1__createInvestigation;
-      return soap_in_ns1__createInvestigation(soap, NULL, NULL, NULL);
+      return soap_in_ns1__createInvestigation(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addPublicationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__addPublicationResponse;
-      return soap_in_ns1__addPublicationResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addPublicationResponse(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addPublication")) {
       *type = SOAP_TYPE_ICat3_ns1__addPublication;
-      return soap_in_ns1__addPublication(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addPublication(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteDataFileParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteDataFileParameterResponse;
-      return soap_in_ns1__deleteDataFileParameterResponse(soap, NULL, NULL,
-                                                          NULL);
+      return soap_in_ns1__deleteDataFileParameterResponse(soap, nullptr,
+                                                          nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteDataFileParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteDataFileParameter;
-      return soap_in_ns1__deleteDataFileParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteDataFileParameter(soap, nullptr, nullptr,
+                                                  nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getInvestigationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getInvestigationResponse;
-      return soap_in_ns1__getInvestigationResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getInvestigationResponse(soap, nullptr, nullptr,
+                                                   nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getInvestigation")) {
       *type = SOAP_TYPE_ICat3_ns1__getInvestigation;
-      return soap_in_ns1__getInvestigation(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getInvestigation(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getInvestigationIncludesResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getInvestigationIncludesResponse;
-      return soap_in_ns1__getInvestigationIncludesResponse(soap, NULL, NULL,
-                                                           NULL);
+      return soap_in_ns1__getInvestigationIncludesResponse(soap, nullptr,
+                                                           nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getInvestigationIncludes")) {
       *type = SOAP_TYPE_ICat3_ns1__getInvestigationIncludes;
-      return soap_in_ns1__getInvestigationIncludes(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getInvestigationIncludes(soap, nullptr, nullptr,
+                                                   nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifyDataFileResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__modifyDataFileResponse;
-      return soap_in_ns1__modifyDataFileResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifyDataFileResponse(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifyDataFile")) {
       *type = SOAP_TYPE_ICat3_ns1__modifyDataFile;
-      return soap_in_ns1__modifyDataFile(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifyDataFile(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getDatafileResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getDatafileResponse;
-      return soap_in_ns1__getDatafileResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getDatafileResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getDatafile")) {
       *type = SOAP_TYPE_ICat3_ns1__getDatafile;
-      return soap_in_ns1__getDatafile(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getDatafile(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:ICATAPIException")) {
       *type = SOAP_TYPE_ICat3_ns1__ICATAPIException;
-      return soap_in_ns1__ICATAPIException(soap, NULL, NULL, NULL);
+      return soap_in_ns1__ICATAPIException(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:ingestMetadataResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__ingestMetadataResponse;
-      return soap_in_ns1__ingestMetadataResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__ingestMetadataResponse(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:ingestMetadata")) {
       *type = SOAP_TYPE_ICat3_ns1__ingestMetadata;
-      return soap_in_ns1__ingestMetadata(soap, NULL, NULL, NULL);
+      return soap_in_ns1__ingestMetadata(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatasetByRestrictionResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionResponse;
-      return soap_in_ns1__searchDatasetByRestrictionResponse(soap, NULL, NULL,
-                                                             NULL);
+      return soap_in_ns1__searchDatasetByRestrictionResponse(soap, nullptr,
+                                                             nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatasetByRestriction")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByRestriction;
-      return soap_in_ns1__searchDatasetByRestriction(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchDatasetByRestriction(soap, nullptr, nullptr,
+                                                     nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listRolesResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__listRolesResponse;
-      return soap_in_ns1__listRolesResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listRolesResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listRoles")) {
       *type = SOAP_TYPE_ICat3_ns1__listRoles;
-      return soap_in_ns1__listRoles(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listRoles(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:updateAuthorisationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__updateAuthorisationResponse;
-      return soap_in_ns1__updateAuthorisationResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__updateAuthorisationResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:updateAuthorisation")) {
       *type = SOAP_TYPE_ICat3_ns1__updateAuthorisation;
-      return soap_in_ns1__updateAuthorisation(soap, NULL, NULL, NULL);
+      return soap_in_ns1__updateAuthorisation(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getDatasetIncludesResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getDatasetIncludesResponse;
-      return soap_in_ns1__getDatasetIncludesResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getDatasetIncludesResponse(soap, nullptr, nullptr,
+                                                     nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getDatasetIncludes")) {
       *type = SOAP_TYPE_ICat3_ns1__getDatasetIncludes;
-      return soap_in_ns1__getDatasetIncludes(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getDatasetIncludes(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getDatasetResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getDatasetResponse;
-      return soap_in_ns1__getDatasetResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getDatasetResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getDataset")) {
       *type = SOAP_TYPE_ICat3_ns1__getDataset;
-      return soap_in_ns1__getDataset(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getDataset(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteAuthorisationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteAuthorisationResponse;
-      return soap_in_ns1__deleteAuthorisationResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteAuthorisationResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteAuthorisation")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteAuthorisation;
-      return soap_in_ns1__deleteAuthorisation(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteAuthorisation(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deletePublicationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__deletePublicationResponse;
-      return soap_in_ns1__deletePublicationResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deletePublicationResponse(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deletePublication")) {
       *type = SOAP_TYPE_ICat3_ns1__deletePublication;
-      return soap_in_ns1__deletePublication(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deletePublication(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:loginResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__loginResponse;
-      return soap_in_ns1__loginResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__loginResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:login")) {
       *type = SOAP_TYPE_ICat3_ns1__login;
-      return soap_in_ns1__login(soap, NULL, NULL, NULL);
+      return soap_in_ns1__login(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:loginLifetimeResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__loginLifetimeResponse;
-      return soap_in_ns1__loginLifetimeResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__loginLifetimeResponse(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:loginLifetime")) {
       *type = SOAP_TYPE_ICat3_ns1__loginLifetime;
-      return soap_in_ns1__loginLifetime(soap, NULL, NULL, NULL);
+      return soap_in_ns1__loginLifetime(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getParameterByUnitsResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getParameterByUnitsResponse;
-      return soap_in_ns1__getParameterByUnitsResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getParameterByUnitsResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getParameterByUnits")) {
       *type = SOAP_TYPE_ICat3_ns1__getParameterByUnits;
-      return soap_in_ns1__getParameterByUnits(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getParameterByUnits(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addSampleResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__addSampleResponse;
-      return soap_in_ns1__addSampleResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addSampleResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addSample")) {
       *type = SOAP_TYPE_ICat3_ns1__addSample;
-      return soap_in_ns1__addSample(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addSample(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addAuthorisationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__addAuthorisationResponse;
-      return soap_in_ns1__addAuthorisationResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addAuthorisationResponse(soap, nullptr, nullptr,
+                                                   nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addAuthorisation")) {
       *type = SOAP_TYPE_ICat3_ns1__addAuthorisation;
-      return soap_in_ns1__addAuthorisation(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addAuthorisation(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:createDataFilesResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__createDataFilesResponse;
-      return soap_in_ns1__createDataFilesResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__createDataFilesResponse(soap, nullptr, nullptr,
+                                                  nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:createDataFiles")) {
       *type = SOAP_TYPE_ICat3_ns1__createDataFiles;
-      return soap_in_ns1__createDataFiles(soap, NULL, NULL, NULL);
+      return soap_in_ns1__createDataFiles(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addDataSetParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__addDataSetParameterResponse;
-      return soap_in_ns1__addDataSetParameterResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addDataSetParameterResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addDataSetParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__addDataSetParameter;
-      return soap_in_ns1__addDataSetParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addDataSetParameter(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifyInvestigatorResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__modifyInvestigatorResponse;
-      return soap_in_ns1__modifyInvestigatorResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifyInvestigatorResponse(soap, nullptr, nullptr,
+                                                     nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifyInvestigator")) {
       *type = SOAP_TYPE_ICat3_ns1__modifyInvestigator;
-      return soap_in_ns1__modifyInvestigator(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifyInvestigator(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifySampleParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__modifySampleParameterResponse;
-      return soap_in_ns1__modifySampleParameterResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifySampleParameterResponse(soap, nullptr, nullptr,
+                                                        nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifySampleParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__modifySampleParameter;
-      return soap_in_ns1__modifySampleParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifySampleParameter(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listDatafileFormatsResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__listDatafileFormatsResponse;
-      return soap_in_ns1__listDatafileFormatsResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listDatafileFormatsResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listDatafileFormats")) {
       *type = SOAP_TYPE_ICat3_ns1__listDatafileFormats;
-      return soap_in_ns1__listDatafileFormats(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listDatafileFormats(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchInvestigationByParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterResponse;
-      return soap_in_ns1__searchInvestigationByParameterResponse(soap, NULL,
-                                                                 NULL, NULL);
+      return soap_in_ns1__searchInvestigationByParameterResponse(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchInvestigationByParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__searchInvestigationByParameter;
-      return soap_in_ns1__searchInvestigationByParameter(soap, NULL, NULL,
-                                                         NULL);
+      return soap_in_ns1__searchInvestigationByParameter(soap, nullptr, nullptr,
+                                                         nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByAdvancedResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByAdvancedResponse;
-      return soap_in_ns1__searchByAdvancedResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByAdvancedResponse(soap, nullptr, nullptr,
+                                                   nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByAdvanced")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByAdvanced;
-      return soap_in_ns1__searchByAdvanced(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByAdvanced(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByAdvancedPaginationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByAdvancedPaginationResponse;
-      return soap_in_ns1__searchByAdvancedPaginationResponse(soap, NULL, NULL,
-                                                             NULL);
+      return soap_in_ns1__searchByAdvancedPaginationResponse(soap, nullptr,
+                                                             nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:advancedSearchDetails")) {
       *type = SOAP_TYPE_ICat3_ns1__advancedSearchDetails;
-      return soap_in_ns1__advancedSearchDetails(soap, NULL, NULL, NULL);
+      return soap_in_ns1__advancedSearchDetails(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByAdvancedPagination")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByAdvancedPagination;
-      return soap_in_ns1__searchByAdvancedPagination(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByAdvancedPagination(soap, nullptr, nullptr,
+                                                     nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchDatafileByParameterComparisonResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByParameterComparisonResponse;
       return soap_in_ns1__searchDatafileByParameterComparisonResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatafileByParameterComparison")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByParameterComparison;
-      return soap_in_ns1__searchDatafileByParameterComparison(soap, NULL, NULL,
-                                                              NULL);
+      return soap_in_ns1__searchDatafileByParameterComparison(soap, nullptr,
+                                                              nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByRunNumberResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByRunNumberResponse;
-      return soap_in_ns1__searchByRunNumberResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByRunNumberResponse(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByRunNumber")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByRunNumber;
-      return soap_in_ns1__searchByRunNumber(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByRunNumber(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByRunNumberPaginationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByRunNumberPaginationResponse;
-      return soap_in_ns1__searchByRunNumberPaginationResponse(soap, NULL, NULL,
-                                                              NULL);
+      return soap_in_ns1__searchByRunNumberPaginationResponse(soap, nullptr,
+                                                              nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByRunNumberPagination")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByRunNumberPagination;
-      return soap_in_ns1__searchByRunNumberPagination(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByRunNumberPagination(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addDataSetParametersResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__addDataSetParametersResponse;
-      return soap_in_ns1__addDataSetParametersResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addDataSetParametersResponse(soap, nullptr, nullptr,
+                                                       nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addDataSetParameters")) {
       *type = SOAP_TYPE_ICat3_ns1__addDataSetParameters;
-      return soap_in_ns1__addDataSetParameters(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addDataSetParameters(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteKeywordResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteKeywordResponse;
-      return soap_in_ns1__deleteKeywordResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteKeywordResponse(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteKeyword")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteKeyword;
-      return soap_in_ns1__deleteKeyword(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteKeyword(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatasetByParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByParameterResponse;
-      return soap_in_ns1__searchDatasetByParameterResponse(soap, NULL, NULL,
-                                                           NULL);
+      return soap_in_ns1__searchDatasetByParameterResponse(soap, nullptr,
+                                                           nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatasetByParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByParameter;
-      return soap_in_ns1__searchDatasetByParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchDatasetByParameter(soap, nullptr, nullptr,
+                                                   nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteSampleResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteSampleResponse;
-      return soap_in_ns1__deleteSampleResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteSampleResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteSample")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteSample;
-      return soap_in_ns1__deleteSample(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteSample(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listDatasetStatusResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__listDatasetStatusResponse;
-      return soap_in_ns1__listDatasetStatusResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listDatasetStatusResponse(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listDatasetStatus")) {
       *type = SOAP_TYPE_ICat3_ns1__listDatasetStatus;
-      return soap_in_ns1__listDatasetStatus(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listDatasetStatus(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifyInvestigationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__modifyInvestigationResponse;
-      return soap_in_ns1__modifyInvestigationResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifyInvestigationResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifyInvestigation")) {
       *type = SOAP_TYPE_ICat3_ns1__modifyInvestigation;
-      return soap_in_ns1__modifyInvestigation(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifyInvestigation(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:icatAuthorisation")) {
       *type = SOAP_TYPE_ICat3_ns1__icatAuthorisation;
-      return soap_in_ns1__icatAuthorisation(soap, NULL, NULL, NULL);
+      return soap_in_ns1__icatAuthorisation(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getAuthorisationsResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getAuthorisationsResponse;
-      return soap_in_ns1__getAuthorisationsResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getAuthorisationsResponse(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getAuthorisations")) {
       *type = SOAP_TYPE_ICat3_ns1__getAuthorisations;
-      return soap_in_ns1__getAuthorisations(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getAuthorisations(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addKeywordResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__addKeywordResponse;
-      return soap_in_ns1__addKeywordResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addKeywordResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addKeyword")) {
       *type = SOAP_TYPE_ICat3_ns1__addKeyword;
-      return soap_in_ns1__addKeyword(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addKeyword(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchDatasetByRestrictionComparisonResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionComparisonResponse;
       return soap_in_ns1__searchDatasetByRestrictionComparisonResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatasetByRestrictionComparison")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionComparison;
-      return soap_in_ns1__searchDatasetByRestrictionComparison(soap, NULL, NULL,
-                                                               NULL);
+      return soap_in_ns1__searchDatasetByRestrictionComparison(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchSampleByParameterLogicalResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByParameterLogicalResponse;
-      return soap_in_ns1__searchSampleByParameterLogicalResponse(soap, NULL,
-                                                                 NULL, NULL);
+      return soap_in_ns1__searchSampleByParameterLogicalResponse(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchSampleByParameterLogical")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByParameterLogical;
-      return soap_in_ns1__searchSampleByParameterLogical(soap, NULL, NULL,
-                                                         NULL);
+      return soap_in_ns1__searchSampleByParameterLogical(soap, nullptr, nullptr,
+                                                         nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeDataSetResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__removeDataSetResponse;
-      return soap_in_ns1__removeDataSetResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeDataSetResponse(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeDataSet")) {
       *type = SOAP_TYPE_ICat3_ns1__removeDataSet;
-      return soap_in_ns1__removeDataSet(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeDataSet(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifyDataSetParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__modifyDataSetParameterResponse;
-      return soap_in_ns1__modifyDataSetParameterResponse(soap, NULL, NULL,
-                                                         NULL);
+      return soap_in_ns1__modifyDataSetParameterResponse(soap, nullptr, nullptr,
+                                                         nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifyDataSetParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__modifyDataSetParameter;
-      return soap_in_ns1__modifyDataSetParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifyDataSetParameter(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listInvestigationTypesResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__listInvestigationTypesResponse;
-      return soap_in_ns1__listInvestigationTypesResponse(soap, NULL, NULL,
-                                                         NULL);
+      return soap_in_ns1__listInvestigationTypesResponse(soap, nullptr, nullptr,
+                                                         nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listInvestigationTypes")) {
       *type = SOAP_TYPE_ICat3_ns1__listInvestigationTypes;
-      return soap_in_ns1__listInvestigationTypes(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listInvestigationTypes(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getKeywordsForUserResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getKeywordsForUserResponse;
-      return soap_in_ns1__getKeywordsForUserResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getKeywordsForUserResponse(soap, nullptr, nullptr,
+                                                     nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getKeywordsForUser")) {
       *type = SOAP_TYPE_ICat3_ns1__getKeywordsForUser;
-      return soap_in_ns1__getKeywordsForUser(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getKeywordsForUser(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:getKeywordsForUserStartWithMaxResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getKeywordsForUserStartWithMaxResponse;
-      return soap_in_ns1__getKeywordsForUserStartWithMaxResponse(soap, NULL,
-                                                                 NULL, NULL);
+      return soap_in_ns1__getKeywordsForUserStartWithMaxResponse(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getKeywordsForUserStartWithMax")) {
       *type = SOAP_TYPE_ICat3_ns1__getKeywordsForUserStartWithMax;
-      return soap_in_ns1__getKeywordsForUserStartWithMax(soap, NULL, NULL,
-                                                         NULL);
+      return soap_in_ns1__getKeywordsForUserStartWithMax(soap, nullptr, nullptr,
+                                                         nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getKeywordsForUserMaxResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getKeywordsForUserMaxResponse;
-      return soap_in_ns1__getKeywordsForUserMaxResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getKeywordsForUserMaxResponse(soap, nullptr, nullptr,
+                                                        nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getKeywordsForUserMax")) {
       *type = SOAP_TYPE_ICat3_ns1__getKeywordsForUserMax;
-      return soap_in_ns1__getKeywordsForUserMax(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getKeywordsForUserMax(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getKeywordsForUserTypeResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getKeywordsForUserTypeResponse;
-      return soap_in_ns1__getKeywordsForUserTypeResponse(soap, NULL, NULL,
-                                                         NULL);
+      return soap_in_ns1__getKeywordsForUserTypeResponse(soap, nullptr, nullptr,
+                                                         nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getKeywordsForUserType")) {
       *type = SOAP_TYPE_ICat3_ns1__getKeywordsForUserType;
-      return soap_in_ns1__getKeywordsForUserType(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getKeywordsForUserType(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getParameterByNameResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getParameterByNameResponse;
-      return soap_in_ns1__getParameterByNameResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getParameterByNameResponse(soap, nullptr, nullptr,
+                                                     nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getParameterByName")) {
       *type = SOAP_TYPE_ICat3_ns1__getParameterByName;
-      return soap_in_ns1__getParameterByName(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getParameterByName(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:downloadDatafileResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__downloadDatafileResponse;
-      return soap_in_ns1__downloadDatafileResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__downloadDatafileResponse(soap, nullptr, nullptr,
+                                                   nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:downloadDatafile")) {
       *type = SOAP_TYPE_ICat3_ns1__downloadDatafile;
-      return soap_in_ns1__downloadDatafile(soap, NULL, NULL, NULL);
+      return soap_in_ns1__downloadDatafile(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:setDataSetSampleResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__setDataSetSampleResponse;
-      return soap_in_ns1__setDataSetSampleResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__setDataSetSampleResponse(soap, nullptr, nullptr,
+                                                   nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:setDataSetSample")) {
       *type = SOAP_TYPE_ICat3_ns1__setDataSetSample;
-      return soap_in_ns1__setDataSetSample(soap, NULL, NULL, NULL);
+      return soap_in_ns1__setDataSetSample(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteDataSetParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteDataSetParameterResponse;
-      return soap_in_ns1__deleteDataSetParameterResponse(soap, NULL, NULL,
-                                                         NULL);
+      return soap_in_ns1__deleteDataSetParameterResponse(soap, nullptr, nullptr,
+                                                         nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteDataSetParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteDataSetParameter;
-      return soap_in_ns1__deleteDataSetParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteDataSetParameter(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeSampleParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__removeSampleParameterResponse;
-      return soap_in_ns1__removeSampleParameterResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeSampleParameterResponse(soap, nullptr, nullptr,
+                                                        nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeSampleParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__removeSampleParameter;
-      return soap_in_ns1__removeSampleParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeSampleParameter(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(
             soap, t, "ns1:searchInvestigationByRestrictionLogicalResponse")) {
       *type =
           SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionLogicalResponse;
       return soap_in_ns1__searchInvestigationByRestrictionLogicalResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchInvestigationByRestrictionLogical")) {
       *type = SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionLogical;
-      return soap_in_ns1__searchInvestigationByRestrictionLogical(soap, NULL,
-                                                                  NULL, NULL);
+      return soap_in_ns1__searchInvestigationByRestrictionLogical(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchDatafileByParameterRestrictionResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByParameterRestrictionResponse;
       return soap_in_ns1__searchDatafileByParameterRestrictionResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatafileByParameterRestriction")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByParameterRestriction;
-      return soap_in_ns1__searchDatafileByParameterRestriction(soap, NULL, NULL,
-                                                               NULL);
+      return soap_in_ns1__searchDatafileByParameterRestriction(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:createDataSetResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__createDataSetResponse;
-      return soap_in_ns1__createDataSetResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__createDataSetResponse(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:createDataSet")) {
       *type = SOAP_TYPE_ICat3_ns1__createDataSet;
-      return soap_in_ns1__createDataSet(soap, NULL, NULL, NULL);
+      return soap_in_ns1__createDataSet(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchDatafileByParameterLogicalResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByParameterLogicalResponse;
-      return soap_in_ns1__searchDatafileByParameterLogicalResponse(soap, NULL,
-                                                                   NULL, NULL);
+      return soap_in_ns1__searchDatafileByParameterLogicalResponse(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatafileByParameterLogical")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByParameterLogical;
-      return soap_in_ns1__searchDatafileByParameterLogical(soap, NULL, NULL,
-                                                           NULL);
+      return soap_in_ns1__searchDatafileByParameterLogical(soap, nullptr,
+                                                           nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addInvestigatorResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__addInvestigatorResponse;
-      return soap_in_ns1__addInvestigatorResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addInvestigatorResponse(soap, nullptr, nullptr,
+                                                  nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addInvestigator")) {
       *type = SOAP_TYPE_ICat3_ns1__addInvestigator;
-      return soap_in_ns1__addInvestigator(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addInvestigator(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteInvestigatorResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteInvestigatorResponse;
-      return soap_in_ns1__deleteInvestigatorResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteInvestigatorResponse(soap, nullptr, nullptr,
+                                                     nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteInvestigator")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteInvestigator;
-      return soap_in_ns1__deleteInvestigator(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteInvestigator(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchInvestigationByRestrictionResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionResponse;
-      return soap_in_ns1__searchInvestigationByRestrictionResponse(soap, NULL,
-                                                                   NULL, NULL);
+      return soap_in_ns1__searchInvestigationByRestrictionResponse(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchInvestigationByRestriction")) {
       *type = SOAP_TYPE_ICat3_ns1__searchInvestigationByRestriction;
-      return soap_in_ns1__searchInvestigationByRestriction(soap, NULL, NULL,
-                                                           NULL);
+      return soap_in_ns1__searchInvestigationByRestriction(soap, nullptr,
+                                                           nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getICATAPIVersionResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getICATAPIVersionResponse;
-      return soap_in_ns1__getICATAPIVersionResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getICATAPIVersionResponse(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getICATAPIVersion")) {
       *type = SOAP_TYPE_ICat3_ns1__getICATAPIVersion;
-      return soap_in_ns1__getICATAPIVersion(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getICATAPIVersion(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getDatafilesResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getDatafilesResponse;
-      return soap_in_ns1__getDatafilesResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getDatafilesResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getDatafiles")) {
       *type = SOAP_TYPE_ICat3_ns1__getDatafiles;
-      return soap_in_ns1__getDatafiles(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getDatafiles(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:isSessionValidResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__isSessionValidResponse;
-      return soap_in_ns1__isSessionValidResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__isSessionValidResponse(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:isSessionValid")) {
       *type = SOAP_TYPE_ICat3_ns1__isSessionValid;
-      return soap_in_ns1__isSessionValid(soap, NULL, NULL, NULL);
+      return soap_in_ns1__isSessionValid(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(
             soap, t, "ns1:searchInvestigationByParameterComparisonResponse")) {
       *type =
           SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterComparisonResponse;
       return soap_in_ns1__searchInvestigationByParameterComparisonResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchInvestigationByParameterComparison")) {
       *type = SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterComparison;
-      return soap_in_ns1__searchInvestigationByParameterComparison(soap, NULL,
-                                                                   NULL, NULL);
+      return soap_in_ns1__searchInvestigationByParameterComparison(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteDataSetResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteDataSetResponse;
-      return soap_in_ns1__deleteDataSetResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteDataSetResponse(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteDataSet")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteDataSet;
-      return soap_in_ns1__deleteDataSet(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteDataSet(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getInvestigationsResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getInvestigationsResponse;
-      return soap_in_ns1__getInvestigationsResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getInvestigationsResponse(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getInvestigations")) {
       *type = SOAP_TYPE_ICat3_ns1__getInvestigations;
-      return soap_in_ns1__getInvestigations(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getInvestigations(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getInvestigationsIncludesResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getInvestigationsIncludesResponse;
-      return soap_in_ns1__getInvestigationsIncludesResponse(soap, NULL, NULL,
-                                                            NULL);
+      return soap_in_ns1__getInvestigationsIncludesResponse(soap, nullptr,
+                                                            nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getInvestigationsIncludes")) {
       *type = SOAP_TYPE_ICat3_ns1__getInvestigationsIncludes;
-      return soap_in_ns1__getInvestigationsIncludes(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getInvestigationsIncludes(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchSampleByParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByParameterResponse;
-      return soap_in_ns1__searchSampleByParameterResponse(soap, NULL, NULL,
-                                                          NULL);
+      return soap_in_ns1__searchSampleByParameterResponse(soap, nullptr,
+                                                          nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchSampleByParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByParameter;
-      return soap_in_ns1__searchSampleByParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchSampleByParameter(soap, nullptr, nullptr,
+                                                  nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchDatasetByParameterConditionResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByParameterConditionResponse;
-      return soap_in_ns1__searchDatasetByParameterConditionResponse(soap, NULL,
-                                                                    NULL, NULL);
+      return soap_in_ns1__searchDatasetByParameterConditionResponse(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatasetByParameterCondition")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByParameterCondition;
-      return soap_in_ns1__searchDatasetByParameterCondition(soap, NULL, NULL,
-                                                            NULL);
+      return soap_in_ns1__searchDatasetByParameterCondition(soap, nullptr,
+                                                            nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeDataFileParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__removeDataFileParameterResponse;
-      return soap_in_ns1__removeDataFileParameterResponse(soap, NULL, NULL,
-                                                          NULL);
+      return soap_in_ns1__removeDataFileParameterResponse(soap, nullptr,
+                                                          nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeDataFileParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__removeDataFileParameter;
-      return soap_in_ns1__removeDataFileParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeDataFileParameter(soap, nullptr, nullptr,
+                                                  nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchDatasetByParameterLogicalResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByParameterLogicalResponse;
-      return soap_in_ns1__searchDatasetByParameterLogicalResponse(soap, NULL,
-                                                                  NULL, NULL);
+      return soap_in_ns1__searchDatasetByParameterLogicalResponse(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatasetByParameterLogical")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByParameterLogical;
-      return soap_in_ns1__searchDatasetByParameterLogical(soap, NULL, NULL,
-                                                          NULL);
+      return soap_in_ns1__searchDatasetByParameterLogical(soap, nullptr,
+                                                          nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByUserIDPaginationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByUserIDPaginationResponse;
-      return soap_in_ns1__searchByUserIDPaginationResponse(soap, NULL, NULL,
-                                                           NULL);
+      return soap_in_ns1__searchByUserIDPaginationResponse(soap, nullptr,
+                                                           nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByUserIDPagination")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByUserIDPagination;
-      return soap_in_ns1__searchByUserIDPagination(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByUserIDPagination(soap, nullptr, nullptr,
+                                                   nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByUserIDResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByUserIDResponse;
-      return soap_in_ns1__searchByUserIDResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByUserIDResponse(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByUserID")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByUserID;
-      return soap_in_ns1__searchByUserID(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByUserID(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifyPublicationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__modifyPublicationResponse;
-      return soap_in_ns1__modifyPublicationResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifyPublicationResponse(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifyPublication")) {
       *type = SOAP_TYPE_ICat3_ns1__modifyPublication;
-      return soap_in_ns1__modifyPublication(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifyPublication(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(
             soap, t, "ns1:searchInvestigationByParameterRestrictionResponse")) {
       *type =
           SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterRestrictionResponse;
       return soap_in_ns1__searchInvestigationByParameterRestrictionResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchInvestigationByParameterRestriction")) {
       *type = SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterRestriction;
-      return soap_in_ns1__searchInvestigationByParameterRestriction(soap, NULL,
-                                                                    NULL, NULL);
+      return soap_in_ns1__searchInvestigationByParameterRestriction(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchSampleByParameterConditionResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByParameterConditionResponse;
-      return soap_in_ns1__searchSampleByParameterConditionResponse(soap, NULL,
-                                                                   NULL, NULL);
+      return soap_in_ns1__searchSampleByParameterConditionResponse(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchSampleByParameterCondition")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByParameterCondition;
-      return soap_in_ns1__searchSampleByParameterCondition(soap, NULL, NULL,
-                                                           NULL);
+      return soap_in_ns1__searchSampleByParameterCondition(soap, nullptr,
+                                                           nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeDataSetParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__removeDataSetParameterResponse;
-      return soap_in_ns1__removeDataSetParameterResponse(soap, NULL, NULL,
-                                                         NULL);
+      return soap_in_ns1__removeDataSetParameterResponse(soap, nullptr, nullptr,
+                                                         nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeDataSetParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__removeDataSetParameter;
-      return soap_in_ns1__removeDataSetParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeDataSetParameter(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchSampleByParameterRestrictionResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByParameterRestrictionResponse;
       return soap_in_ns1__searchSampleByParameterRestrictionResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchSampleByParameterRestriction")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByParameterRestriction;
-      return soap_in_ns1__searchSampleByParameterRestriction(soap, NULL, NULL,
-                                                             NULL);
+      return soap_in_ns1__searchSampleByParameterRestriction(soap, nullptr,
+                                                             nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:getMyInvestigationsIncludesPaginationResponse")) {
       *type =
           SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesPaginationResponse;
       return soap_in_ns1__getMyInvestigationsIncludesPaginationResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getMyInvestigationsIncludesPagination")) {
       *type = SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesPagination;
-      return soap_in_ns1__getMyInvestigationsIncludesPagination(soap, NULL,
-                                                                NULL, NULL);
+      return soap_in_ns1__getMyInvestigationsIncludesPagination(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getMyInvestigationsIncludesResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesResponse;
-      return soap_in_ns1__getMyInvestigationsIncludesResponse(soap, NULL, NULL,
-                                                              NULL);
+      return soap_in_ns1__getMyInvestigationsIncludesResponse(soap, nullptr,
+                                                              nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getMyInvestigationsIncludes")) {
       *type = SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludes;
-      return soap_in_ns1__getMyInvestigationsIncludes(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getMyInvestigationsIncludes(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getMyInvestigationsResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getMyInvestigationsResponse;
-      return soap_in_ns1__getMyInvestigationsResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getMyInvestigationsResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getMyInvestigations")) {
       *type = SOAP_TYPE_ICat3_ns1__getMyInvestigations;
-      return soap_in_ns1__getMyInvestigations(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getMyInvestigations(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchDatafileByRestrictionLogicalResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionLogicalResponse;
       return soap_in_ns1__searchDatafileByRestrictionLogicalResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatafileByRestrictionLogical")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionLogical;
-      return soap_in_ns1__searchDatafileByRestrictionLogical(soap, NULL, NULL,
-                                                             NULL);
+      return soap_in_ns1__searchDatafileByRestrictionLogical(soap, nullptr,
+                                                             nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getAllInstrumentsResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getAllInstrumentsResponse;
-      return soap_in_ns1__getAllInstrumentsResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getAllInstrumentsResponse(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getAllInstruments")) {
       *type = SOAP_TYPE_ICat3_ns1__getAllInstruments;
-      return soap_in_ns1__getAllInstruments(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getAllInstruments(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByKeywordsAllResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByKeywordsAllResponse;
-      return soap_in_ns1__searchByKeywordsAllResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByKeywordsAllResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:keywordDetails")) {
       *type = SOAP_TYPE_ICat3_ns1__keywordDetails;
-      return soap_in_ns1__keywordDetails(soap, NULL, NULL, NULL);
+      return soap_in_ns1__keywordDetails(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByKeywordsAll")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByKeywordsAll;
-      return soap_in_ns1__searchByKeywordsAll(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByKeywordsAll(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByKeywordsResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByKeywordsResponse;
-      return soap_in_ns1__searchByKeywordsResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByKeywordsResponse(soap, nullptr, nullptr,
+                                                   nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByKeywords")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByKeywords;
-      return soap_in_ns1__searchByKeywords(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByKeywords(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:checkDatasetDownloadAccessResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccessResponse;
-      return soap_in_ns1__checkDatasetDownloadAccessResponse(soap, NULL, NULL,
-                                                             NULL);
+      return soap_in_ns1__checkDatasetDownloadAccessResponse(soap, nullptr,
+                                                             nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:checkDatasetDownloadAccess")) {
       *type = SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccess;
-      return soap_in_ns1__checkDatasetDownloadAccess(soap, NULL, NULL, NULL);
+      return soap_in_ns1__checkDatasetDownloadAccess(soap, nullptr, nullptr,
+                                                     nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchDatafileByParameterConditionResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByParameterConditionResponse;
       return soap_in_ns1__searchDatafileByParameterConditionResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatafileByParameterCondition")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByParameterCondition;
-      return soap_in_ns1__searchDatafileByParameterCondition(soap, NULL, NULL,
-                                                             NULL);
+      return soap_in_ns1__searchDatafileByParameterCondition(soap, nullptr,
+                                                             nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByUserSurnamePaginationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByUserSurnamePaginationResponse;
-      return soap_in_ns1__searchByUserSurnamePaginationResponse(soap, NULL,
-                                                                NULL, NULL);
+      return soap_in_ns1__searchByUserSurnamePaginationResponse(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByUserSurnamePagination")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByUserSurnamePagination;
-      return soap_in_ns1__searchByUserSurnamePagination(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByUserSurnamePagination(soap, nullptr, nullptr,
+                                                        nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:shiftPK")) {
       *type = SOAP_TYPE_ICat3_ns1__shiftPK;
-      return soap_in_ns1__shiftPK(soap, NULL, NULL, NULL);
+      return soap_in_ns1__shiftPK(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:shift")) {
       *type = SOAP_TYPE_ICat3_ns1__shift;
-      return soap_in_ns1__shift(soap, NULL, NULL, NULL);
+      return soap_in_ns1__shift(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:publication")) {
       *type = SOAP_TYPE_ICat3_ns1__publication;
-      return soap_in_ns1__publication(soap, NULL, NULL, NULL);
+      return soap_in_ns1__publication(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:keyword")) {
       *type = SOAP_TYPE_ICat3_ns1__keyword;
-      return soap_in_ns1__keyword(soap, NULL, NULL, NULL);
+      return soap_in_ns1__keyword(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:investigator")) {
       *type = SOAP_TYPE_ICat3_ns1__investigator;
-      return soap_in_ns1__investigator(soap, NULL, NULL, NULL);
+      return soap_in_ns1__investigator(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:investigation")) {
       *type = SOAP_TYPE_ICat3_ns1__investigation;
-      return soap_in_ns1__investigation(soap, NULL, NULL, NULL);
+      return soap_in_ns1__investigation(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByUserSurnameResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByUserSurnameResponse;
-      return soap_in_ns1__searchByUserSurnameResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByUserSurnameResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchByUserSurname")) {
       *type = SOAP_TYPE_ICat3_ns1__searchByUserSurname;
-      return soap_in_ns1__searchByUserSurname(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchByUserSurname(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteDataFileResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteDataFileResponse;
-      return soap_in_ns1__deleteDataFileResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteDataFileResponse(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteDataFile")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteDataFile;
-      return soap_in_ns1__deleteDataFile(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteDataFile(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:downloadInfo")) {
       *type = SOAP_TYPE_ICat3_ns1__downloadInfo;
-      return soap_in_ns1__downloadInfo(soap, NULL, NULL, NULL);
+      return soap_in_ns1__downloadInfo(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:checkDatafileDownloadAccessResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccessResponse;
-      return soap_in_ns1__checkDatafileDownloadAccessResponse(soap, NULL, NULL,
-                                                              NULL);
+      return soap_in_ns1__checkDatafileDownloadAccessResponse(soap, nullptr,
+                                                              nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:checkDatafileDownloadAccess")) {
       *type = SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccess;
-      return soap_in_ns1__checkDatafileDownloadAccess(soap, NULL, NULL, NULL);
+      return soap_in_ns1__checkDatafileDownloadAccess(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:getFacilityUserByFacilityUserIdResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getFacilityUserByFacilityUserIdResponse;
-      return soap_in_ns1__getFacilityUserByFacilityUserIdResponse(soap, NULL,
-                                                                  NULL, NULL);
+      return soap_in_ns1__getFacilityUserByFacilityUserIdResponse(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getFacilityUserByFacilityUserId")) {
       *type = SOAP_TYPE_ICat3_ns1__getFacilityUserByFacilityUserId;
-      return soap_in_ns1__getFacilityUserByFacilityUserId(soap, NULL, NULL,
-                                                          NULL);
+      return soap_in_ns1__getFacilityUserByFacilityUserId(soap, nullptr,
+                                                          nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:getFacilityCyclesWithDataForInstrumentResponse")) {
       *type =
           SOAP_TYPE_ICat3_ns1__getFacilityCyclesWithDataForInstrumentResponse;
       return soap_in_ns1__getFacilityCyclesWithDataForInstrumentResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:getFacilityCyclesWithDataForInstrument")) {
       *type = SOAP_TYPE_ICat3_ns1__getFacilityCyclesWithDataForInstrument;
-      return soap_in_ns1__getFacilityCyclesWithDataForInstrument(soap, NULL,
-                                                                 NULL, NULL);
+      return soap_in_ns1__getFacilityCyclesWithDataForInstrument(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addSampleParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__addSampleParameterResponse;
-      return soap_in_ns1__addSampleParameterResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addSampleParameterResponse(soap, nullptr, nullptr,
+                                                     nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addSampleParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__addSampleParameter;
-      return soap_in_ns1__addSampleParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addSampleParameter(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifyDataSetResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__modifyDataSetResponse;
-      return soap_in_ns1__modifyDataSetResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifyDataSetResponse(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifyDataSet")) {
       *type = SOAP_TYPE_ICat3_ns1__modifyDataSet;
-      return soap_in_ns1__modifyDataSet(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifyDataSet(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchDatasetByParameterComparisonResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByParameterComparisonResponse;
       return soap_in_ns1__searchDatasetByParameterComparisonResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:parameterComparisonCondition")) {
       *type = SOAP_TYPE_ICat3_ns1__parameterComparisonCondition;
-      return soap_in_ns1__parameterComparisonCondition(soap, NULL, NULL, NULL);
+      return soap_in_ns1__parameterComparisonCondition(soap, nullptr, nullptr,
+                                                       nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatasetByParameterComparison")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByParameterComparison;
-      return soap_in_ns1__searchDatasetByParameterComparison(soap, NULL, NULL,
-                                                             NULL);
+      return soap_in_ns1__searchDatasetByParameterComparison(soap, nullptr,
+                                                             nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchSampleByRestrictionResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionResponse;
-      return soap_in_ns1__searchSampleByRestrictionResponse(soap, NULL, NULL,
-                                                            NULL);
+      return soap_in_ns1__searchSampleByRestrictionResponse(soap, nullptr,
+                                                            nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchSampleByRestriction")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByRestriction;
-      return soap_in_ns1__searchSampleByRestriction(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchSampleByRestriction(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:downloadDatafilesResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__downloadDatafilesResponse;
-      return soap_in_ns1__downloadDatafilesResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__downloadDatafilesResponse(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:downloadDatafiles")) {
       *type = SOAP_TYPE_ICat3_ns1__downloadDatafiles;
-      return soap_in_ns1__downloadDatafiles(soap, NULL, NULL, NULL);
+      return soap_in_ns1__downloadDatafiles(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(
             soap, t, "ns1:searchInvestigationByParameterConditionResponse")) {
       *type =
           SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterConditionResponse;
       return soap_in_ns1__searchInvestigationByParameterConditionResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchInvestigationByParameterCondition")) {
       *type = SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterCondition;
-      return soap_in_ns1__searchInvestigationByParameterCondition(soap, NULL,
-                                                                  NULL, NULL);
+      return soap_in_ns1__searchInvestigationByParameterCondition(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatafileByParameterResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByParameterResponse;
-      return soap_in_ns1__searchDatafileByParameterResponse(soap, NULL, NULL,
-                                                            NULL);
+      return soap_in_ns1__searchDatafileByParameterResponse(soap, nullptr,
+                                                            nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:parameterSearch")) {
       *type = SOAP_TYPE_ICat3_ns1__parameterSearch;
-      return soap_in_ns1__parameterSearch(soap, NULL, NULL, NULL);
+      return soap_in_ns1__parameterSearch(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatafileByParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByParameter;
-      return soap_in_ns1__searchDatafileByParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchDatafileByParameter(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:userDetails")) {
       *type = SOAP_TYPE_ICat3_ns1__userDetails;
-      return soap_in_ns1__userDetails(soap, NULL, NULL, NULL);
+      return soap_in_ns1__userDetails(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchDatafileByRestrictionComparisonResponse")) {
       *type =
           SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionComparisonResponse;
       return soap_in_ns1__searchDatafileByRestrictionComparisonResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatafileByRestrictionComparison")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionComparison;
-      return soap_in_ns1__searchDatafileByRestrictionComparison(soap, NULL,
-                                                                NULL, NULL);
+      return soap_in_ns1__searchDatafileByRestrictionComparison(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getAllKeywordsResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getAllKeywordsResponse;
-      return soap_in_ns1__getAllKeywordsResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getAllKeywordsResponse(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getAllKeywords")) {
       *type = SOAP_TYPE_ICat3_ns1__getAllKeywords;
-      return soap_in_ns1__getAllKeywords(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getAllKeywords(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removePublicationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__removePublicationResponse;
-      return soap_in_ns1__removePublicationResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removePublicationResponse(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removePublication")) {
       *type = SOAP_TYPE_ICat3_ns1__removePublication;
-      return soap_in_ns1__removePublication(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removePublication(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:createDataSetsResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__createDataSetsResponse;
-      return soap_in_ns1__createDataSetsResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__createDataSetsResponse(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datasetParameterPK")) {
       *type = SOAP_TYPE_ICat3_ns1__datasetParameterPK;
-      return soap_in_ns1__datasetParameterPK(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datasetParameterPK(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datasetParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__datasetParameter;
-      return soap_in_ns1__datasetParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datasetParameter(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:dataset")) {
       *type = SOAP_TYPE_ICat3_ns1__dataset;
-      return soap_in_ns1__dataset(soap, NULL, NULL, NULL);
+      return soap_in_ns1__dataset(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:createDataSets")) {
       *type = SOAP_TYPE_ICat3_ns1__createDataSets;
-      return soap_in_ns1__createDataSets(soap, NULL, NULL, NULL);
+      return soap_in_ns1__createDataSets(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteInvestigationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteInvestigationResponse;
-      return soap_in_ns1__deleteInvestigationResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteInvestigationResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteInvestigation")) {
       *type = SOAP_TYPE_ICat3_ns1__deleteInvestigation;
-      return soap_in_ns1__deleteInvestigation(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteInvestigation(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeKeywordResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__removeKeywordResponse;
-      return soap_in_ns1__removeKeywordResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeKeywordResponse(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:keywordPK")) {
       *type = SOAP_TYPE_ICat3_ns1__keywordPK;
-      return soap_in_ns1__keywordPK(soap, NULL, NULL, NULL);
+      return soap_in_ns1__keywordPK(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeKeyword")) {
       *type = SOAP_TYPE_ICat3_ns1__removeKeyword;
-      return soap_in_ns1__removeKeyword(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeKeyword(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getParameterByRestrictionResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getParameterByRestrictionResponse;
-      return soap_in_ns1__getParameterByRestrictionResponse(soap, NULL, NULL,
-                                                            NULL);
+      return soap_in_ns1__getParameterByRestrictionResponse(soap, nullptr,
+                                                            nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getParameterByRestriction")) {
       *type = SOAP_TYPE_ICat3_ns1__getParameterByRestriction;
-      return soap_in_ns1__getParameterByRestriction(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getParameterByRestriction(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeInvestigatorResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__removeInvestigatorResponse;
-      return soap_in_ns1__removeInvestigatorResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeInvestigatorResponse(soap, nullptr, nullptr,
+                                                     nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:investigatorPK")) {
       *type = SOAP_TYPE_ICat3_ns1__investigatorPK;
-      return soap_in_ns1__investigatorPK(soap, NULL, NULL, NULL);
+      return soap_in_ns1__investigatorPK(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeInvestigator")) {
       *type = SOAP_TYPE_ICat3_ns1__removeInvestigator;
-      return soap_in_ns1__removeInvestigator(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeInvestigator(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeInvestigationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__removeInvestigationResponse;
-      return soap_in_ns1__removeInvestigationResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeInvestigationResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeInvestigation")) {
       *type = SOAP_TYPE_ICat3_ns1__removeInvestigation;
-      return soap_in_ns1__removeInvestigation(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeInvestigation(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getFacilityUserByFederalIdResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalIdResponse;
-      return soap_in_ns1__getFacilityUserByFederalIdResponse(soap, NULL, NULL,
-                                                             NULL);
+      return soap_in_ns1__getFacilityUserByFederalIdResponse(soap, nullptr,
+                                                             nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getFacilityUserByFederalId")) {
       *type = SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalId;
-      return soap_in_ns1__getFacilityUserByFederalId(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getFacilityUserByFederalId(soap, nullptr, nullptr,
+                                                     nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:downloadDatasetResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__downloadDatasetResponse;
-      return soap_in_ns1__downloadDatasetResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__downloadDatasetResponse(soap, nullptr, nullptr,
+                                                  nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:downloadDataset")) {
       *type = SOAP_TYPE_ICat3_ns1__downloadDataset;
-      return soap_in_ns1__downloadDataset(soap, NULL, NULL, NULL);
+      return soap_in_ns1__downloadDataset(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:instrument")) {
       *type = SOAP_TYPE_ICat3_ns1__instrument;
-      return soap_in_ns1__instrument(soap, NULL, NULL, NULL);
+      return soap_in_ns1__instrument(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getInstrumentsWithDataResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getInstrumentsWithDataResponse;
-      return soap_in_ns1__getInstrumentsWithDataResponse(soap, NULL, NULL,
-                                                         NULL);
+      return soap_in_ns1__getInstrumentsWithDataResponse(soap, nullptr, nullptr,
+                                                         nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getInstrumentsWithData")) {
       *type = SOAP_TYPE_ICat3_ns1__getInstrumentsWithData;
-      return soap_in_ns1__getInstrumentsWithData(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getInstrumentsWithData(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:logoutResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__logoutResponse;
-      return soap_in_ns1__logoutResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__logoutResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:logout")) {
       *type = SOAP_TYPE_ICat3_ns1__logout;
-      return soap_in_ns1__logout(soap, NULL, NULL, NULL);
+      return soap_in_ns1__logout(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addDataFileParametersResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__addDataFileParametersResponse;
-      return soap_in_ns1__addDataFileParametersResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addDataFileParametersResponse(soap, nullptr, nullptr,
+                                                        nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:addDataFileParameters")) {
       *type = SOAP_TYPE_ICat3_ns1__addDataFileParameters;
-      return soap_in_ns1__addDataFileParameters(soap, NULL, NULL, NULL);
+      return soap_in_ns1__addDataFileParameters(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:facilityCycle")) {
       *type = SOAP_TYPE_ICat3_ns1__facilityCycle;
-      return soap_in_ns1__facilityCycle(soap, NULL, NULL, NULL);
+      return soap_in_ns1__facilityCycle(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listFacilityCyclesResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__listFacilityCyclesResponse;
-      return soap_in_ns1__listFacilityCyclesResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listFacilityCyclesResponse(soap, nullptr, nullptr,
+                                                     nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listFacilityCycles")) {
       *type = SOAP_TYPE_ICat3_ns1__listFacilityCycles;
-      return soap_in_ns1__listFacilityCycles(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listFacilityCycles(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeAuthorisationResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__removeAuthorisationResponse;
-      return soap_in_ns1__removeAuthorisationResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeAuthorisationResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeAuthorisation")) {
       *type = SOAP_TYPE_ICat3_ns1__removeAuthorisation;
-      return soap_in_ns1__removeAuthorisation(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeAuthorisation(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeDataFileResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__removeDataFileResponse;
-      return soap_in_ns1__removeDataFileResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeDataFileResponse(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeDataFile")) {
       *type = SOAP_TYPE_ICat3_ns1__removeDataFile;
-      return soap_in_ns1__removeDataFile(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeDataFile(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:parameterPK")) {
       *type = SOAP_TYPE_ICat3_ns1__parameterPK;
-      return soap_in_ns1__parameterPK(soap, NULL, NULL, NULL);
+      return soap_in_ns1__parameterPK(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:parameter")) {
       *type = SOAP_TYPE_ICat3_ns1__parameter;
-      return soap_in_ns1__parameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__parameter(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getParameterByNameUnitsResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__getParameterByNameUnitsResponse;
-      return soap_in_ns1__getParameterByNameUnitsResponse(soap, NULL, NULL,
-                                                          NULL);
+      return soap_in_ns1__getParameterByNameUnitsResponse(soap, nullptr,
+                                                          nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getParameterByNameUnits")) {
       *type = SOAP_TYPE_ICat3_ns1__getParameterByNameUnits;
-      return soap_in_ns1__getParameterByNameUnits(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getParameterByNameUnits(soap, nullptr, nullptr,
+                                                  nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchInvestigationByParameterLogicalResponse")) {
       *type =
           SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterLogicalResponse;
       return soap_in_ns1__searchInvestigationByParameterLogicalResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:parameterLogicalCondition")) {
       *type = SOAP_TYPE_ICat3_ns1__parameterLogicalCondition;
-      return soap_in_ns1__parameterLogicalCondition(soap, NULL, NULL, NULL);
+      return soap_in_ns1__parameterLogicalCondition(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchInvestigationByParameterLogical")) {
       *type = SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterLogical;
-      return soap_in_ns1__searchInvestigationByParameterLogical(soap, NULL,
-                                                                NULL, NULL);
+      return soap_in_ns1__searchInvestigationByParameterLogical(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifySampleResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__modifySampleResponse;
-      return soap_in_ns1__modifySampleResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifySampleResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:modifySample")) {
       *type = SOAP_TYPE_ICat3_ns1__modifySample;
-      return soap_in_ns1__modifySample(soap, NULL, NULL, NULL);
+      return soap_in_ns1__modifySample(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:createDataFileResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__createDataFileResponse;
-      return soap_in_ns1__createDataFileResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__createDataFileResponse(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:relatedDatafilesPK")) {
       *type = SOAP_TYPE_ICat3_ns1__relatedDatafilesPK;
-      return soap_in_ns1__relatedDatafilesPK(soap, NULL, NULL, NULL);
+      return soap_in_ns1__relatedDatafilesPK(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:relatedDatafiles")) {
       *type = SOAP_TYPE_ICat3_ns1__relatedDatafiles;
-      return soap_in_ns1__relatedDatafiles(soap, NULL, NULL, NULL);
+      return soap_in_ns1__relatedDatafiles(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datafileParameterPK")) {
       *type = SOAP_TYPE_ICat3_ns1__datafileParameterPK;
-      return soap_in_ns1__datafileParameterPK(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datafileParameterPK(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datafileParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__datafileParameter;
-      return soap_in_ns1__datafileParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datafileParameter(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datafileFormatPK")) {
       *type = SOAP_TYPE_ICat3_ns1__datafileFormatPK;
-      return soap_in_ns1__datafileFormatPK(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datafileFormatPK(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datafileFormat")) {
       *type = SOAP_TYPE_ICat3_ns1__datafileFormat;
-      return soap_in_ns1__datafileFormat(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datafileFormat(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datafile")) {
       *type = SOAP_TYPE_ICat3_ns1__datafile;
-      return soap_in_ns1__datafile(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datafile(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:createDataFile")) {
       *type = SOAP_TYPE_ICat3_ns1__createDataFile;
-      return soap_in_ns1__createDataFile(soap, NULL, NULL, NULL);
+      return soap_in_ns1__createDataFile(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:InsufficientPrivilegesException")) {
       *type = SOAP_TYPE_ICat3_ns1__InsufficientPrivilegesException;
-      return soap_in_ns1__InsufficientPrivilegesException(soap, NULL, NULL,
-                                                          NULL);
+      return soap_in_ns1__InsufficientPrivilegesException(soap, nullptr,
+                                                          nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeSampleResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__removeSampleResponse;
-      return soap_in_ns1__removeSampleResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeSampleResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:removeSample")) {
       *type = SOAP_TYPE_ICat3_ns1__removeSample;
-      return soap_in_ns1__removeSample(soap, NULL, NULL, NULL);
+      return soap_in_ns1__removeSample(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listInstrumentsResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__listInstrumentsResponse;
-      return soap_in_ns1__listInstrumentsResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listInstrumentsResponse(soap, nullptr, nullptr,
+                                                  nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listInstruments")) {
       *type = SOAP_TYPE_ICat3_ns1__listInstruments;
-      return soap_in_ns1__listInstruments(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listInstruments(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatafileByRestrictionResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionResponse;
-      return soap_in_ns1__searchDatafileByRestrictionResponse(soap, NULL, NULL,
-                                                              NULL);
+      return soap_in_ns1__searchDatafileByRestrictionResponse(soap, nullptr,
+                                                              nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatafileByRestriction")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatafileByRestriction;
-      return soap_in_ns1__searchDatafileByRestriction(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchDatafileByRestriction(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchSampleByRestrictionComparisonResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionComparisonResponse;
       return soap_in_ns1__searchSampleByRestrictionComparisonResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:restrictionComparisonCondition")) {
       *type = SOAP_TYPE_ICat3_ns1__restrictionComparisonCondition;
-      return soap_in_ns1__restrictionComparisonCondition(soap, NULL, NULL,
-                                                         NULL);
+      return soap_in_ns1__restrictionComparisonCondition(soap, nullptr, nullptr,
+                                                         nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchSampleByRestrictionComparison")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionComparison;
-      return soap_in_ns1__searchSampleByRestrictionComparison(soap, NULL, NULL,
-                                                              NULL);
+      return soap_in_ns1__searchSampleByRestrictionComparison(soap, nullptr,
+                                                              nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:entityPrimaryKeyBaseBean")) {
       *type = SOAP_TYPE_ICat3_ns1__entityPrimaryKeyBaseBean;
-      return soap_in_ns1__entityPrimaryKeyBaseBean(soap, NULL, NULL, NULL);
+      return soap_in_ns1__entityPrimaryKeyBaseBean(soap, nullptr, nullptr,
+                                                   nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:sampleParameterPK")) {
       *type = SOAP_TYPE_ICat3_ns1__sampleParameterPK;
-      return soap_in_ns1__sampleParameterPK(soap, NULL, NULL, NULL);
+      return soap_in_ns1__sampleParameterPK(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:sampleParameter")) {
       *type = SOAP_TYPE_ICat3_ns1__sampleParameter;
-      return soap_in_ns1__sampleParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__sampleParameter(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:sample")) {
       *type = SOAP_TYPE_ICat3_ns1__sample;
-      return soap_in_ns1__sample(soap, NULL, NULL, NULL);
+      return soap_in_ns1__sample(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchSamplesBySampleNameResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSamplesBySampleNameResponse;
-      return soap_in_ns1__searchSamplesBySampleNameResponse(soap, NULL, NULL,
-                                                            NULL);
+      return soap_in_ns1__searchSamplesBySampleNameResponse(soap, nullptr,
+                                                            nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchSamplesBySampleName")) {
       *type = SOAP_TYPE_ICat3_ns1__searchSamplesBySampleName;
-      return soap_in_ns1__searchSamplesBySampleName(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchSamplesBySampleName(soap, nullptr, nullptr,
+                                                    nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:icatRole")) {
       *type = SOAP_TYPE_ICat3_ns1__icatRole;
-      return soap_in_ns1__icatRole(soap, NULL, NULL, NULL);
+      return soap_in_ns1__icatRole(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:entityBaseBean")) {
       *type = SOAP_TYPE_ICat3_ns1__entityBaseBean;
-      return soap_in_ns1__entityBaseBean(soap, NULL, NULL, NULL);
+      return soap_in_ns1__entityBaseBean(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:facilityUser")) {
       *type = SOAP_TYPE_ICat3_ns1__facilityUser;
-      return soap_in_ns1__facilityUser(soap, NULL, NULL, NULL);
+      return soap_in_ns1__facilityUser(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchFacilityUserByRestrictionResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchFacilityUserByRestrictionResponse;
-      return soap_in_ns1__searchFacilityUserByRestrictionResponse(soap, NULL,
-                                                                  NULL, NULL);
+      return soap_in_ns1__searchFacilityUserByRestrictionResponse(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchFacilityUserByRestriction")) {
       *type = SOAP_TYPE_ICat3_ns1__searchFacilityUserByRestriction;
-      return soap_in_ns1__searchFacilityUserByRestriction(soap, NULL, NULL,
-                                                          NULL);
+      return soap_in_ns1__searchFacilityUserByRestriction(soap, nullptr,
+                                                          nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listDatasetTypesResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__listDatasetTypesResponse;
-      return soap_in_ns1__listDatasetTypesResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listDatasetTypesResponse(soap, nullptr, nullptr,
+                                                   nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:listDatasetTypes")) {
       *type = SOAP_TYPE_ICat3_ns1__listDatasetTypes;
-      return soap_in_ns1__listDatasetTypes(soap, NULL, NULL, NULL);
+      return soap_in_ns1__listDatasetTypes(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchDatasetByParameterRestrictionResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByParameterRestrictionResponse;
       return soap_in_ns1__searchDatasetByParameterRestrictionResponse(
-          soap, NULL, NULL, NULL);
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:parameterCondition")) {
       *type = SOAP_TYPE_ICat3_ns1__parameterCondition;
-      return soap_in_ns1__parameterCondition(soap, NULL, NULL, NULL);
+      return soap_in_ns1__parameterCondition(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatasetByParameterRestriction")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByParameterRestriction;
-      return soap_in_ns1__searchDatasetByParameterRestriction(soap, NULL, NULL,
-                                                              NULL);
+      return soap_in_ns1__searchDatasetByParameterRestriction(soap, nullptr,
+                                                              nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t,
                         "ns1:searchDatasetByRestrictionLogicalResponse")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionLogicalResponse;
-      return soap_in_ns1__searchDatasetByRestrictionLogicalResponse(soap, NULL,
-                                                                    NULL, NULL);
+      return soap_in_ns1__searchDatasetByRestrictionLogicalResponse(
+          soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:condition")) {
       *type = SOAP_TYPE_ICat3_ns1__condition;
-      return soap_in_ns1__condition(soap, NULL, NULL, NULL);
+      return soap_in_ns1__condition(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:restrictionCondition")) {
       *type = SOAP_TYPE_ICat3_ns1__restrictionCondition;
-      return soap_in_ns1__restrictionCondition(soap, NULL, NULL, NULL);
+      return soap_in_ns1__restrictionCondition(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:restrictionLogicalCondition")) {
       *type = SOAP_TYPE_ICat3_ns1__restrictionLogicalCondition;
-      return soap_in_ns1__restrictionLogicalCondition(soap, NULL, NULL, NULL);
+      return soap_in_ns1__restrictionLogicalCondition(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchDatasetByRestrictionLogical")) {
       *type = SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionLogical;
-      return soap_in_ns1__searchDatasetByRestrictionLogical(soap, NULL, NULL,
-                                                            NULL);
+      return soap_in_ns1__searchDatasetByRestrictionLogical(soap, nullptr,
+                                                            nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:string")) {
       *type = SOAP_TYPE_ICat3_std__string;
-      return soap_in_std__string(soap, NULL, NULL, NULL);
+      return soap_in_std__string(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:string")) {
       *type = SOAP_TYPE_ICat3_xsd__string;
-      return soap_in_xsd__string(soap, NULL, NULL, NULL);
+      return soap_in_xsd__string(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:long")) {
       *type = SOAP_TYPE_ICat3_xsd__long;
-      return soap_in_xsd__long(soap, NULL, NULL, NULL);
+      return soap_in_xsd__long(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:int")) {
       *type = SOAP_TYPE_ICat3_xsd__int;
-      return soap_in_xsd__int(soap, NULL, NULL, NULL);
+      return soap_in_xsd__int(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:float")) {
       *type = SOAP_TYPE_ICat3_xsd__float;
-      return soap_in_xsd__float(soap, NULL, NULL, NULL);
+      return soap_in_xsd__float(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:double")) {
       *type = SOAP_TYPE_ICat3_xsd__double;
-      return soap_in_xsd__double(soap, NULL, NULL, NULL);
+      return soap_in_xsd__double(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:dateTime")) {
       *type = SOAP_TYPE_ICat3_xsd__dateTime;
-      return soap_in_xsd__dateTime(soap, NULL, NULL, NULL);
+      return soap_in_xsd__dateTime(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:boolean")) {
       *type = SOAP_TYPE_ICat3_xsd__boolean;
-      return soap_in_xsd__boolean(soap, NULL, NULL, NULL);
+      return soap_in_xsd__boolean(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:anyType")) {
       *type = SOAP_TYPE_ICat3_xsd__anyType;
-      return soap_in_xsd__anyType(soap, NULL, NULL, NULL);
+      return soap_in_xsd__anyType(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:byte")) {
       *type = SOAP_TYPE_ICat3_byte;
-      return soap_in_byte(soap, NULL, NULL, NULL);
+      return soap_in_byte(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:int")) {
       *type = SOAP_TYPE_ICat3_int;
-      return soap_in_int(soap, NULL, NULL, NULL);
+      return soap_in_int(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:long")) {
       *type = SOAP_TYPE_ICat3_LONG64;
-      return soap_in_LONG64(soap, NULL, NULL, NULL);
+      return soap_in_LONG64(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:float")) {
       *type = SOAP_TYPE_ICat3_float;
-      return soap_in_float(soap, NULL, NULL, NULL);
+      return soap_in_float(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:double")) {
       *type = SOAP_TYPE_ICat3_double;
-      return soap_in_double(soap, NULL, NULL, NULL);
+      return soap_in_double(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:dateTime")) {
       *type = SOAP_TYPE_ICat3_time;
-      return soap_in_time(soap, NULL, NULL, NULL);
+      return soap_in_time(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:elementType")) {
       *type = SOAP_TYPE_ICat3_ns1__elementType;
-      return soap_in_ns1__elementType(soap, NULL, NULL, NULL);
+      return soap_in_ns1__elementType(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:parameterType")) {
       *type = SOAP_TYPE_ICat3_ns1__parameterType;
-      return soap_in_ns1__parameterType(soap, NULL, NULL, NULL);
+      return soap_in_ns1__parameterType(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:keywordType")) {
       *type = SOAP_TYPE_ICat3_ns1__keywordType;
-      return soap_in_ns1__keywordType(soap, NULL, NULL, NULL);
+      return soap_in_ns1__keywordType(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:comparisonOperator")) {
       *type = SOAP_TYPE_ICat3_ns1__comparisonOperator;
-      return soap_in_ns1__comparisonOperator(soap, NULL, NULL, NULL);
+      return soap_in_ns1__comparisonOperator(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:parameterValueType")) {
       *type = SOAP_TYPE_ICat3_ns1__parameterValueType;
-      return soap_in_ns1__parameterValueType(soap, NULL, NULL, NULL);
+      return soap_in_ns1__parameterValueType(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:sampleInclude")) {
       *type = SOAP_TYPE_ICat3_ns1__sampleInclude;
-      return soap_in_ns1__sampleInclude(soap, NULL, NULL, NULL);
+      return soap_in_ns1__sampleInclude(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:restrictionAttributes")) {
       *type = SOAP_TYPE_ICat3_ns1__restrictionAttributes;
-      return soap_in_ns1__restrictionAttributes(soap, NULL, NULL, NULL);
+      return soap_in_ns1__restrictionAttributes(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:investigationInclude")) {
       *type = SOAP_TYPE_ICat3_ns1__investigationInclude;
-      return soap_in_ns1__investigationInclude(soap, NULL, NULL, NULL);
+      return soap_in_ns1__investigationInclude(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datasetInclude")) {
       *type = SOAP_TYPE_ICat3_ns1__datasetInclude;
-      return soap_in_ns1__datasetInclude(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datasetInclude(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datafileInclude")) {
       *type = SOAP_TYPE_ICat3_ns1__datafileInclude;
-      return soap_in_ns1__datafileInclude(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datafileInclude(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:logicalOperator")) {
       *type = SOAP_TYPE_ICat3_ns1__logicalOperator;
-      return soap_in_ns1__logicalOperator(soap, NULL, NULL, NULL);
+      return soap_in_ns1__logicalOperator(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:boolean")) {
       *type = SOAP_TYPE_ICat3_bool;
-      return soap_in_bool(soap, NULL, NULL, NULL);
+      return soap_in_bool(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:QName")) {
       char **s;
       *type = SOAP_TYPE_ICat3__QName;
-      s = soap_in__QName(soap, NULL, NULL, NULL);
-      return s ? *s : NULL;
+      s = soap_in__QName(soap, nullptr, nullptr, nullptr);
+      return s ? *s : nullptr;
     }
     if (!soap_match_tag(soap, t, "xsd:string")) {
       char **s;
       *type = SOAP_TYPE_ICat3_string;
-      s = soap_in_string(soap, NULL, NULL, NULL);
-      return s ? *s : NULL;
+      s = soap_in_string(soap, nullptr, nullptr, nullptr);
+      return s ? *s : nullptr;
     }
     t = soap->tag;
 #ifndef WITH_NOIDREF
@@ -3845,7 +4041,7 @@ SOAP_FMAC3 void *SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) {
 #endif
   }
   soap->error = SOAP_TAG_MISMATCH;
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_ignore_element(struct soap *soap) {
@@ -3875,7 +4071,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_ignore_element(struct soap *soap) {
         while (!soap_ignore_element(soap))
           ;
         if (soap->error == SOAP_NO_TAG)
-          soap->error = soap_element_end_in(soap, NULL);
+          soap->error = soap_element_end_in(soap, nullptr);
       }
     }
   }
@@ -11234,7 +11430,7 @@ ICat3_instantiate(struct soap *soap, int t, const char *type,
     return (void *)soap_instantiate_std__vectorTemplateOfPointerToxsd__anyType(
         soap, -1, type, arrayType, n);
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC3 int SOAP_FMAC4 ICat3_fdelete(struct soap_clist *p) {
@@ -14916,7 +15112,7 @@ soap_in_byte(struct soap *soap, const char *tag, char *a, const char *type) {
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_byte(struct soap *soap, const char *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat3_byte);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat3_byte);
   if (soap_out_byte(soap, tag ? tag : "byte", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -14926,7 +15122,7 @@ SOAP_FMAC3 char *SOAP_FMAC4
 soap_get_byte(struct soap *soap, char *p, const char *tag, const char *type) {
   if ((p = soap_in_byte(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -14957,7 +15153,7 @@ soap_in_int(struct soap *soap, const char *tag, int *a, const char *type) {
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_int(struct soap *soap, const int *a,
                                        const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat3_int);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat3_int);
   if (soap_out_int(soap, tag ? tag : "int", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -14967,7 +15163,7 @@ SOAP_FMAC3 int *SOAP_FMAC4
 soap_get_int(struct soap *soap, int *p, const char *tag, const char *type) {
   if ((p = soap_in_int(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -14999,7 +15195,7 @@ SOAP_FMAC3 LONG64 *SOAP_FMAC4 soap_in_LONG64(struct soap *soap, const char *tag,
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_LONG64(struct soap *soap, const LONG64 *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat3_LONG64);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat3_LONG64);
   if (soap_out_LONG64(soap, tag ? tag : "long", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -15010,7 +15206,7 @@ SOAP_FMAC3 LONG64 *SOAP_FMAC4 soap_get_LONG64(struct soap *soap, LONG64 *p,
                                               const char *type) {
   if ((p = soap_in_LONG64(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -15042,7 +15238,7 @@ soap_in_float(struct soap *soap, const char *tag, float *a, const char *type) {
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_float(struct soap *soap, const float *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat3_float);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat3_float);
   if (soap_out_float(soap, tag ? tag : "float", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -15052,7 +15248,7 @@ SOAP_FMAC3 float *SOAP_FMAC4
 soap_get_float(struct soap *soap, float *p, const char *tag, const char *type) {
   if ((p = soap_in_float(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -15084,7 +15280,7 @@ SOAP_FMAC3 double *SOAP_FMAC4 soap_in_double(struct soap *soap, const char *tag,
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_double(struct soap *soap, const double *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat3_double);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat3_double);
   if (soap_out_double(soap, tag ? tag : "double", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -15095,7 +15291,7 @@ SOAP_FMAC3 double *SOAP_FMAC4 soap_get_double(struct soap *soap, double *p,
                                               const char *type) {
   if ((p = soap_in_double(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -15127,7 +15323,7 @@ soap_in_time(struct soap *soap, const char *tag, time_t *a, const char *type) {
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_time(struct soap *soap, const time_t *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat3_time);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat3_time);
   if (soap_out_time(soap, tag ? tag : "dateTime", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -15137,7 +15333,7 @@ SOAP_FMAC3 time_t *SOAP_FMAC4
 soap_get_time(struct soap *soap, time_t *p, const char *tag, const char *type) {
   if ((p = soap_in_time(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -15163,7 +15359,7 @@ static const struct soap_code_map soap_codes_ns1__elementType[] = {
     {(long)ns1__elementType__DATASET_USCOREPARAMETER, "DATASET_PARAMETER"},
     {(long)ns1__elementType__DATAFILE, "DATAFILE"},
     {(long)ns1__elementType__DATAFILE_USCOREPARAMETER, "DATAFILE_PARAMETER"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__elementType2s(struct soap *soap, enum ns1__elementType n) {
@@ -15208,22 +15404,22 @@ SOAP_FMAC3 enum ns1__elementType *SOAP_FMAC4
 soap_in_ns1__elementType(struct soap *soap, const char *tag,
                          enum ns1__elementType *a, const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__elementType *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__elementType,
-      sizeof(enum ns1__elementType), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__elementType), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__elementType(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__elementType *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__elementType, 0,
-        sizeof(enum ns1__elementType), 0, NULL);
+        sizeof(enum ns1__elementType), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -15231,7 +15427,7 @@ soap_in_ns1__elementType(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__elementType(struct soap *soap, const enum ns1__elementType *a,
                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__elementType);
   if (soap_out_ns1__elementType(soap, tag ? tag : "ns1:elementType", id, a,
                                 type))
@@ -15244,7 +15440,7 @@ soap_get_ns1__elementType(struct soap *soap, enum ns1__elementType *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__elementType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -15262,7 +15458,7 @@ static const struct soap_code_map soap_codes_ns1__parameterType[] = {
     {(long)ns1__parameterType__DATAFILE, "DATAFILE"},
     {(long)ns1__parameterType__DATASET, "DATASET"},
     {(long)ns1__parameterType__SAMPLE, "SAMPLE"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__parameterType2s(struct soap *soap, enum ns1__parameterType n) {
@@ -15308,22 +15504,22 @@ SOAP_FMAC3 enum ns1__parameterType *SOAP_FMAC4
 soap_in_ns1__parameterType(struct soap *soap, const char *tag,
                            enum ns1__parameterType *a, const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__parameterType *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__parameterType,
-      sizeof(enum ns1__parameterType), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__parameterType), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__parameterType(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__parameterType *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__parameterType, 0,
-        sizeof(enum ns1__parameterType), 0, NULL);
+        sizeof(enum ns1__parameterType), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -15331,7 +15527,7 @@ soap_in_ns1__parameterType(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__parameterType(struct soap *soap, const enum ns1__parameterType *a,
                             const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__parameterType);
   if (soap_out_ns1__parameterType(soap, tag ? tag : "ns1:parameterType", id, a,
                                   type))
@@ -15344,7 +15540,7 @@ soap_get_ns1__parameterType(struct soap *soap, enum ns1__parameterType *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__parameterType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -15362,7 +15558,7 @@ static const struct soap_code_map soap_codes_ns1__keywordType[] = {
     {(long)ns1__keywordType__ALL, "ALL"},
     {(long)ns1__keywordType__ALPHA_USCORENUMERIC, "ALPHA_NUMERIC"},
     {(long)ns1__keywordType__ALPHA, "ALPHA"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__keywordType2s(struct soap *soap, enum ns1__keywordType n) {
@@ -15407,22 +15603,22 @@ SOAP_FMAC3 enum ns1__keywordType *SOAP_FMAC4
 soap_in_ns1__keywordType(struct soap *soap, const char *tag,
                          enum ns1__keywordType *a, const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__keywordType *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__keywordType,
-      sizeof(enum ns1__keywordType), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__keywordType), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__keywordType(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__keywordType *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__keywordType, 0,
-        sizeof(enum ns1__keywordType), 0, NULL);
+        sizeof(enum ns1__keywordType), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -15430,7 +15626,7 @@ soap_in_ns1__keywordType(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__keywordType(struct soap *soap, const enum ns1__keywordType *a,
                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__keywordType);
   if (soap_out_ns1__keywordType(soap, tag ? tag : "ns1:keywordType", id, a,
                                 type))
@@ -15443,7 +15639,7 @@ soap_get_ns1__keywordType(struct soap *soap, enum ns1__keywordType *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__keywordType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -15469,7 +15665,7 @@ static const struct soap_code_map soap_codes_ns1__comparisonOperator[] = {
     {(long)ns1__comparisonOperator__STARTS_USCOREWITH, "STARTS_WITH"},
     {(long)ns1__comparisonOperator__ENDS_USCOREWITH, "ENDS_WITH"},
     {(long)ns1__comparisonOperator__IN, "IN"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__comparisonOperator2s(struct soap *soap,
@@ -15517,22 +15713,22 @@ soap_in_ns1__comparisonOperator(struct soap *soap, const char *tag,
                                 enum ns1__comparisonOperator *a,
                                 const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__comparisonOperator *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__comparisonOperator,
-      sizeof(enum ns1__comparisonOperator), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__comparisonOperator), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__comparisonOperator(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__comparisonOperator *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__comparisonOperator,
-        0, sizeof(enum ns1__comparisonOperator), 0, NULL);
+        0, sizeof(enum ns1__comparisonOperator), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -15541,7 +15737,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__comparisonOperator(struct soap *soap,
                                  const enum ns1__comparisonOperator *a,
                                  const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__comparisonOperator);
   if (soap_out_ns1__comparisonOperator(
           soap, tag ? tag : "ns1:comparisonOperator", id, a, type))
@@ -15555,7 +15751,7 @@ soap_get_ns1__comparisonOperator(struct soap *soap,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__comparisonOperator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -15574,7 +15770,7 @@ static const struct soap_code_map soap_codes_ns1__parameterValueType[] = {
     {(long)ns1__parameterValueType__NUMERIC, "NUMERIC"},
     {(long)ns1__parameterValueType__STRING, "STRING"},
     {(long)ns1__parameterValueType__DATE_USCOREAND_USCORETIME, "DATE_AND_TIME"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__parameterValueType2s(struct soap *soap,
@@ -15622,22 +15818,22 @@ soap_in_ns1__parameterValueType(struct soap *soap, const char *tag,
                                 enum ns1__parameterValueType *a,
                                 const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__parameterValueType *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__parameterValueType,
-      sizeof(enum ns1__parameterValueType), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__parameterValueType), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__parameterValueType(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__parameterValueType *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__parameterValueType,
-        0, sizeof(enum ns1__parameterValueType), 0, NULL);
+        0, sizeof(enum ns1__parameterValueType), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -15646,7 +15842,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__parameterValueType(struct soap *soap,
                                  const enum ns1__parameterValueType *a,
                                  const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__parameterValueType);
   if (soap_out_ns1__parameterValueType(
           soap, tag ? tag : "ns1:parameterValueType", id, a, type))
@@ -15660,7 +15856,7 @@ soap_get_ns1__parameterValueType(struct soap *soap,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__parameterValueType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -15675,7 +15871,7 @@ soap_default_ns1__sampleInclude(struct soap *soap, enum ns1__sampleInclude *a) {
 }
 
 static const struct soap_code_map soap_codes_ns1__sampleInclude[] = {
-    {(long)ns1__sampleInclude__NONE, "NONE"}, {0, NULL}};
+    {(long)ns1__sampleInclude__NONE, "NONE"}, {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__sampleInclude2s(struct soap *soap, enum ns1__sampleInclude n) {
@@ -15721,22 +15917,22 @@ SOAP_FMAC3 enum ns1__sampleInclude *SOAP_FMAC4
 soap_in_ns1__sampleInclude(struct soap *soap, const char *tag,
                            enum ns1__sampleInclude *a, const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__sampleInclude *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__sampleInclude,
-      sizeof(enum ns1__sampleInclude), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__sampleInclude), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__sampleInclude(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__sampleInclude *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__sampleInclude, 0,
-        sizeof(enum ns1__sampleInclude), 0, NULL);
+        sizeof(enum ns1__sampleInclude), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -15744,7 +15940,7 @@ soap_in_ns1__sampleInclude(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__sampleInclude(struct soap *soap, const enum ns1__sampleInclude *a,
                             const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__sampleInclude);
   if (soap_out_ns1__sampleInclude(soap, tag ? tag : "ns1:sampleInclude", id, a,
                                   type))
@@ -15757,7 +15953,7 @@ soap_get_ns1__sampleInclude(struct soap *soap, enum ns1__sampleInclude *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__sampleInclude(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -15897,7 +16093,7 @@ static const struct soap_code_map soap_codes_ns1__restrictionAttributes[] = {
      "PARAMETER_IS_DATAFILE_PARAMETER"},
     {(long)ns1__restrictionAttributes__PARAMETER_USCOREUNITS,
      "PARAMETER_UNITS"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__restrictionAttributes2s(struct soap *soap,
@@ -15946,23 +16142,23 @@ soap_in_ns1__restrictionAttributes(struct soap *soap, const char *tag,
                                    enum ns1__restrictionAttributes *a,
                                    const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__restrictionAttributes *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__restrictionAttributes,
-      sizeof(enum ns1__restrictionAttributes), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__restrictionAttributes), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__restrictionAttributes(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__restrictionAttributes *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
         SOAP_TYPE_ICat3_ns1__restrictionAttributes, 0,
-        sizeof(enum ns1__restrictionAttributes), 0, NULL);
+        sizeof(enum ns1__restrictionAttributes), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -15971,7 +16167,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__restrictionAttributes(struct soap *soap,
                                     const enum ns1__restrictionAttributes *a,
                                     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__restrictionAttributes);
   if (soap_out_ns1__restrictionAttributes(
           soap, tag ? tag : "ns1:restrictionAttributes", id, a, type))
@@ -15985,7 +16181,7 @@ soap_get_ns1__restrictionAttributes(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__restrictionAttributes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -16036,7 +16232,7 @@ static const struct soap_code_map soap_codes_ns1__investigationInclude[] = {
     {(long)
          ns1__investigationInclude__ALL_USCOREEXCEPT_USCOREDATASETS_USCOREDATAFILES_USCOREAND_USCOREROLES,
      "ALL_EXCEPT_DATASETS_DATAFILES_AND_ROLES"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__investigationInclude2s(struct soap *soap,
@@ -16085,23 +16281,23 @@ soap_in_ns1__investigationInclude(struct soap *soap, const char *tag,
                                   enum ns1__investigationInclude *a,
                                   const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__investigationInclude *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__investigationInclude,
-      sizeof(enum ns1__investigationInclude), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__investigationInclude), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__investigationInclude(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__investigationInclude *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
         SOAP_TYPE_ICat3_ns1__investigationInclude, 0,
-        sizeof(enum ns1__investigationInclude), 0, NULL);
+        sizeof(enum ns1__investigationInclude), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -16110,7 +16306,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__investigationInclude(struct soap *soap,
                                    const enum ns1__investigationInclude *a,
                                    const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__investigationInclude);
   if (soap_out_ns1__investigationInclude(
           soap, tag ? tag : "ns1:investigationInclude", id, a, type))
@@ -16124,7 +16320,7 @@ soap_get_ns1__investigationInclude(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in_ns1__investigationInclude(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -16148,7 +16344,7 @@ static const struct soap_code_map soap_codes_ns1__datasetInclude[] = {
          ns1__datasetInclude__DATASET_USCOREDATAFILES_USCOREAND_USCOREPARAMETERS,
      "DATASET_DATAFILES_AND_PARAMETERS"},
     {(long)ns1__datasetInclude__NONE, "NONE"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__datasetInclude2s(struct soap *soap, enum ns1__datasetInclude n) {
@@ -16194,22 +16390,22 @@ SOAP_FMAC3 enum ns1__datasetInclude *SOAP_FMAC4
 soap_in_ns1__datasetInclude(struct soap *soap, const char *tag,
                             enum ns1__datasetInclude *a, const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__datasetInclude *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__datasetInclude,
-      sizeof(enum ns1__datasetInclude), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__datasetInclude), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__datasetInclude(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__datasetInclude *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__datasetInclude, 0,
-        sizeof(enum ns1__datasetInclude), 0, NULL);
+        sizeof(enum ns1__datasetInclude), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -16218,7 +16414,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__datasetInclude(struct soap *soap,
                              const enum ns1__datasetInclude *a, const char *tag,
                              const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__datasetInclude);
   if (soap_out_ns1__datasetInclude(soap, tag ? tag : "ns1:datasetInclude", id,
                                    a, type))
@@ -16231,7 +16427,7 @@ soap_get_ns1__datasetInclude(struct soap *soap, enum ns1__datasetInclude *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__datasetInclude(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -16252,7 +16448,7 @@ static const struct soap_code_map soap_codes_ns1__datafileInclude[] = {
     {(long)ns1__datafileInclude__RELATED_USCOREDATAFILES, "RELATED_DATAFILES"},
     {(long)ns1__datafileInclude__ALL, "ALL"},
     {(long)ns1__datafileInclude__NONE, "NONE"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__datafileInclude2s(struct soap *soap, enum ns1__datafileInclude n) {
@@ -16298,22 +16494,22 @@ SOAP_FMAC3 enum ns1__datafileInclude *SOAP_FMAC4
 soap_in_ns1__datafileInclude(struct soap *soap, const char *tag,
                              enum ns1__datafileInclude *a, const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__datafileInclude *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__datafileInclude,
-      sizeof(enum ns1__datafileInclude), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__datafileInclude), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__datafileInclude(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__datafileInclude *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__datafileInclude, 0,
-        sizeof(enum ns1__datafileInclude), 0, NULL);
+        sizeof(enum ns1__datafileInclude), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -16322,7 +16518,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__datafileInclude(struct soap *soap,
                               const enum ns1__datafileInclude *a,
                               const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__datafileInclude);
   if (soap_out_ns1__datafileInclude(soap, tag ? tag : "ns1:datafileInclude", id,
                                     a, type))
@@ -16335,7 +16531,7 @@ soap_get_ns1__datafileInclude(struct soap *soap, enum ns1__datafileInclude *p,
                               const char *tag, const char *type) {
   if ((p = soap_in_ns1__datafileInclude(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -16353,7 +16549,7 @@ soap_default_ns1__logicalOperator(struct soap *soap,
 static const struct soap_code_map soap_codes_ns1__logicalOperator[] = {
     {(long)ns1__logicalOperator__AND, "AND"},
     {(long)ns1__logicalOperator__OR, "OR"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__logicalOperator2s(struct soap *soap, enum ns1__logicalOperator n) {
@@ -16399,22 +16595,22 @@ SOAP_FMAC3 enum ns1__logicalOperator *SOAP_FMAC4
 soap_in_ns1__logicalOperator(struct soap *soap, const char *tag,
                              enum ns1__logicalOperator *a, const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__logicalOperator *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__logicalOperator,
-      sizeof(enum ns1__logicalOperator), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__logicalOperator), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__logicalOperator(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__logicalOperator *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__logicalOperator, 0,
-        sizeof(enum ns1__logicalOperator), 0, NULL);
+        sizeof(enum ns1__logicalOperator), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -16423,7 +16619,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__logicalOperator(struct soap *soap,
                               const enum ns1__logicalOperator *a,
                               const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__logicalOperator);
   if (soap_out_ns1__logicalOperator(soap, tag ? tag : "ns1:logicalOperator", id,
                                     a, type))
@@ -16436,7 +16632,7 @@ soap_get_ns1__logicalOperator(struct soap *soap, enum ns1__logicalOperator *p,
                               const char *tag, const char *type) {
   if ((p = soap_in_ns1__logicalOperator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -16450,7 +16646,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_bool(struct soap *soap, bool *a) {
 }
 
 static const struct soap_code_map soap_codes_bool[] = {
-    {(long)false, "false"}, {(long)true, "true"}, {0, NULL}};
+    {(long)false, "false"}, {(long)true, "true"}, {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S soap_bool2s(struct soap *soap, bool n) {
   (void)soap; /* appease -Wall -Werror */
@@ -16487,33 +16683,34 @@ soap_s2bool(struct soap *soap, const char *s, bool *a) {
 
 SOAP_FMAC3 bool *SOAP_FMAC4
 soap_in_bool(struct soap *soap, const char *tag, bool *a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   if (*soap->type && soap_match_tag(soap, soap->type, type) &&
       soap_match_tag(soap, soap->type, ":boolean")) {
     soap->error = SOAP_TYPE;
-    return NULL;
+    return nullptr;
   }
   a = (bool *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ICat3_bool,
-                            sizeof(bool), 0, NULL, NULL, NULL);
+                            sizeof(bool), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2bool(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (bool *)soap_id_forward(soap, soap->href, (void *)a, 0,
-                                SOAP_TYPE_ICat3_bool, 0, sizeof(bool), 0, NULL);
+                                SOAP_TYPE_ICat3_bool, 0, sizeof(bool), 0,
+                                nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_bool(struct soap *soap, const bool *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat3_bool);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat3_bool);
   if (soap_out_bool(soap, tag ? tag : "boolean", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -16523,7 +16720,7 @@ SOAP_FMAC3 bool *SOAP_FMAC4
 soap_get_bool(struct soap *soap, bool *p, const char *tag, const char *type) {
   if ((p = soap_in_bool(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -16563,13 +16760,13 @@ SOAP_FMAC3 ns1__elementType_ *SOAP_FMAC4
 soap_in_ns1__elementType_(struct soap *soap, const char *tag,
                           ns1__elementType_ *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__elementType_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__elementType_,
             sizeof(ns1__elementType_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -16580,13 +16777,13 @@ soap_in_ns1__elementType_(struct soap *soap, const char *tag,
   }
   if (!soap_in_ns1__elementType(soap, tag, &(a->ns1__elementType_::__item),
                                 "ns1:elementType"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__elementType_::soap_put(struct soap *soap, const char *tag,
                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__elementType_);
   if (this->soap_out(soap, tag ? tag : "ns1:elementType", id, type))
     return soap->error;
@@ -16603,7 +16800,7 @@ soap_get_ns1__elementType_(struct soap *soap, ns1__elementType_ *p,
                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__elementType_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -16616,9 +16813,9 @@ soap_instantiate_ns1__elementType_(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__elementType_(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__elementType_, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__elementType_, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__elementType_);
     if (size)
@@ -16687,13 +16884,13 @@ SOAP_FMAC3 ns1__parameterType_ *SOAP_FMAC4
 soap_in_ns1__parameterType_(struct soap *soap, const char *tag,
                             ns1__parameterType_ *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__parameterType_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__parameterType_,
             sizeof(ns1__parameterType_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -16704,13 +16901,13 @@ soap_in_ns1__parameterType_(struct soap *soap, const char *tag,
   }
   if (!soap_in_ns1__parameterType(soap, tag, &(a->ns1__parameterType_::__item),
                                   "ns1:parameterType"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__parameterType_::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__parameterType_);
   if (this->soap_out(soap, tag ? tag : "ns1:parameterType", id, type))
     return soap->error;
@@ -16727,7 +16924,7 @@ soap_get_ns1__parameterType_(struct soap *soap, ns1__parameterType_ *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__parameterType_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -16740,9 +16937,9 @@ soap_instantiate_ns1__parameterType_(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__parameterType_(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__parameterType_, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__parameterType_, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__parameterType_);
     if (size)
@@ -16811,13 +17008,13 @@ SOAP_FMAC3 ns1__keywordType_ *SOAP_FMAC4
 soap_in_ns1__keywordType_(struct soap *soap, const char *tag,
                           ns1__keywordType_ *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__keywordType_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__keywordType_,
             sizeof(ns1__keywordType_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -16828,13 +17025,13 @@ soap_in_ns1__keywordType_(struct soap *soap, const char *tag,
   }
   if (!soap_in_ns1__keywordType(soap, tag, &(a->ns1__keywordType_::__item),
                                 "ns1:keywordType"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__keywordType_::soap_put(struct soap *soap, const char *tag,
                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__keywordType_);
   if (this->soap_out(soap, tag ? tag : "ns1:keywordType", id, type))
     return soap->error;
@@ -16851,7 +17048,7 @@ soap_get_ns1__keywordType_(struct soap *soap, ns1__keywordType_ *p,
                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__keywordType_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -16864,9 +17061,9 @@ soap_instantiate_ns1__keywordType_(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__keywordType_(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__keywordType_, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__keywordType_, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__keywordType_);
     if (size)
@@ -16939,13 +17136,13 @@ soap_in_ns1__comparisonOperator_(struct soap *soap, const char *tag,
                                  ns1__comparisonOperator_ *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__comparisonOperator_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__comparisonOperator_,
             sizeof(ns1__comparisonOperator_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -16957,13 +17154,13 @@ soap_in_ns1__comparisonOperator_(struct soap *soap, const char *tag,
   if (!soap_in_ns1__comparisonOperator(soap, tag,
                                        &(a->ns1__comparisonOperator_::__item),
                                        "ns1:comparisonOperator"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__comparisonOperator_::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__comparisonOperator_);
   if (this->soap_out(soap, tag ? tag : "ns1:comparisonOperator", id, type))
     return soap->error;
@@ -16981,7 +17178,7 @@ soap_get_ns1__comparisonOperator_(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__comparisonOperator_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -16995,10 +17192,11 @@ soap_instantiate_ns1__comparisonOperator_(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__comparisonOperator_(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__comparisonOperator_, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__comparisonOperator_, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__comparisonOperator_);
     if (size)
@@ -17072,13 +17270,13 @@ soap_in_ns1__parameterValueType_(struct soap *soap, const char *tag,
                                  ns1__parameterValueType_ *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__parameterValueType_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__parameterValueType_,
             sizeof(ns1__parameterValueType_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -17090,13 +17288,13 @@ soap_in_ns1__parameterValueType_(struct soap *soap, const char *tag,
   if (!soap_in_ns1__parameterValueType(soap, tag,
                                        &(a->ns1__parameterValueType_::__item),
                                        "ns1:parameterValueType"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__parameterValueType_::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__parameterValueType_);
   if (this->soap_out(soap, tag ? tag : "ns1:parameterValueType", id, type))
     return soap->error;
@@ -17114,7 +17312,7 @@ soap_get_ns1__parameterValueType_(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__parameterValueType_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -17128,10 +17326,11 @@ soap_instantiate_ns1__parameterValueType_(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__parameterValueType_(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__parameterValueType_, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__parameterValueType_, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__parameterValueType_);
     if (size)
@@ -17201,13 +17400,13 @@ SOAP_FMAC3 ns1__sampleInclude_ *SOAP_FMAC4
 soap_in_ns1__sampleInclude_(struct soap *soap, const char *tag,
                             ns1__sampleInclude_ *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__sampleInclude_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__sampleInclude_,
             sizeof(ns1__sampleInclude_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -17218,13 +17417,13 @@ soap_in_ns1__sampleInclude_(struct soap *soap, const char *tag,
   }
   if (!soap_in_ns1__sampleInclude(soap, tag, &(a->ns1__sampleInclude_::__item),
                                   "ns1:sampleInclude"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__sampleInclude_::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__sampleInclude_);
   if (this->soap_out(soap, tag ? tag : "ns1:sampleInclude", id, type))
     return soap->error;
@@ -17241,7 +17440,7 @@ soap_get_ns1__sampleInclude_(struct soap *soap, ns1__sampleInclude_ *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__sampleInclude_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -17254,9 +17453,9 @@ soap_instantiate_ns1__sampleInclude_(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__sampleInclude_(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__sampleInclude_, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__sampleInclude_, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__sampleInclude_);
     if (size)
@@ -17329,14 +17528,14 @@ soap_in_ns1__restrictionAttributes_(struct soap *soap, const char *tag,
                                     ns1__restrictionAttributes_ *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__restrictionAttributes_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__restrictionAttributes_,
             sizeof(ns1__restrictionAttributes_), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -17348,13 +17547,13 @@ soap_in_ns1__restrictionAttributes_(struct soap *soap, const char *tag,
   if (!soap_in_ns1__restrictionAttributes(
           soap, tag, &(a->ns1__restrictionAttributes_::__item),
           "ns1:restrictionAttributes"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__restrictionAttributes_::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__restrictionAttributes_);
   if (this->soap_out(soap, tag ? tag : "ns1:restrictionAttributes", id, type))
     return soap->error;
@@ -17372,7 +17571,7 @@ soap_get_ns1__restrictionAttributes_(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__restrictionAttributes_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -17388,10 +17587,10 @@ soap_instantiate_ns1__restrictionAttributes_(struct soap *soap, int n,
                    "soap_instantiate_ns1__restrictionAttributes_(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__restrictionAttributes_, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__restrictionAttributes_, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__restrictionAttributes_);
     if (size)
@@ -17466,13 +17665,13 @@ soap_in_ns1__investigationInclude_(struct soap *soap, const char *tag,
                                    ns1__investigationInclude_ *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__investigationInclude_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__investigationInclude_,
             sizeof(ns1__investigationInclude_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -17484,13 +17683,13 @@ soap_in_ns1__investigationInclude_(struct soap *soap, const char *tag,
   if (!soap_in_ns1__investigationInclude(
           soap, tag, &(a->ns1__investigationInclude_::__item),
           "ns1:investigationInclude"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__investigationInclude_::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__investigationInclude_);
   if (this->soap_out(soap, tag ? tag : "ns1:investigationInclude", id, type))
     return soap->error;
@@ -17508,7 +17707,7 @@ soap_get_ns1__investigationInclude_(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__investigationInclude_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -17523,10 +17722,11 @@ soap_instantiate_ns1__investigationInclude_(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__investigationInclude_(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__investigationInclude_, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__investigationInclude_, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__investigationInclude_);
     if (size)
@@ -17596,13 +17796,13 @@ SOAP_FMAC3 ns1__datasetInclude_ *SOAP_FMAC4
 soap_in_ns1__datasetInclude_(struct soap *soap, const char *tag,
                              ns1__datasetInclude_ *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__datasetInclude_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__datasetInclude_,
             sizeof(ns1__datasetInclude_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -17613,13 +17813,13 @@ soap_in_ns1__datasetInclude_(struct soap *soap, const char *tag,
   }
   if (!soap_in_ns1__datasetInclude(
           soap, tag, &(a->ns1__datasetInclude_::__item), "ns1:datasetInclude"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__datasetInclude_::soap_put(struct soap *soap, const char *tag,
                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__datasetInclude_);
   if (this->soap_out(soap, tag ? tag : "ns1:datasetInclude", id, type))
     return soap->error;
@@ -17636,7 +17836,7 @@ soap_get_ns1__datasetInclude_(struct soap *soap, ns1__datasetInclude_ *p,
                               const char *tag, const char *type) {
   if ((p = soap_in_ns1__datasetInclude_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -17651,9 +17851,9 @@ soap_instantiate_ns1__datasetInclude_(struct soap *soap, int n,
                       "soap_instantiate_ns1__datasetInclude_(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__datasetInclude_, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__datasetInclude_, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__datasetInclude_);
     if (size)
@@ -17724,13 +17924,13 @@ SOAP_FMAC3 ns1__datafileInclude_ *SOAP_FMAC4
 soap_in_ns1__datafileInclude_(struct soap *soap, const char *tag,
                               ns1__datafileInclude_ *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__datafileInclude_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__datafileInclude_,
             sizeof(ns1__datafileInclude_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -17742,13 +17942,13 @@ soap_in_ns1__datafileInclude_(struct soap *soap, const char *tag,
   if (!soap_in_ns1__datafileInclude(soap, tag,
                                     &(a->ns1__datafileInclude_::__item),
                                     "ns1:datafileInclude"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__datafileInclude_::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__datafileInclude_);
   if (this->soap_out(soap, tag ? tag : "ns1:datafileInclude", id, type))
     return soap->error;
@@ -17765,7 +17965,7 @@ soap_get_ns1__datafileInclude_(struct soap *soap, ns1__datafileInclude_ *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns1__datafileInclude_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -17780,9 +17980,9 @@ soap_instantiate_ns1__datafileInclude_(struct soap *soap, int n,
                       "soap_instantiate_ns1__datafileInclude_(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__datafileInclude_, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__datafileInclude_, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__datafileInclude_);
     if (size)
@@ -17853,13 +18053,13 @@ SOAP_FMAC3 ns1__logicalOperator_ *SOAP_FMAC4
 soap_in_ns1__logicalOperator_(struct soap *soap, const char *tag,
                               ns1__logicalOperator_ *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__logicalOperator_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__logicalOperator_,
             sizeof(ns1__logicalOperator_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -17871,13 +18071,13 @@ soap_in_ns1__logicalOperator_(struct soap *soap, const char *tag,
   if (!soap_in_ns1__logicalOperator(soap, tag,
                                     &(a->ns1__logicalOperator_::__item),
                                     "ns1:logicalOperator"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__logicalOperator_::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__logicalOperator_);
   if (this->soap_out(soap, tag ? tag : "ns1:logicalOperator", id, type))
     return soap->error;
@@ -17894,7 +18094,7 @@ soap_get_ns1__logicalOperator_(struct soap *soap, ns1__logicalOperator_ *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns1__logicalOperator_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -17909,9 +18109,9 @@ soap_instantiate_ns1__logicalOperator_(struct soap *soap, int n,
                       "soap_instantiate_ns1__logicalOperator_(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__logicalOperator_, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__logicalOperator_, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__logicalOperator_);
     if (size)
@@ -17947,9 +18147,9 @@ soap_copy_ns1__logicalOperator_(struct soap *soap, int st, int tt, void *p,
 void ns3__NoSuchUserException::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns3__NoSuchUserException::message = NULL;
-  this->ns3__NoSuchUserException::stackTraceAsString = NULL;
-  this->ns3__NoSuchUserException::uniqueId = NULL;
+  this->ns3__NoSuchUserException::message = nullptr;
+  this->ns3__NoSuchUserException::stackTraceAsString = nullptr;
+  this->ns3__NoSuchUserException::uniqueId = nullptr;
 }
 
 void ns3__NoSuchUserException::soap_serialize(struct soap *soap) const {
@@ -18003,13 +18203,13 @@ soap_in_ns3__NoSuchUserException(struct soap *soap, const char *tag,
                                  ns3__NoSuchUserException *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns3__NoSuchUserException *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns3__NoSuchUserException,
       sizeof(ns3__NoSuchUserException), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns3__NoSuchUserException) {
@@ -18062,10 +18262,10 @@ soap_in_ns3__NoSuchUserException(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns3__NoSuchUserException *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -18073,14 +18273,14 @@ soap_in_ns3__NoSuchUserException(struct soap *soap, const char *tag,
         sizeof(ns3__NoSuchUserException), 0,
         soap_copy_ns3__NoSuchUserException);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns3__NoSuchUserException::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns3__NoSuchUserException);
   if (this->soap_out(soap, tag ? tag : "ns3:NoSuchUserException", id, type))
     return soap->error;
@@ -18098,7 +18298,7 @@ soap_get_ns3__NoSuchUserException(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns3__NoSuchUserException(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -18112,10 +18312,11 @@ soap_instantiate_ns3__NoSuchUserException(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns3__NoSuchUserException(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns3__NoSuchUserException, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns3__NoSuchUserException, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns3__NoSuchUserException);
     if (size)
@@ -18152,7 +18353,7 @@ soap_copy_ns3__NoSuchUserException(struct soap *soap, int st, int tt, void *p,
 void ns3__getUserDetailsResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns3__getUserDetailsResponse::return_ = NULL;
+  this->ns3__getUserDetailsResponse::return_ = nullptr;
 }
 
 void ns3__getUserDetailsResponse::soap_serialize(struct soap *soap) const {
@@ -18196,13 +18397,13 @@ soap_in_ns3__getUserDetailsResponse(struct soap *soap, const char *tag,
                                     ns3__getUserDetailsResponse *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns3__getUserDetailsResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns3__getUserDetailsResponse,
       sizeof(ns3__getUserDetailsResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns3__getUserDetailsResponse) {
@@ -18235,10 +18436,10 @@ soap_in_ns3__getUserDetailsResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns3__getUserDetailsResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -18246,14 +18447,14 @@ soap_in_ns3__getUserDetailsResponse(struct soap *soap, const char *tag,
         sizeof(ns3__getUserDetailsResponse), 0,
         soap_copy_ns3__getUserDetailsResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns3__getUserDetailsResponse::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns3__getUserDetailsResponse);
   if (this->soap_out(soap, tag ? tag : "ns3:getUserDetailsResponse", id, type))
     return soap->error;
@@ -18271,7 +18472,7 @@ soap_get_ns3__getUserDetailsResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns3__getUserDetailsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -18287,10 +18488,10 @@ soap_instantiate_ns3__getUserDetailsResponse(struct soap *soap, int n,
                    "soap_instantiate_ns3__getUserDetailsResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns3__getUserDetailsResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns3__getUserDetailsResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns3__getUserDetailsResponse);
     if (size)
@@ -18328,8 +18529,8 @@ soap_copy_ns3__getUserDetailsResponse(struct soap *soap, int st, int tt,
 void ns3__getUserDetails::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns3__getUserDetails::sessionId = NULL;
-  this->ns3__getUserDetails::usersName = NULL;
+  this->ns3__getUserDetails::sessionId = nullptr;
+  this->ns3__getUserDetails::usersName = nullptr;
 }
 
 void ns3__getUserDetails::soap_serialize(struct soap *soap) const {
@@ -18375,13 +18576,13 @@ SOAP_FMAC3 ns3__getUserDetails *SOAP_FMAC4
 soap_in_ns3__getUserDetails(struct soap *soap, const char *tag,
                             ns3__getUserDetails *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns3__getUserDetails *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns3__getUserDetails,
       sizeof(ns3__getUserDetails), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns3__getUserDetails) {
@@ -18424,23 +18625,23 @@ soap_in_ns3__getUserDetails(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns3__getUserDetails *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns3__getUserDetails, 0,
         sizeof(ns3__getUserDetails), 0, soap_copy_ns3__getUserDetails);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns3__getUserDetails::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns3__getUserDetails);
   if (this->soap_out(soap, tag ? tag : "ns3:getUserDetails", id, type))
     return soap->error;
@@ -18457,7 +18658,7 @@ soap_get_ns3__getUserDetails(struct soap *soap, ns3__getUserDetails *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns3__getUserDetails(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -18470,9 +18671,9 @@ soap_instantiate_ns3__getUserDetails(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns3__getUserDetails(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns3__getUserDetails, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns3__getUserDetails, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns3__getUserDetails);
     if (size)
@@ -18508,9 +18709,9 @@ soap_copy_ns3__getUserDetails(struct soap *soap, int st, int tt, void *p,
 void ns3__ValidationException::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns3__ValidationException::message = NULL;
-  this->ns3__ValidationException::stackTraceAsString = NULL;
-  this->ns3__ValidationException::uniqueId = NULL;
+  this->ns3__ValidationException::message = nullptr;
+  this->ns3__ValidationException::stackTraceAsString = nullptr;
+  this->ns3__ValidationException::uniqueId = nullptr;
 }
 
 void ns3__ValidationException::soap_serialize(struct soap *soap) const {
@@ -18564,13 +18765,13 @@ soap_in_ns3__ValidationException(struct soap *soap, const char *tag,
                                  ns3__ValidationException *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns3__ValidationException *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns3__ValidationException,
       sizeof(ns3__ValidationException), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns3__ValidationException) {
@@ -18623,10 +18824,10 @@ soap_in_ns3__ValidationException(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns3__ValidationException *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -18634,14 +18835,14 @@ soap_in_ns3__ValidationException(struct soap *soap, const char *tag,
         sizeof(ns3__ValidationException), 0,
         soap_copy_ns3__ValidationException);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns3__ValidationException::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns3__ValidationException);
   if (this->soap_out(soap, tag ? tag : "ns3:ValidationException", id, type))
     return soap->error;
@@ -18659,7 +18860,7 @@ soap_get_ns3__ValidationException(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns3__ValidationException(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -18673,10 +18874,11 @@ soap_instantiate_ns3__ValidationException(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns3__ValidationException(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns3__ValidationException, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns3__ValidationException, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns3__ValidationException);
     if (size)
@@ -18713,9 +18915,9 @@ soap_copy_ns3__ValidationException(struct soap *soap, int st, int tt, void *p,
 void ns3__NoSuchObjectFoundException::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns3__NoSuchObjectFoundException::message = NULL;
-  this->ns3__NoSuchObjectFoundException::stackTraceAsString = NULL;
-  this->ns3__NoSuchObjectFoundException::uniqueId = NULL;
+  this->ns3__NoSuchObjectFoundException::message = nullptr;
+  this->ns3__NoSuchObjectFoundException::stackTraceAsString = nullptr;
+  this->ns3__NoSuchObjectFoundException::uniqueId = nullptr;
 }
 
 void ns3__NoSuchObjectFoundException::soap_serialize(struct soap *soap) const {
@@ -18773,13 +18975,13 @@ soap_in_ns3__NoSuchObjectFoundException(struct soap *soap, const char *tag,
                                         ns3__NoSuchObjectFoundException *a,
                                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns3__NoSuchObjectFoundException *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns3__NoSuchObjectFoundException,
       sizeof(ns3__NoSuchObjectFoundException), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns3__NoSuchObjectFoundException) {
@@ -18833,10 +19035,10 @@ soap_in_ns3__NoSuchObjectFoundException(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns3__NoSuchObjectFoundException *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -18844,7 +19046,7 @@ soap_in_ns3__NoSuchObjectFoundException(struct soap *soap, const char *tag,
         sizeof(ns3__NoSuchObjectFoundException), 0,
         soap_copy_ns3__NoSuchObjectFoundException);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -18852,7 +19054,7 @@ soap_in_ns3__NoSuchObjectFoundException(struct soap *soap, const char *tag,
 int ns3__NoSuchObjectFoundException::soap_put(struct soap *soap,
                                               const char *tag,
                                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns3__NoSuchObjectFoundException);
   if (this->soap_out(soap, tag ? tag : "ns3:NoSuchObjectFoundException", id,
                      type))
@@ -18872,7 +19074,7 @@ soap_get_ns3__NoSuchObjectFoundException(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_ns3__NoSuchObjectFoundException(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -18889,10 +19091,10 @@ soap_instantiate_ns3__NoSuchObjectFoundException(struct soap *soap, int n,
              "soap_instantiate_ns3__NoSuchObjectFoundException(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns3__NoSuchObjectFoundException, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns3__NoSuchObjectFoundException,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns3__NoSuchObjectFoundException);
     if (size)
@@ -18930,9 +19132,9 @@ soap_copy_ns3__NoSuchObjectFoundException(struct soap *soap, int st, int tt,
 void ns3__SessionException::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns3__SessionException::message = NULL;
-  this->ns3__SessionException::stackTraceAsString = NULL;
-  this->ns3__SessionException::uniqueId = NULL;
+  this->ns3__SessionException::message = nullptr;
+  this->ns3__SessionException::stackTraceAsString = nullptr;
+  this->ns3__SessionException::uniqueId = nullptr;
 }
 
 void ns3__SessionException::soap_serialize(struct soap *soap) const {
@@ -18985,13 +19187,13 @@ SOAP_FMAC3 ns3__SessionException *SOAP_FMAC4
 soap_in_ns3__SessionException(struct soap *soap, const char *tag,
                               ns3__SessionException *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns3__SessionException *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns3__SessionException,
       sizeof(ns3__SessionException), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns3__SessionException) {
@@ -19044,23 +19246,23 @@ soap_in_ns3__SessionException(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns3__SessionException *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns3__SessionException,
         0, sizeof(ns3__SessionException), 0, soap_copy_ns3__SessionException);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns3__SessionException::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns3__SessionException);
   if (this->soap_out(soap, tag ? tag : "ns3:SessionException", id, type))
     return soap->error;
@@ -19077,7 +19279,7 @@ soap_get_ns3__SessionException(struct soap *soap, ns3__SessionException *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns3__SessionException(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -19092,9 +19294,9 @@ soap_instantiate_ns3__SessionException(struct soap *soap, int n,
                       "soap_instantiate_ns3__SessionException(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns3__SessionException, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns3__SessionException, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns3__SessionException);
     if (size)
@@ -19187,8 +19389,8 @@ soap_in_ns1__searchInvestigationByRestrictionComparasionResponse(
     ns1__searchInvestigationByRestrictionComparasionResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByRestrictionComparasionResponse *)
       soap_class_id_enter(
           soap, soap->id, a,
@@ -19196,7 +19398,7 @@ soap_in_ns1__searchInvestigationByRestrictionComparasionResponse(
           sizeof(ns1__searchInvestigationByRestrictionComparasionResponse),
           soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -19230,10 +19432,10 @@ soap_in_ns1__searchInvestigationByRestrictionComparasionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByRestrictionComparasionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -19241,7 +19443,7 @@ soap_in_ns1__searchInvestigationByRestrictionComparasionResponse(
         0, sizeof(ns1__searchInvestigationByRestrictionComparasionResponse), 0,
         soap_copy_ns1__searchInvestigationByRestrictionComparasionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -19249,7 +19451,7 @@ soap_in_ns1__searchInvestigationByRestrictionComparasionResponse(
 int ns1__searchInvestigationByRestrictionComparasionResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionComparasionResponse);
   if (this->soap_out(
           soap,
@@ -19273,7 +19475,7 @@ soap_get_ns1__searchInvestigationByRestrictionComparasionResponse(
   if ((p = soap_in_ns1__searchInvestigationByRestrictionComparasionResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -19288,11 +19490,11 @@ soap_instantiate_ns1__searchInvestigationByRestrictionComparasionResponse(
                                     "nResponse(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionComparasionResponse,
       n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(
         ns1__searchInvestigationByRestrictionComparasionResponse);
@@ -19339,7 +19541,7 @@ void ns1__searchInvestigationByRestrictionComparasion::soap_default(
     struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchInvestigationByRestrictionComparasion::sessionId = NULL;
+  this->ns1__searchInvestigationByRestrictionComparasion::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__restrictionComparisonCondition(
       soap,
       &this->ns1__searchInvestigationByRestrictionComparasion::restriction);
@@ -19401,15 +19603,15 @@ soap_in_ns1__searchInvestigationByRestrictionComparasion(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByRestrictionComparasion *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByRestrictionComparasion *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionComparasion,
       sizeof(ns1__searchInvestigationByRestrictionComparasion), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -19454,10 +19656,10 @@ soap_in_ns1__searchInvestigationByRestrictionComparasion(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByRestrictionComparasion *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -19465,7 +19667,7 @@ soap_in_ns1__searchInvestigationByRestrictionComparasion(
         sizeof(ns1__searchInvestigationByRestrictionComparasion), 0,
         soap_copy_ns1__searchInvestigationByRestrictionComparasion);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -19473,7 +19675,7 @@ soap_in_ns1__searchInvestigationByRestrictionComparasion(
 int ns1__searchInvestigationByRestrictionComparasion::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionComparasion);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchInvestigationByRestrictionComparasion",
@@ -19495,7 +19697,7 @@ soap_get_ns1__searchInvestigationByRestrictionComparasion(
   if ((p = soap_in_ns1__searchInvestigationByRestrictionComparasion(soap, tag,
                                                                     p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -19510,11 +19712,11 @@ soap_instantiate_ns1__searchInvestigationByRestrictionComparasion(
                                     "n(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionComparasion, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(ns1__searchInvestigationByRestrictionComparasion);
@@ -19605,13 +19807,13 @@ soap_in_ns1__getDatasetsResponse(struct soap *soap, const char *tag,
                                  ns1__getDatasetsResponse *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getDatasetsResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getDatasetsResponse,
       sizeof(ns1__getDatasetsResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getDatasetsResponse) {
@@ -19641,10 +19843,10 @@ soap_in_ns1__getDatasetsResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getDatasetsResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -19652,14 +19854,14 @@ soap_in_ns1__getDatasetsResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getDatasetsResponse), 0,
         soap_copy_ns1__getDatasetsResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getDatasetsResponse::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getDatasetsResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getDatasetsResponse", id, type))
     return soap->error;
@@ -19677,7 +19879,7 @@ soap_get_ns1__getDatasetsResponse(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__getDatasetsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -19691,10 +19893,11 @@ soap_instantiate_ns1__getDatasetsResponse(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__getDatasetsResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getDatasetsResponse, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getDatasetsResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getDatasetsResponse);
     if (size)
@@ -19731,7 +19934,7 @@ soap_copy_ns1__getDatasetsResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__getDatasets::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getDatasets::sessionId = NULL;
+  this->ns1__getDatasets::sessionId = nullptr;
   soap_default_std__vectorTemplateOfLONG64(soap,
                                            &this->ns1__getDatasets::datasetIds);
 }
@@ -19778,13 +19981,13 @@ SOAP_FMAC3 ns1__getDatasets *SOAP_FMAC4
 soap_in_ns1__getDatasets(struct soap *soap, const char *tag,
                          ns1__getDatasets *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getDatasets *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getDatasets,
       sizeof(ns1__getDatasets), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getDatasets) {
@@ -19823,23 +20026,23 @@ soap_in_ns1__getDatasets(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getDatasets *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__getDatasets, 0,
         sizeof(ns1__getDatasets), 0, soap_copy_ns1__getDatasets);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getDatasets::soap_put(struct soap *soap, const char *tag,
                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getDatasets);
   if (this->soap_out(soap, tag ? tag : "ns1:getDatasets", id, type))
     return soap->error;
@@ -19856,7 +20059,7 @@ soap_get_ns1__getDatasets(struct soap *soap, ns1__getDatasets *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__getDatasets(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -19868,10 +20071,10 @@ soap_instantiate_ns1__getDatasets(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__getDatasets(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getDatasets, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getDatasets, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getDatasets);
     if (size)
@@ -19942,15 +20145,15 @@ soap_in_ns1__modifyDataFileParameterResponse(
     struct soap *soap, const char *tag, ns1__modifyDataFileParameterResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__modifyDataFileParameterResponse *)soap_class_id_enter(
             soap, soap->id, a,
             SOAP_TYPE_ICat3_ns1__modifyDataFileParameterResponse,
             sizeof(ns1__modifyDataFileParameterResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -19962,14 +20165,14 @@ soap_in_ns1__modifyDataFileParameterResponse(
                                                                 type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__modifyDataFileParameterResponse::soap_put(struct soap *soap,
                                                    const char *tag,
                                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifyDataFileParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:modifyDataFileParameterResponse",
                      id, type))
@@ -19989,7 +20192,7 @@ soap_get_ns1__modifyDataFileParameterResponse(
     const char *type) {
   if ((p = soap_in_ns1__modifyDataFileParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -20007,10 +20210,10 @@ soap_instantiate_ns1__modifyDataFileParameterResponse(struct soap *soap, int n,
           "soap_instantiate_ns1__modifyDataFileParameterResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__modifyDataFileParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__modifyDataFileParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifyDataFileParameterResponse);
     if (size)
@@ -20050,8 +20253,8 @@ soap_copy_ns1__modifyDataFileParameterResponse(struct soap *soap, int st,
 void ns1__modifyDataFileParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__modifyDataFileParameter::sessionId = NULL;
-  this->ns1__modifyDataFileParameter::dataFileParameter = NULL;
+  this->ns1__modifyDataFileParameter::sessionId = nullptr;
+  this->ns1__modifyDataFileParameter::dataFileParameter = nullptr;
 }
 
 void ns1__modifyDataFileParameter::soap_serialize(struct soap *soap) const {
@@ -20103,13 +20306,13 @@ soap_in_ns1__modifyDataFileParameter(struct soap *soap, const char *tag,
                                      ns1__modifyDataFileParameter *a,
                                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__modifyDataFileParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifyDataFileParameter,
       sizeof(ns1__modifyDataFileParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__modifyDataFileParameter) {
@@ -20152,10 +20355,10 @@ soap_in_ns1__modifyDataFileParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__modifyDataFileParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -20163,14 +20366,14 @@ soap_in_ns1__modifyDataFileParameter(struct soap *soap, const char *tag,
         sizeof(ns1__modifyDataFileParameter), 0,
         soap_copy_ns1__modifyDataFileParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__modifyDataFileParameter::soap_put(struct soap *soap, const char *tag,
                                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifyDataFileParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:modifyDataFileParameter", id, type))
     return soap->error;
@@ -20188,7 +20391,7 @@ soap_get_ns1__modifyDataFileParameter(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in_ns1__modifyDataFileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -20205,10 +20408,10 @@ soap_instantiate_ns1__modifyDataFileParameter(struct soap *soap, int n,
              "soap_instantiate_ns1__modifyDataFileParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__modifyDataFileParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__modifyDataFileParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifyDataFileParameter);
     if (size)
@@ -20291,13 +20494,13 @@ soap_in_ns1__listParametersResponse(struct soap *soap, const char *tag,
                                     ns1__listParametersResponse *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listParametersResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listParametersResponse,
       sizeof(ns1__listParametersResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listParametersResponse) {
@@ -20327,10 +20530,10 @@ soap_in_ns1__listParametersResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listParametersResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -20338,14 +20541,14 @@ soap_in_ns1__listParametersResponse(struct soap *soap, const char *tag,
         sizeof(ns1__listParametersResponse), 0,
         soap_copy_ns1__listParametersResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__listParametersResponse::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listParametersResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:listParametersResponse", id, type))
     return soap->error;
@@ -20363,7 +20566,7 @@ soap_get_ns1__listParametersResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__listParametersResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -20379,10 +20582,10 @@ soap_instantiate_ns1__listParametersResponse(struct soap *soap, int n,
                    "soap_instantiate_ns1__listParametersResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__listParametersResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__listParametersResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listParametersResponse);
     if (size)
@@ -20420,7 +20623,7 @@ soap_copy_ns1__listParametersResponse(struct soap *soap, int st, int tt,
 void ns1__listParameters::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__listParameters::sessionId = NULL;
+  this->ns1__listParameters::sessionId = nullptr;
 }
 
 void ns1__listParameters::soap_serialize(struct soap *soap) const {
@@ -20461,13 +20664,13 @@ SOAP_FMAC3 ns1__listParameters *SOAP_FMAC4
 soap_in_ns1__listParameters(struct soap *soap, const char *tag,
                             ns1__listParameters *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listParameters *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listParameters,
       sizeof(ns1__listParameters), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listParameters) {
@@ -20501,23 +20704,23 @@ soap_in_ns1__listParameters(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listParameters *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__listParameters, 0,
         sizeof(ns1__listParameters), 0, soap_copy_ns1__listParameters);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__listParameters::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listParameters);
   if (this->soap_out(soap, tag ? tag : "ns1:listParameters", id, type))
     return soap->error;
@@ -20534,7 +20737,7 @@ soap_get_ns1__listParameters(struct soap *soap, ns1__listParameters *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__listParameters(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -20547,9 +20750,9 @@ soap_instantiate_ns1__listParameters(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__listParameters(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__listParameters, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__listParameters, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listParameters);
     if (size)
@@ -20636,15 +20839,15 @@ soap_in_ns1__searchSampleByParameterComparisonResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterComparisonResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByParameterComparisonResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchSampleByParameterComparisonResponse,
       sizeof(ns1__searchSampleByParameterComparisonResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -20677,10 +20880,10 @@ soap_in_ns1__searchSampleByParameterComparisonResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByParameterComparisonResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -20688,7 +20891,7 @@ soap_in_ns1__searchSampleByParameterComparisonResponse(
         sizeof(ns1__searchSampleByParameterComparisonResponse), 0,
         soap_copy_ns1__searchSampleByParameterComparisonResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -20696,7 +20899,7 @@ soap_in_ns1__searchSampleByParameterComparisonResponse(
 int ns1__searchSampleByParameterComparisonResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchSampleByParameterComparisonResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchSampleByParameterComparisonResponse", id,
@@ -20718,7 +20921,7 @@ soap_get_ns1__searchSampleByParameterComparisonResponse(
   if ((p = soap_in_ns1__searchSampleByParameterComparisonResponse(soap, tag, p,
                                                                   type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -20733,11 +20936,11 @@ soap_instantiate_ns1__searchSampleByParameterComparisonResponse(
                                     "%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat3_ns1__searchSampleByParameterComparisonResponse,
                 n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByParameterComparisonResponse);
     if (size)
@@ -20783,7 +20986,7 @@ soap_copy_ns1__searchSampleByParameterComparisonResponse(struct soap *soap,
 void ns1__searchSampleByParameterComparison::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchSampleByParameterComparison::sessionId = NULL;
+  this->ns1__searchSampleByParameterComparison::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__parameterComparisonCondition(
       soap, &this->ns1__searchSampleByParameterComparison::comparison);
 }
@@ -20840,14 +21043,14 @@ soap_in_ns1__searchSampleByParameterComparison(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterComparison *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByParameterComparison *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchSampleByParameterComparison,
       sizeof(ns1__searchSampleByParameterComparison), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -20890,10 +21093,10 @@ soap_in_ns1__searchSampleByParameterComparison(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByParameterComparison *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -20901,7 +21104,7 @@ soap_in_ns1__searchSampleByParameterComparison(
         sizeof(ns1__searchSampleByParameterComparison), 0,
         soap_copy_ns1__searchSampleByParameterComparison);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -20909,7 +21112,7 @@ soap_in_ns1__searchSampleByParameterComparison(
 int ns1__searchSampleByParameterComparison::soap_put(struct soap *soap,
                                                      const char *tag,
                                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchSampleByParameterComparison);
   if (this->soap_out(soap, tag ? tag : "ns1:searchSampleByParameterComparison",
                      id, type))
@@ -20929,7 +21132,7 @@ soap_get_ns1__searchSampleByParameterComparison(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchSampleByParameterComparison(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -20945,10 +21148,10 @@ soap_instantiate_ns1__searchSampleByParameterComparison(struct soap *soap,
                               "searchSampleByParameterComparison(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchSampleByParameterComparison, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchSampleByParameterComparison, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByParameterComparison);
     if (size)
@@ -21022,15 +21225,15 @@ soap_in_ns1__deleteSampleParameterResponse(
     struct soap *soap, const char *tag, ns1__deleteSampleParameterResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__deleteSampleParameterResponse *)soap_class_id_enter(
             soap, soap->id, a,
             SOAP_TYPE_ICat3_ns1__deleteSampleParameterResponse,
             sizeof(ns1__deleteSampleParameterResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -21040,14 +21243,14 @@ soap_in_ns1__deleteSampleParameterResponse(
       return (ns1__deleteSampleParameterResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__deleteSampleParameterResponse::soap_put(struct soap *soap,
                                                  const char *tag,
                                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteSampleParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteSampleParameterResponse", id,
                      type))
@@ -21067,7 +21270,7 @@ soap_get_ns1__deleteSampleParameterResponse(
     const char *type) {
   if ((p = soap_in_ns1__deleteSampleParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -21084,11 +21287,11 @@ soap_instantiate_ns1__deleteSampleParameterResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__deleteSampleParameterResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__deleteSampleParameterResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteSampleParameterResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteSampleParameterResponse);
     if (size)
@@ -21128,8 +21331,8 @@ soap_copy_ns1__deleteSampleParameterResponse(struct soap *soap, int st, int tt,
 void ns1__deleteSampleParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__deleteSampleParameter::sessionId = NULL;
-  this->ns1__deleteSampleParameter::sampleParameterPK = NULL;
+  this->ns1__deleteSampleParameter::sessionId = nullptr;
+  this->ns1__deleteSampleParameter::sampleParameterPK = nullptr;
 }
 
 void ns1__deleteSampleParameter::soap_serialize(struct soap *soap) const {
@@ -21180,13 +21383,13 @@ soap_in_ns1__deleteSampleParameter(struct soap *soap, const char *tag,
                                    ns1__deleteSampleParameter *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__deleteSampleParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteSampleParameter,
       sizeof(ns1__deleteSampleParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__deleteSampleParameter) {
@@ -21229,10 +21432,10 @@ soap_in_ns1__deleteSampleParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__deleteSampleParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -21240,14 +21443,14 @@ soap_in_ns1__deleteSampleParameter(struct soap *soap, const char *tag,
         sizeof(ns1__deleteSampleParameter), 0,
         soap_copy_ns1__deleteSampleParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__deleteSampleParameter::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteSampleParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteSampleParameter", id, type))
     return soap->error;
@@ -21265,7 +21468,7 @@ soap_get_ns1__deleteSampleParameter(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteSampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -21280,10 +21483,11 @@ soap_instantiate_ns1__deleteSampleParameter(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__deleteSampleParameter(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__deleteSampleParameter, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteSampleParameter, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteSampleParameter);
     if (size)
@@ -21372,15 +21576,15 @@ soap_in_ns1__searchSampleByRestrictionLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByRestrictionLogicalResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByRestrictionLogicalResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionLogicalResponse,
       sizeof(ns1__searchSampleByRestrictionLogicalResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -21413,10 +21617,10 @@ soap_in_ns1__searchSampleByRestrictionLogicalResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByRestrictionLogicalResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -21424,7 +21628,7 @@ soap_in_ns1__searchSampleByRestrictionLogicalResponse(
         sizeof(ns1__searchSampleByRestrictionLogicalResponse), 0,
         soap_copy_ns1__searchSampleByRestrictionLogicalResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -21432,7 +21636,7 @@ soap_in_ns1__searchSampleByRestrictionLogicalResponse(
 int ns1__searchSampleByRestrictionLogicalResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionLogicalResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchSampleByRestrictionLogicalResponse",
@@ -21454,7 +21658,7 @@ soap_get_ns1__searchSampleByRestrictionLogicalResponse(
   if ((p = soap_in_ns1__searchSampleByRestrictionLogicalResponse(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -21468,11 +21672,12 @@ soap_instantiate_ns1__searchSampleByRestrictionLogicalResponse(
                                     "searchSampleByRestrictionLogicalResponse(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionLogicalResponse,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionLogicalResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByRestrictionLogicalResponse);
     if (size)
@@ -21517,8 +21722,8 @@ soap_copy_ns1__searchSampleByRestrictionLogicalResponse(struct soap *soap,
 void ns1__searchSampleByRestrictionLogical::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchSampleByRestrictionLogical::sessionId = NULL;
-  this->ns1__searchSampleByRestrictionLogical::restriction = NULL;
+  this->ns1__searchSampleByRestrictionLogical::sessionId = nullptr;
+  this->ns1__searchSampleByRestrictionLogical::restriction = nullptr;
 }
 
 void ns1__searchSampleByRestrictionLogical::soap_serialize(
@@ -21572,14 +21777,14 @@ soap_in_ns1__searchSampleByRestrictionLogical(
     struct soap *soap, const char *tag,
     ns1__searchSampleByRestrictionLogical *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByRestrictionLogical *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionLogical,
       sizeof(ns1__searchSampleByRestrictionLogical), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -21625,10 +21830,10 @@ soap_in_ns1__searchSampleByRestrictionLogical(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByRestrictionLogical *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -21636,7 +21841,7 @@ soap_in_ns1__searchSampleByRestrictionLogical(
         sizeof(ns1__searchSampleByRestrictionLogical), 0,
         soap_copy_ns1__searchSampleByRestrictionLogical);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -21644,7 +21849,7 @@ soap_in_ns1__searchSampleByRestrictionLogical(
 int ns1__searchSampleByRestrictionLogical::soap_put(struct soap *soap,
                                                     const char *tag,
                                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionLogical);
   if (this->soap_out(soap, tag ? tag : "ns1:searchSampleByRestrictionLogical",
                      id, type))
@@ -21664,7 +21869,7 @@ soap_get_ns1__searchSampleByRestrictionLogical(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchSampleByRestrictionLogical(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -21680,10 +21885,10 @@ soap_instantiate_ns1__searchSampleByRestrictionLogical(struct soap *soap, int n,
                               "searchSampleByRestrictionLogical(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionLogical, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionLogical, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByRestrictionLogical);
     if (size)
@@ -21723,7 +21928,7 @@ soap_copy_ns1__searchSampleByRestrictionLogical(struct soap *soap, int st,
 void ns1__addDataFileParameterResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addDataFileParameterResponse::return_ = NULL;
+  this->ns1__addDataFileParameterResponse::return_ = nullptr;
 }
 
 void ns1__addDataFileParameterResponse::soap_serialize(
@@ -21770,13 +21975,13 @@ soap_in_ns1__addDataFileParameterResponse(struct soap *soap, const char *tag,
                                           ns1__addDataFileParameterResponse *a,
                                           const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addDataFileParameterResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addDataFileParameterResponse,
       sizeof(ns1__addDataFileParameterResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -21811,10 +22016,10 @@ soap_in_ns1__addDataFileParameterResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addDataFileParameterResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -21822,7 +22027,7 @@ soap_in_ns1__addDataFileParameterResponse(struct soap *soap, const char *tag,
         sizeof(ns1__addDataFileParameterResponse), 0,
         soap_copy_ns1__addDataFileParameterResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -21830,7 +22035,7 @@ soap_in_ns1__addDataFileParameterResponse(struct soap *soap, const char *tag,
 int ns1__addDataFileParameterResponse::soap_put(struct soap *soap,
                                                 const char *tag,
                                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addDataFileParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:addDataFileParameterResponse", id,
                      type))
@@ -21850,7 +22055,7 @@ soap_get_ns1__addDataFileParameterResponse(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__addDataFileParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -21866,11 +22071,11 @@ soap_instantiate_ns1__addDataFileParameterResponse(struct soap *soap, int n,
              fdebug,
              "soap_instantiate_ns1__addDataFileParameterResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__addDataFileParameterResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__addDataFileParameterResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addDataFileParameterResponse);
     if (size)
@@ -21910,9 +22115,9 @@ soap_copy_ns1__addDataFileParameterResponse(struct soap *soap, int st, int tt,
 void ns1__addDataFileParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addDataFileParameter::sessionId = NULL;
-  this->ns1__addDataFileParameter::dataFileParameter = NULL;
-  this->ns1__addDataFileParameter::datafileId = NULL;
+  this->ns1__addDataFileParameter::sessionId = nullptr;
+  this->ns1__addDataFileParameter::dataFileParameter = nullptr;
+  this->ns1__addDataFileParameter::datafileId = nullptr;
 }
 
 void ns1__addDataFileParameter::soap_serialize(struct soap *soap) const {
@@ -21968,13 +22173,13 @@ soap_in_ns1__addDataFileParameter(struct soap *soap, const char *tag,
                                   ns1__addDataFileParameter *a,
                                   const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addDataFileParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addDataFileParameter,
       sizeof(ns1__addDataFileParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addDataFileParameter) {
@@ -22025,10 +22230,10 @@ soap_in_ns1__addDataFileParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addDataFileParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -22036,14 +22241,14 @@ soap_in_ns1__addDataFileParameter(struct soap *soap, const char *tag,
         sizeof(ns1__addDataFileParameter), 0,
         soap_copy_ns1__addDataFileParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addDataFileParameter::soap_put(struct soap *soap, const char *tag,
                                         const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addDataFileParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:addDataFileParameter", id, type))
     return soap->error;
@@ -22061,7 +22266,7 @@ soap_get_ns1__addDataFileParameter(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in_ns1__addDataFileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -22076,10 +22281,11 @@ soap_instantiate_ns1__addDataFileParameter(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate_ns1__addDataFileParameter(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__addDataFileParameter, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__addDataFileParameter, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addDataFileParameter);
     if (size)
@@ -22165,13 +22371,13 @@ soap_in_ns1__searchDatasetsBySampleResponse(
     struct soap *soap, const char *tag, ns1__searchDatasetsBySampleResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetsBySampleResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchDatasetsBySampleResponse,
       sizeof(ns1__searchDatasetsBySampleResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -22203,10 +22409,10 @@ soap_in_ns1__searchDatasetsBySampleResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetsBySampleResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -22214,7 +22420,7 @@ soap_in_ns1__searchDatasetsBySampleResponse(
         sizeof(ns1__searchDatasetsBySampleResponse), 0,
         soap_copy_ns1__searchDatasetsBySampleResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -22222,7 +22428,7 @@ soap_in_ns1__searchDatasetsBySampleResponse(
 int ns1__searchDatasetsBySampleResponse::soap_put(struct soap *soap,
                                                   const char *tag,
                                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatasetsBySampleResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatasetsBySampleResponse", id,
                      type))
@@ -22242,7 +22448,7 @@ soap_get_ns1__searchDatasetsBySampleResponse(
     const char *type) {
   if ((p = soap_in_ns1__searchDatasetsBySampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -22259,11 +22465,11 @@ soap_instantiate_ns1__searchDatasetsBySampleResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__searchDatasetsBySampleResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatasetsBySampleResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatasetsBySampleResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetsBySampleResponse);
     if (size)
@@ -22303,8 +22509,8 @@ soap_copy_ns1__searchDatasetsBySampleResponse(struct soap *soap, int st, int tt,
 void ns1__searchDatasetsBySample::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatasetsBySample::sessionId = NULL;
-  this->ns1__searchDatasetsBySample::sample = NULL;
+  this->ns1__searchDatasetsBySample::sessionId = nullptr;
+  this->ns1__searchDatasetsBySample::sample = nullptr;
 }
 
 void ns1__searchDatasetsBySample::soap_serialize(struct soap *soap) const {
@@ -22354,13 +22560,13 @@ soap_in_ns1__searchDatasetsBySample(struct soap *soap, const char *tag,
                                     ns1__searchDatasetsBySample *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetsBySample *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchDatasetsBySample,
       sizeof(ns1__searchDatasetsBySample), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchDatasetsBySample) {
@@ -22402,10 +22608,10 @@ soap_in_ns1__searchDatasetsBySample(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetsBySample *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -22413,14 +22619,14 @@ soap_in_ns1__searchDatasetsBySample(struct soap *soap, const char *tag,
         sizeof(ns1__searchDatasetsBySample), 0,
         soap_copy_ns1__searchDatasetsBySample);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchDatasetsBySample::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatasetsBySample);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatasetsBySample", id, type))
     return soap->error;
@@ -22438,7 +22644,7 @@ soap_get_ns1__searchDatasetsBySample(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchDatasetsBySample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -22454,10 +22660,10 @@ soap_instantiate_ns1__searchDatasetsBySample(struct soap *soap, int n,
                    "soap_instantiate_ns1__searchDatasetsBySample(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatasetsBySample, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatasetsBySample, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetsBySample);
     if (size)
@@ -22495,7 +22701,7 @@ soap_copy_ns1__searchDatasetsBySample(struct soap *soap, int st, int tt,
 void ns1__createInvestigationResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__createInvestigationResponse::return_ = NULL;
+  this->ns1__createInvestigationResponse::return_ = nullptr;
 }
 
 void ns1__createInvestigationResponse::soap_serialize(struct soap *soap) const {
@@ -22541,13 +22747,13 @@ soap_in_ns1__createInvestigationResponse(struct soap *soap, const char *tag,
                                          ns1__createInvestigationResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__createInvestigationResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__createInvestigationResponse,
       sizeof(ns1__createInvestigationResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__createInvestigationResponse) {
@@ -22580,10 +22786,10 @@ soap_in_ns1__createInvestigationResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__createInvestigationResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -22591,7 +22797,7 @@ soap_in_ns1__createInvestigationResponse(struct soap *soap, const char *tag,
         sizeof(ns1__createInvestigationResponse), 0,
         soap_copy_ns1__createInvestigationResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -22599,7 +22805,7 @@ soap_in_ns1__createInvestigationResponse(struct soap *soap, const char *tag,
 int ns1__createInvestigationResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__createInvestigationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:createInvestigationResponse", id,
                      type))
@@ -22619,7 +22825,7 @@ soap_get_ns1__createInvestigationResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__createInvestigationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -22636,10 +22842,10 @@ soap_instantiate_ns1__createInvestigationResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__createInvestigationResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__createInvestigationResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__createInvestigationResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__createInvestigationResponse);
     if (size)
@@ -22679,8 +22885,8 @@ soap_copy_ns1__createInvestigationResponse(struct soap *soap, int st, int tt,
 void ns1__createInvestigation::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__createInvestigation::sessionId = NULL;
-  this->ns1__createInvestigation::ns1__investigation_ = NULL;
+  this->ns1__createInvestigation::sessionId = nullptr;
+  this->ns1__createInvestigation::ns1__investigation_ = nullptr;
 }
 
 void ns1__createInvestigation::soap_serialize(struct soap *soap) const {
@@ -22729,13 +22935,13 @@ soap_in_ns1__createInvestigation(struct soap *soap, const char *tag,
                                  ns1__createInvestigation *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__createInvestigation *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__createInvestigation,
       sizeof(ns1__createInvestigation), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__createInvestigation) {
@@ -22778,10 +22984,10 @@ soap_in_ns1__createInvestigation(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__createInvestigation *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -22789,14 +22995,14 @@ soap_in_ns1__createInvestigation(struct soap *soap, const char *tag,
         sizeof(ns1__createInvestigation), 0,
         soap_copy_ns1__createInvestigation);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__createInvestigation::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__createInvestigation);
   if (this->soap_out(soap, tag ? tag : "ns1:createInvestigation", id, type))
     return soap->error;
@@ -22814,7 +23020,7 @@ soap_get_ns1__createInvestigation(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__createInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -22828,10 +23034,11 @@ soap_instantiate_ns1__createInvestigation(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__createInvestigation(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__createInvestigation, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__createInvestigation, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__createInvestigation);
     if (size)
@@ -22868,7 +23075,7 @@ soap_copy_ns1__createInvestigation(struct soap *soap, int st, int tt, void *p,
 void ns1__addPublicationResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addPublicationResponse::return_ = NULL;
+  this->ns1__addPublicationResponse::return_ = nullptr;
 }
 
 void ns1__addPublicationResponse::soap_serialize(struct soap *soap) const {
@@ -22912,13 +23119,13 @@ soap_in_ns1__addPublicationResponse(struct soap *soap, const char *tag,
                                     ns1__addPublicationResponse *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addPublicationResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addPublicationResponse,
       sizeof(ns1__addPublicationResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addPublicationResponse) {
@@ -22951,10 +23158,10 @@ soap_in_ns1__addPublicationResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addPublicationResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -22962,14 +23169,14 @@ soap_in_ns1__addPublicationResponse(struct soap *soap, const char *tag,
         sizeof(ns1__addPublicationResponse), 0,
         soap_copy_ns1__addPublicationResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addPublicationResponse::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addPublicationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:addPublicationResponse", id, type))
     return soap->error;
@@ -22987,7 +23194,7 @@ soap_get_ns1__addPublicationResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__addPublicationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -23003,10 +23210,10 @@ soap_instantiate_ns1__addPublicationResponse(struct soap *soap, int n,
                    "soap_instantiate_ns1__addPublicationResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__addPublicationResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__addPublicationResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addPublicationResponse);
     if (size)
@@ -23044,9 +23251,9 @@ soap_copy_ns1__addPublicationResponse(struct soap *soap, int st, int tt,
 void ns1__addPublication::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addPublication::sessionId = NULL;
-  this->ns1__addPublication::publication = NULL;
-  this->ns1__addPublication::investigationId = NULL;
+  this->ns1__addPublication::sessionId = nullptr;
+  this->ns1__addPublication::publication = nullptr;
+  this->ns1__addPublication::investigationId = nullptr;
 }
 
 void ns1__addPublication::soap_serialize(struct soap *soap) const {
@@ -23097,13 +23304,13 @@ SOAP_FMAC3 ns1__addPublication *SOAP_FMAC4
 soap_in_ns1__addPublication(struct soap *soap, const char *tag,
                             ns1__addPublication *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addPublication *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addPublication,
       sizeof(ns1__addPublication), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addPublication) {
@@ -23153,23 +23360,23 @@ soap_in_ns1__addPublication(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addPublication *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__addPublication, 0,
         sizeof(ns1__addPublication), 0, soap_copy_ns1__addPublication);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addPublication::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addPublication);
   if (this->soap_out(soap, tag ? tag : "ns1:addPublication", id, type))
     return soap->error;
@@ -23186,7 +23393,7 @@ soap_get_ns1__addPublication(struct soap *soap, ns1__addPublication *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__addPublication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -23199,9 +23406,9 @@ soap_instantiate_ns1__addPublication(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__addPublication(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__addPublication, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__addPublication, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addPublication);
     if (size)
@@ -23272,15 +23479,15 @@ soap_in_ns1__deleteDataFileParameterResponse(
     struct soap *soap, const char *tag, ns1__deleteDataFileParameterResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__deleteDataFileParameterResponse *)soap_class_id_enter(
             soap, soap->id, a,
             SOAP_TYPE_ICat3_ns1__deleteDataFileParameterResponse,
             sizeof(ns1__deleteDataFileParameterResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -23292,14 +23499,14 @@ soap_in_ns1__deleteDataFileParameterResponse(
                                                                 type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__deleteDataFileParameterResponse::soap_put(struct soap *soap,
                                                    const char *tag,
                                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteDataFileParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteDataFileParameterResponse",
                      id, type))
@@ -23319,7 +23526,7 @@ soap_get_ns1__deleteDataFileParameterResponse(
     const char *type) {
   if ((p = soap_in_ns1__deleteDataFileParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -23337,10 +23544,10 @@ soap_instantiate_ns1__deleteDataFileParameterResponse(struct soap *soap, int n,
           "soap_instantiate_ns1__deleteDataFileParameterResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__deleteDataFileParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteDataFileParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteDataFileParameterResponse);
     if (size)
@@ -23380,8 +23587,8 @@ soap_copy_ns1__deleteDataFileParameterResponse(struct soap *soap, int st,
 void ns1__deleteDataFileParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__deleteDataFileParameter::sessionId = NULL;
-  this->ns1__deleteDataFileParameter::datafileParameterPK = NULL;
+  this->ns1__deleteDataFileParameter::sessionId = nullptr;
+  this->ns1__deleteDataFileParameter::datafileParameterPK = nullptr;
 }
 
 void ns1__deleteDataFileParameter::soap_serialize(struct soap *soap) const {
@@ -23433,13 +23640,13 @@ soap_in_ns1__deleteDataFileParameter(struct soap *soap, const char *tag,
                                      ns1__deleteDataFileParameter *a,
                                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__deleteDataFileParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteDataFileParameter,
       sizeof(ns1__deleteDataFileParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__deleteDataFileParameter) {
@@ -23482,10 +23689,10 @@ soap_in_ns1__deleteDataFileParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__deleteDataFileParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -23493,14 +23700,14 @@ soap_in_ns1__deleteDataFileParameter(struct soap *soap, const char *tag,
         sizeof(ns1__deleteDataFileParameter), 0,
         soap_copy_ns1__deleteDataFileParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__deleteDataFileParameter::soap_put(struct soap *soap, const char *tag,
                                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteDataFileParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteDataFileParameter", id, type))
     return soap->error;
@@ -23518,7 +23725,7 @@ soap_get_ns1__deleteDataFileParameter(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteDataFileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -23535,10 +23742,10 @@ soap_instantiate_ns1__deleteDataFileParameter(struct soap *soap, int n,
              "soap_instantiate_ns1__deleteDataFileParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__deleteDataFileParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteDataFileParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteDataFileParameter);
     if (size)
@@ -23576,7 +23783,7 @@ soap_copy_ns1__deleteDataFileParameter(struct soap *soap, int st, int tt,
 void ns1__getInvestigationResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getInvestigationResponse::return_ = NULL;
+  this->ns1__getInvestigationResponse::return_ = nullptr;
 }
 
 void ns1__getInvestigationResponse::soap_serialize(struct soap *soap) const {
@@ -23621,13 +23828,13 @@ soap_in_ns1__getInvestigationResponse(struct soap *soap, const char *tag,
                                       ns1__getInvestigationResponse *a,
                                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getInvestigationResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getInvestigationResponse,
       sizeof(ns1__getInvestigationResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getInvestigationResponse) {
@@ -23660,10 +23867,10 @@ soap_in_ns1__getInvestigationResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getInvestigationResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -23671,14 +23878,14 @@ soap_in_ns1__getInvestigationResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getInvestigationResponse), 0,
         soap_copy_ns1__getInvestigationResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getInvestigationResponse::soap_put(struct soap *soap, const char *tag,
                                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getInvestigationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getInvestigationResponse", id,
                      type))
@@ -23698,7 +23905,7 @@ soap_get_ns1__getInvestigationResponse(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_ns1__getInvestigationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -23715,10 +23922,10 @@ soap_instantiate_ns1__getInvestigationResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__getInvestigationResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getInvestigationResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getInvestigationResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getInvestigationResponse);
     if (size)
@@ -23756,8 +23963,8 @@ soap_copy_ns1__getInvestigationResponse(struct soap *soap, int st, int tt,
 void ns1__getInvestigation::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getInvestigation::sessionId = NULL;
-  this->ns1__getInvestigation::investigationId = NULL;
+  this->ns1__getInvestigation::sessionId = nullptr;
+  this->ns1__getInvestigation::investigationId = nullptr;
 }
 
 void ns1__getInvestigation::soap_serialize(struct soap *soap) const {
@@ -23805,13 +24012,13 @@ SOAP_FMAC3 ns1__getInvestigation *SOAP_FMAC4
 soap_in_ns1__getInvestigation(struct soap *soap, const char *tag,
                               ns1__getInvestigation *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getInvestigation *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getInvestigation,
       sizeof(ns1__getInvestigation), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getInvestigation) {
@@ -23853,23 +24060,23 @@ soap_in_ns1__getInvestigation(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getInvestigation *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__getInvestigation,
         0, sizeof(ns1__getInvestigation), 0, soap_copy_ns1__getInvestigation);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getInvestigation::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getInvestigation);
   if (this->soap_out(soap, tag ? tag : "ns1:getInvestigation", id, type))
     return soap->error;
@@ -23886,7 +24093,7 @@ soap_get_ns1__getInvestigation(struct soap *soap, ns1__getInvestigation *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns1__getInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -23901,9 +24108,9 @@ soap_instantiate_ns1__getInvestigation(struct soap *soap, int n,
                       "soap_instantiate_ns1__getInvestigation(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getInvestigation, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getInvestigation, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getInvestigation);
     if (size)
@@ -23939,7 +24146,7 @@ soap_copy_ns1__getInvestigation(struct soap *soap, int st, int tt, void *p,
 void ns1__getInvestigationIncludesResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getInvestigationIncludesResponse::return_ = NULL;
+  this->ns1__getInvestigationIncludesResponse::return_ = nullptr;
 }
 
 void ns1__getInvestigationIncludesResponse::soap_serialize(
@@ -23987,14 +24194,14 @@ soap_in_ns1__getInvestigationIncludesResponse(
     struct soap *soap, const char *tag,
     ns1__getInvestigationIncludesResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getInvestigationIncludesResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getInvestigationIncludesResponse,
       sizeof(ns1__getInvestigationIncludesResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -24030,10 +24237,10 @@ soap_in_ns1__getInvestigationIncludesResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getInvestigationIncludesResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -24041,7 +24248,7 @@ soap_in_ns1__getInvestigationIncludesResponse(
         sizeof(ns1__getInvestigationIncludesResponse), 0,
         soap_copy_ns1__getInvestigationIncludesResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -24049,7 +24256,7 @@ soap_in_ns1__getInvestigationIncludesResponse(
 int ns1__getInvestigationIncludesResponse::soap_put(struct soap *soap,
                                                     const char *tag,
                                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getInvestigationIncludesResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getInvestigationIncludesResponse",
                      id, type))
@@ -24069,7 +24276,7 @@ soap_get_ns1__getInvestigationIncludesResponse(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__getInvestigationIncludesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -24085,10 +24292,10 @@ soap_instantiate_ns1__getInvestigationIncludesResponse(struct soap *soap, int n,
                               "getInvestigationIncludesResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getInvestigationIncludesResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getInvestigationIncludesResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getInvestigationIncludesResponse);
     if (size)
@@ -24128,9 +24335,9 @@ soap_copy_ns1__getInvestigationIncludesResponse(struct soap *soap, int st,
 void ns1__getInvestigationIncludes::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getInvestigationIncludes::sessionId = NULL;
-  this->ns1__getInvestigationIncludes::investigationId = NULL;
-  this->ns1__getInvestigationIncludes::investigationInclude = NULL;
+  this->ns1__getInvestigationIncludes::sessionId = nullptr;
+  this->ns1__getInvestigationIncludes::investigationId = nullptr;
+  this->ns1__getInvestigationIncludes::investigationInclude = nullptr;
 }
 
 void ns1__getInvestigationIncludes::soap_serialize(struct soap *soap) const {
@@ -24188,13 +24395,13 @@ soap_in_ns1__getInvestigationIncludes(struct soap *soap, const char *tag,
                                       ns1__getInvestigationIncludes *a,
                                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getInvestigationIncludes *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getInvestigationIncludes,
       sizeof(ns1__getInvestigationIncludes), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getInvestigationIncludes) {
@@ -24246,10 +24453,10 @@ soap_in_ns1__getInvestigationIncludes(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getInvestigationIncludes *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -24257,14 +24464,14 @@ soap_in_ns1__getInvestigationIncludes(struct soap *soap, const char *tag,
         sizeof(ns1__getInvestigationIncludes), 0,
         soap_copy_ns1__getInvestigationIncludes);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getInvestigationIncludes::soap_put(struct soap *soap, const char *tag,
                                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getInvestigationIncludes);
   if (this->soap_out(soap, tag ? tag : "ns1:getInvestigationIncludes", id,
                      type))
@@ -24284,7 +24491,7 @@ soap_get_ns1__getInvestigationIncludes(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_ns1__getInvestigationIncludes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -24301,10 +24508,10 @@ soap_instantiate_ns1__getInvestigationIncludes(struct soap *soap, int n,
              "soap_instantiate_ns1__getInvestigationIncludes(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getInvestigationIncludes, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getInvestigationIncludes, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getInvestigationIncludes);
     if (size)
@@ -24374,14 +24581,14 @@ soap_in_ns1__modifyDataFileResponse(struct soap *soap, const char *tag,
                                     ns1__modifyDataFileResponse *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__modifyDataFileResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifyDataFileResponse,
             sizeof(ns1__modifyDataFileResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -24391,13 +24598,13 @@ soap_in_ns1__modifyDataFileResponse(struct soap *soap, const char *tag,
       return (ns1__modifyDataFileResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__modifyDataFileResponse::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifyDataFileResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:modifyDataFileResponse", id, type))
     return soap->error;
@@ -24415,7 +24622,7 @@ soap_get_ns1__modifyDataFileResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__modifyDataFileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -24431,10 +24638,10 @@ soap_instantiate_ns1__modifyDataFileResponse(struct soap *soap, int n,
                    "soap_instantiate_ns1__modifyDataFileResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__modifyDataFileResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__modifyDataFileResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifyDataFileResponse);
     if (size)
@@ -24472,8 +24679,8 @@ soap_copy_ns1__modifyDataFileResponse(struct soap *soap, int st, int tt,
 void ns1__modifyDataFile::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__modifyDataFile::sessionId = NULL;
-  this->ns1__modifyDataFile::dataFile = NULL;
+  this->ns1__modifyDataFile::sessionId = nullptr;
+  this->ns1__modifyDataFile::dataFile = nullptr;
 }
 
 void ns1__modifyDataFile::soap_serialize(struct soap *soap) const {
@@ -24519,13 +24726,13 @@ SOAP_FMAC3 ns1__modifyDataFile *SOAP_FMAC4
 soap_in_ns1__modifyDataFile(struct soap *soap, const char *tag,
                             ns1__modifyDataFile *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__modifyDataFile *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifyDataFile,
       sizeof(ns1__modifyDataFile), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__modifyDataFile) {
@@ -24567,23 +24774,23 @@ soap_in_ns1__modifyDataFile(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__modifyDataFile *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__modifyDataFile, 0,
         sizeof(ns1__modifyDataFile), 0, soap_copy_ns1__modifyDataFile);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__modifyDataFile::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifyDataFile);
   if (this->soap_out(soap, tag ? tag : "ns1:modifyDataFile", id, type))
     return soap->error;
@@ -24600,7 +24807,7 @@ soap_get_ns1__modifyDataFile(struct soap *soap, ns1__modifyDataFile *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__modifyDataFile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -24613,9 +24820,9 @@ soap_instantiate_ns1__modifyDataFile(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__modifyDataFile(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__modifyDataFile, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__modifyDataFile, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifyDataFile);
     if (size)
@@ -24651,7 +24858,7 @@ soap_copy_ns1__modifyDataFile(struct soap *soap, int st, int tt, void *p,
 void ns1__getDatafileResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getDatafileResponse::return_ = NULL;
+  this->ns1__getDatafileResponse::return_ = nullptr;
 }
 
 void ns1__getDatafileResponse::soap_serialize(struct soap *soap) const {
@@ -24694,13 +24901,13 @@ soap_in_ns1__getDatafileResponse(struct soap *soap, const char *tag,
                                  ns1__getDatafileResponse *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getDatafileResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getDatafileResponse,
       sizeof(ns1__getDatafileResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getDatafileResponse) {
@@ -24733,10 +24940,10 @@ soap_in_ns1__getDatafileResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getDatafileResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -24744,14 +24951,14 @@ soap_in_ns1__getDatafileResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getDatafileResponse), 0,
         soap_copy_ns1__getDatafileResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getDatafileResponse::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getDatafileResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getDatafileResponse", id, type))
     return soap->error;
@@ -24769,7 +24976,7 @@ soap_get_ns1__getDatafileResponse(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__getDatafileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -24783,10 +24990,11 @@ soap_instantiate_ns1__getDatafileResponse(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__getDatafileResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getDatafileResponse, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getDatafileResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getDatafileResponse);
     if (size)
@@ -24823,8 +25031,8 @@ soap_copy_ns1__getDatafileResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__getDatafile::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getDatafile::sessionId = NULL;
-  this->ns1__getDatafile::datafileId = NULL;
+  this->ns1__getDatafile::sessionId = nullptr;
+  this->ns1__getDatafile::datafileId = nullptr;
 }
 
 void ns1__getDatafile::soap_serialize(struct soap *soap) const {
@@ -24868,13 +25076,13 @@ SOAP_FMAC3 ns1__getDatafile *SOAP_FMAC4
 soap_in_ns1__getDatafile(struct soap *soap, const char *tag,
                          ns1__getDatafile *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getDatafile *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getDatafile,
       sizeof(ns1__getDatafile), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getDatafile) {
@@ -24916,23 +25124,23 @@ soap_in_ns1__getDatafile(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getDatafile *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__getDatafile, 0,
         sizeof(ns1__getDatafile), 0, soap_copy_ns1__getDatafile);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getDatafile::soap_put(struct soap *soap, const char *tag,
                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getDatafile);
   if (this->soap_out(soap, tag ? tag : "ns1:getDatafile", id, type))
     return soap->error;
@@ -24949,7 +25157,7 @@ soap_get_ns1__getDatafile(struct soap *soap, ns1__getDatafile *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__getDatafile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -24961,10 +25169,10 @@ soap_instantiate_ns1__getDatafile(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__getDatafile(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getDatafile, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getDatafile, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getDatafile);
     if (size)
@@ -25000,9 +25208,9 @@ soap_copy_ns1__getDatafile(struct soap *soap, int st, int tt, void *p,
 void ns1__ICATAPIException::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__ICATAPIException::message = NULL;
-  this->ns1__ICATAPIException::stackTraceAsString = NULL;
-  this->ns1__ICATAPIException::uniqueId = NULL;
+  this->ns1__ICATAPIException::message = nullptr;
+  this->ns1__ICATAPIException::stackTraceAsString = nullptr;
+  this->ns1__ICATAPIException::uniqueId = nullptr;
 }
 
 void ns1__ICATAPIException::soap_serialize(struct soap *soap) const {
@@ -25055,13 +25263,13 @@ SOAP_FMAC3 ns1__ICATAPIException *SOAP_FMAC4
 soap_in_ns1__ICATAPIException(struct soap *soap, const char *tag,
                               ns1__ICATAPIException *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__ICATAPIException *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__ICATAPIException,
       sizeof(ns1__ICATAPIException), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__ICATAPIException) {
@@ -25114,23 +25322,23 @@ soap_in_ns1__ICATAPIException(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__ICATAPIException *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__ICATAPIException,
         0, sizeof(ns1__ICATAPIException), 0, soap_copy_ns1__ICATAPIException);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__ICATAPIException::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__ICATAPIException);
   if (this->soap_out(soap, tag ? tag : "ns1:ICATAPIException", id, type))
     return soap->error;
@@ -25147,7 +25355,7 @@ soap_get_ns1__ICATAPIException(struct soap *soap, ns1__ICATAPIException *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns1__ICATAPIException(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -25162,9 +25370,9 @@ soap_instantiate_ns1__ICATAPIException(struct soap *soap, int n,
                       "soap_instantiate_ns1__ICATAPIException(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__ICATAPIException, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__ICATAPIException, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__ICATAPIException);
     if (size)
@@ -25245,13 +25453,13 @@ soap_in_ns1__ingestMetadataResponse(struct soap *soap, const char *tag,
                                     ns1__ingestMetadataResponse *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__ingestMetadataResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__ingestMetadataResponse,
       sizeof(ns1__ingestMetadataResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__ingestMetadataResponse) {
@@ -25281,10 +25489,10 @@ soap_in_ns1__ingestMetadataResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__ingestMetadataResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -25292,14 +25500,14 @@ soap_in_ns1__ingestMetadataResponse(struct soap *soap, const char *tag,
         sizeof(ns1__ingestMetadataResponse), 0,
         soap_copy_ns1__ingestMetadataResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__ingestMetadataResponse::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__ingestMetadataResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:ingestMetadataResponse", id, type))
     return soap->error;
@@ -25317,7 +25525,7 @@ soap_get_ns1__ingestMetadataResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__ingestMetadataResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -25333,10 +25541,10 @@ soap_instantiate_ns1__ingestMetadataResponse(struct soap *soap, int n,
                    "soap_instantiate_ns1__ingestMetadataResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__ingestMetadataResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__ingestMetadataResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__ingestMetadataResponse);
     if (size)
@@ -25374,8 +25582,8 @@ soap_copy_ns1__ingestMetadataResponse(struct soap *soap, int st, int tt,
 void ns1__ingestMetadata::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__ingestMetadata::sessionId = NULL;
-  this->ns1__ingestMetadata::xml = NULL;
+  this->ns1__ingestMetadata::sessionId = nullptr;
+  this->ns1__ingestMetadata::xml = nullptr;
 }
 
 void ns1__ingestMetadata::soap_serialize(struct soap *soap) const {
@@ -25420,13 +25628,13 @@ SOAP_FMAC3 ns1__ingestMetadata *SOAP_FMAC4
 soap_in_ns1__ingestMetadata(struct soap *soap, const char *tag,
                             ns1__ingestMetadata *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__ingestMetadata *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__ingestMetadata,
       sizeof(ns1__ingestMetadata), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__ingestMetadata) {
@@ -25468,23 +25676,23 @@ soap_in_ns1__ingestMetadata(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__ingestMetadata *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__ingestMetadata, 0,
         sizeof(ns1__ingestMetadata), 0, soap_copy_ns1__ingestMetadata);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__ingestMetadata::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__ingestMetadata);
   if (this->soap_out(soap, tag ? tag : "ns1:ingestMetadata", id, type))
     return soap->error;
@@ -25501,7 +25709,7 @@ soap_get_ns1__ingestMetadata(struct soap *soap, ns1__ingestMetadata *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__ingestMetadata(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -25514,9 +25722,9 @@ soap_instantiate_ns1__ingestMetadata(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__ingestMetadata(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__ingestMetadata, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__ingestMetadata, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__ingestMetadata);
     if (size)
@@ -25602,15 +25810,15 @@ soap_in_ns1__searchDatasetByRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByRestrictionResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByRestrictionResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionResponse,
       sizeof(ns1__searchDatasetByRestrictionResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -25643,10 +25851,10 @@ soap_in_ns1__searchDatasetByRestrictionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByRestrictionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -25654,7 +25862,7 @@ soap_in_ns1__searchDatasetByRestrictionResponse(
         sizeof(ns1__searchDatasetByRestrictionResponse), 0,
         soap_copy_ns1__searchDatasetByRestrictionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -25662,7 +25870,7 @@ soap_in_ns1__searchDatasetByRestrictionResponse(
 int ns1__searchDatasetByRestrictionResponse::soap_put(struct soap *soap,
                                                       const char *tag,
                                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatasetByRestrictionResponse",
                      id, type))
@@ -25683,7 +25891,7 @@ soap_get_ns1__searchDatasetByRestrictionResponse(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchDatasetByRestrictionResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -25700,10 +25908,10 @@ soap_instantiate_ns1__searchDatasetByRestrictionResponse(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetByRestrictionResponse);
     if (size)
@@ -25744,8 +25952,8 @@ soap_copy_ns1__searchDatasetByRestrictionResponse(struct soap *soap, int st,
 void ns1__searchDatasetByRestriction::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatasetByRestriction::sessionId = NULL;
-  this->ns1__searchDatasetByRestriction::restriction = NULL;
+  this->ns1__searchDatasetByRestriction::sessionId = nullptr;
+  this->ns1__searchDatasetByRestriction::restriction = nullptr;
 }
 
 void ns1__searchDatasetByRestriction::soap_serialize(struct soap *soap) const {
@@ -25797,13 +26005,13 @@ soap_in_ns1__searchDatasetByRestriction(struct soap *soap, const char *tag,
                                         ns1__searchDatasetByRestriction *a,
                                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByRestriction *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchDatasetByRestriction,
       sizeof(ns1__searchDatasetByRestriction), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchDatasetByRestriction) {
@@ -25847,10 +26055,10 @@ soap_in_ns1__searchDatasetByRestriction(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByRestriction *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -25858,7 +26066,7 @@ soap_in_ns1__searchDatasetByRestriction(struct soap *soap, const char *tag,
         sizeof(ns1__searchDatasetByRestriction), 0,
         soap_copy_ns1__searchDatasetByRestriction);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -25866,7 +26074,7 @@ soap_in_ns1__searchDatasetByRestriction(struct soap *soap, const char *tag,
 int ns1__searchDatasetByRestriction::soap_put(struct soap *soap,
                                               const char *tag,
                                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatasetByRestriction);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatasetByRestriction", id,
                      type))
@@ -25886,7 +26094,7 @@ soap_get_ns1__searchDatasetByRestriction(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchDatasetByRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -25903,10 +26111,10 @@ soap_instantiate_ns1__searchDatasetByRestriction(struct soap *soap, int n,
              "soap_instantiate_ns1__searchDatasetByRestriction(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatasetByRestriction, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatasetByRestriction,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetByRestriction);
     if (size)
@@ -25987,13 +26195,13 @@ SOAP_FMAC3 ns1__listRolesResponse *SOAP_FMAC4
 soap_in_ns1__listRolesResponse(struct soap *soap, const char *tag,
                                ns1__listRolesResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listRolesResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listRolesResponse,
       sizeof(ns1__listRolesResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listRolesResponse) {
@@ -26023,23 +26231,23 @@ soap_in_ns1__listRolesResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listRolesResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__listRolesResponse,
         0, sizeof(ns1__listRolesResponse), 0, soap_copy_ns1__listRolesResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__listRolesResponse::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listRolesResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:listRolesResponse", id, type))
     return soap->error;
@@ -26056,7 +26264,7 @@ soap_get_ns1__listRolesResponse(struct soap *soap, ns1__listRolesResponse *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__listRolesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -26071,9 +26279,9 @@ soap_instantiate_ns1__listRolesResponse(struct soap *soap, int n,
                       "soap_instantiate_ns1__listRolesResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__listRolesResponse, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__listRolesResponse, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listRolesResponse);
     if (size)
@@ -26109,7 +26317,7 @@ soap_copy_ns1__listRolesResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__listRoles::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__listRoles::sessionId = NULL;
+  this->ns1__listRoles::sessionId = nullptr;
 }
 
 void ns1__listRoles::soap_serialize(struct soap *soap) const {
@@ -26149,13 +26357,13 @@ SOAP_FMAC3 ns1__listRoles *SOAP_FMAC4
 soap_in_ns1__listRoles(struct soap *soap, const char *tag, ns1__listRoles *a,
                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listRoles *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listRoles, sizeof(ns1__listRoles),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listRoles) {
@@ -26189,23 +26397,23 @@ soap_in_ns1__listRoles(struct soap *soap, const char *tag, ns1__listRoles *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listRoles *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__listRoles, 0,
         sizeof(ns1__listRoles), 0, soap_copy_ns1__listRoles);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__listRoles::soap_put(struct soap *soap, const char *tag,
                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listRoles);
   if (this->soap_out(soap, tag ? tag : "ns1:listRoles", id, type))
     return soap->error;
@@ -26222,7 +26430,7 @@ soap_get_ns1__listRoles(struct soap *soap, ns1__listRoles *p, const char *tag,
                         const char *type) {
   if ((p = soap_in_ns1__listRoles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -26234,10 +26442,10 @@ soap_instantiate_ns1__listRoles(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__listRoles(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__listRoles, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__listRoles, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listRoles);
     if (size)
@@ -26305,14 +26513,14 @@ soap_in_ns1__updateAuthorisationResponse(struct soap *soap, const char *tag,
                                          ns1__updateAuthorisationResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__updateAuthorisationResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__updateAuthorisationResponse,
             sizeof(ns1__updateAuthorisationResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -26322,14 +26530,14 @@ soap_in_ns1__updateAuthorisationResponse(struct soap *soap, const char *tag,
       return (ns1__updateAuthorisationResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__updateAuthorisationResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__updateAuthorisationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:updateAuthorisationResponse", id,
                      type))
@@ -26349,7 +26557,7 @@ soap_get_ns1__updateAuthorisationResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__updateAuthorisationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -26366,10 +26574,10 @@ soap_instantiate_ns1__updateAuthorisationResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__updateAuthorisationResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__updateAuthorisationResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__updateAuthorisationResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__updateAuthorisationResponse);
     if (size)
@@ -26409,9 +26617,9 @@ soap_copy_ns1__updateAuthorisationResponse(struct soap *soap, int st, int tt,
 void ns1__updateAuthorisation::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__updateAuthorisation::sessionId = NULL;
-  this->ns1__updateAuthorisation::toChangetoRole = NULL;
-  this->ns1__updateAuthorisation::authorisationId = NULL;
+  this->ns1__updateAuthorisation::sessionId = nullptr;
+  this->ns1__updateAuthorisation::toChangetoRole = nullptr;
+  this->ns1__updateAuthorisation::authorisationId = nullptr;
 }
 
 void ns1__updateAuthorisation::soap_serialize(struct soap *soap) const {
@@ -26466,13 +26674,13 @@ soap_in_ns1__updateAuthorisation(struct soap *soap, const char *tag,
                                  ns1__updateAuthorisation *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__updateAuthorisation *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__updateAuthorisation,
       sizeof(ns1__updateAuthorisation), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__updateAuthorisation) {
@@ -26523,10 +26731,10 @@ soap_in_ns1__updateAuthorisation(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__updateAuthorisation *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -26534,14 +26742,14 @@ soap_in_ns1__updateAuthorisation(struct soap *soap, const char *tag,
         sizeof(ns1__updateAuthorisation), 0,
         soap_copy_ns1__updateAuthorisation);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__updateAuthorisation::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__updateAuthorisation);
   if (this->soap_out(soap, tag ? tag : "ns1:updateAuthorisation", id, type))
     return soap->error;
@@ -26559,7 +26767,7 @@ soap_get_ns1__updateAuthorisation(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__updateAuthorisation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -26573,10 +26781,11 @@ soap_instantiate_ns1__updateAuthorisation(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__updateAuthorisation(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__updateAuthorisation, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__updateAuthorisation, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__updateAuthorisation);
     if (size)
@@ -26613,7 +26822,7 @@ soap_copy_ns1__updateAuthorisation(struct soap *soap, int st, int tt, void *p,
 void ns1__getDatasetIncludesResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getDatasetIncludesResponse::return_ = NULL;
+  this->ns1__getDatasetIncludesResponse::return_ = nullptr;
 }
 
 void ns1__getDatasetIncludesResponse::soap_serialize(struct soap *soap) const {
@@ -26659,13 +26868,13 @@ soap_in_ns1__getDatasetIncludesResponse(struct soap *soap, const char *tag,
                                         ns1__getDatasetIncludesResponse *a,
                                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getDatasetIncludesResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getDatasetIncludesResponse,
       sizeof(ns1__getDatasetIncludesResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getDatasetIncludesResponse) {
@@ -26698,10 +26907,10 @@ soap_in_ns1__getDatasetIncludesResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getDatasetIncludesResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -26709,7 +26918,7 @@ soap_in_ns1__getDatasetIncludesResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getDatasetIncludesResponse), 0,
         soap_copy_ns1__getDatasetIncludesResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -26717,7 +26926,7 @@ soap_in_ns1__getDatasetIncludesResponse(struct soap *soap, const char *tag,
 int ns1__getDatasetIncludesResponse::soap_put(struct soap *soap,
                                               const char *tag,
                                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getDatasetIncludesResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getDatasetIncludesResponse", id,
                      type))
@@ -26737,7 +26946,7 @@ soap_get_ns1__getDatasetIncludesResponse(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_ns1__getDatasetIncludesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -26754,10 +26963,10 @@ soap_instantiate_ns1__getDatasetIncludesResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__getDatasetIncludesResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getDatasetIncludesResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getDatasetIncludesResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getDatasetIncludesResponse);
     if (size)
@@ -26795,9 +27004,9 @@ soap_copy_ns1__getDatasetIncludesResponse(struct soap *soap, int st, int tt,
 void ns1__getDatasetIncludes::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getDatasetIncludes::sessionId = NULL;
-  this->ns1__getDatasetIncludes::datasetId = NULL;
-  this->ns1__getDatasetIncludes::datasetInclude = NULL;
+  this->ns1__getDatasetIncludes::sessionId = nullptr;
+  this->ns1__getDatasetIncludes::datasetId = nullptr;
+  this->ns1__getDatasetIncludes::datasetInclude = nullptr;
 }
 
 void ns1__getDatasetIncludes::soap_serialize(struct soap *soap) const {
@@ -26850,13 +27059,13 @@ SOAP_FMAC3 ns1__getDatasetIncludes *SOAP_FMAC4
 soap_in_ns1__getDatasetIncludes(struct soap *soap, const char *tag,
                                 ns1__getDatasetIncludes *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getDatasetIncludes *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getDatasetIncludes,
       sizeof(ns1__getDatasetIncludes), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getDatasetIncludes) {
@@ -26907,24 +27116,24 @@ soap_in_ns1__getDatasetIncludes(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getDatasetIncludes *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__getDatasetIncludes,
         0, sizeof(ns1__getDatasetIncludes), 0,
         soap_copy_ns1__getDatasetIncludes);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getDatasetIncludes::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getDatasetIncludes);
   if (this->soap_out(soap, tag ? tag : "ns1:getDatasetIncludes", id, type))
     return soap->error;
@@ -26941,7 +27150,7 @@ soap_get_ns1__getDatasetIncludes(struct soap *soap, ns1__getDatasetIncludes *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__getDatasetIncludes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -26956,9 +27165,9 @@ soap_instantiate_ns1__getDatasetIncludes(struct soap *soap, int n,
                       "soap_instantiate_ns1__getDatasetIncludes(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getDatasetIncludes, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getDatasetIncludes, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getDatasetIncludes);
     if (size)
@@ -26994,7 +27203,7 @@ soap_copy_ns1__getDatasetIncludes(struct soap *soap, int st, int tt, void *p,
 void ns1__getDatasetResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getDatasetResponse::return_ = NULL;
+  this->ns1__getDatasetResponse::return_ = nullptr;
 }
 
 void ns1__getDatasetResponse::soap_serialize(struct soap *soap) const {
@@ -27036,13 +27245,13 @@ SOAP_FMAC3 ns1__getDatasetResponse *SOAP_FMAC4
 soap_in_ns1__getDatasetResponse(struct soap *soap, const char *tag,
                                 ns1__getDatasetResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getDatasetResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getDatasetResponse,
       sizeof(ns1__getDatasetResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getDatasetResponse) {
@@ -27075,24 +27284,24 @@ soap_in_ns1__getDatasetResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getDatasetResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__getDatasetResponse,
         0, sizeof(ns1__getDatasetResponse), 0,
         soap_copy_ns1__getDatasetResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getDatasetResponse::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getDatasetResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getDatasetResponse", id, type))
     return soap->error;
@@ -27109,7 +27318,7 @@ soap_get_ns1__getDatasetResponse(struct soap *soap, ns1__getDatasetResponse *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__getDatasetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -27124,9 +27333,9 @@ soap_instantiate_ns1__getDatasetResponse(struct soap *soap, int n,
                       "soap_instantiate_ns1__getDatasetResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getDatasetResponse, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getDatasetResponse, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getDatasetResponse);
     if (size)
@@ -27162,8 +27371,8 @@ soap_copy_ns1__getDatasetResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__getDataset::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getDataset::sessionId = NULL;
-  this->ns1__getDataset::datasetId = NULL;
+  this->ns1__getDataset::sessionId = nullptr;
+  this->ns1__getDataset::datasetId = nullptr;
 }
 
 void ns1__getDataset::soap_serialize(struct soap *soap) const {
@@ -27207,13 +27416,13 @@ SOAP_FMAC3 ns1__getDataset *SOAP_FMAC4
 soap_in_ns1__getDataset(struct soap *soap, const char *tag, ns1__getDataset *a,
                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getDataset *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getDataset,
       sizeof(ns1__getDataset), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getDataset) {
@@ -27255,23 +27464,23 @@ soap_in_ns1__getDataset(struct soap *soap, const char *tag, ns1__getDataset *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getDataset *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__getDataset, 0,
         sizeof(ns1__getDataset), 0, soap_copy_ns1__getDataset);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getDataset::soap_put(struct soap *soap, const char *tag,
                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getDataset);
   if (this->soap_out(soap, tag ? tag : "ns1:getDataset", id, type))
     return soap->error;
@@ -27288,7 +27497,7 @@ soap_get_ns1__getDataset(struct soap *soap, ns1__getDataset *p, const char *tag,
                          const char *type) {
   if ((p = soap_in_ns1__getDataset(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -27300,10 +27509,10 @@ soap_instantiate_ns1__getDataset(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__getDataset(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getDataset, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getDataset, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getDataset);
     if (size)
@@ -27372,14 +27581,14 @@ soap_in_ns1__deleteAuthorisationResponse(struct soap *soap, const char *tag,
                                          ns1__deleteAuthorisationResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__deleteAuthorisationResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteAuthorisationResponse,
             sizeof(ns1__deleteAuthorisationResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -27389,14 +27598,14 @@ soap_in_ns1__deleteAuthorisationResponse(struct soap *soap, const char *tag,
       return (ns1__deleteAuthorisationResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__deleteAuthorisationResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteAuthorisationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteAuthorisationResponse", id,
                      type))
@@ -27416,7 +27625,7 @@ soap_get_ns1__deleteAuthorisationResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteAuthorisationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -27433,10 +27642,10 @@ soap_instantiate_ns1__deleteAuthorisationResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__deleteAuthorisationResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__deleteAuthorisationResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteAuthorisationResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteAuthorisationResponse);
     if (size)
@@ -27476,8 +27685,8 @@ soap_copy_ns1__deleteAuthorisationResponse(struct soap *soap, int st, int tt,
 void ns1__deleteAuthorisation::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__deleteAuthorisation::sessionId = NULL;
-  this->ns1__deleteAuthorisation::authorisationId = NULL;
+  this->ns1__deleteAuthorisation::sessionId = nullptr;
+  this->ns1__deleteAuthorisation::authorisationId = nullptr;
 }
 
 void ns1__deleteAuthorisation::soap_serialize(struct soap *soap) const {
@@ -27526,13 +27735,13 @@ soap_in_ns1__deleteAuthorisation(struct soap *soap, const char *tag,
                                  ns1__deleteAuthorisation *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__deleteAuthorisation *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteAuthorisation,
       sizeof(ns1__deleteAuthorisation), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__deleteAuthorisation) {
@@ -27574,10 +27783,10 @@ soap_in_ns1__deleteAuthorisation(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__deleteAuthorisation *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -27585,14 +27794,14 @@ soap_in_ns1__deleteAuthorisation(struct soap *soap, const char *tag,
         sizeof(ns1__deleteAuthorisation), 0,
         soap_copy_ns1__deleteAuthorisation);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__deleteAuthorisation::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteAuthorisation);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteAuthorisation", id, type))
     return soap->error;
@@ -27610,7 +27819,7 @@ soap_get_ns1__deleteAuthorisation(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__deleteAuthorisation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -27624,10 +27833,11 @@ soap_instantiate_ns1__deleteAuthorisation(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__deleteAuthorisation(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__deleteAuthorisation, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteAuthorisation, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteAuthorisation);
     if (size)
@@ -27698,14 +27908,14 @@ soap_in_ns1__deletePublicationResponse(struct soap *soap, const char *tag,
                                        ns1__deletePublicationResponse *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__deletePublicationResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deletePublicationResponse,
             sizeof(ns1__deletePublicationResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -27715,13 +27925,13 @@ soap_in_ns1__deletePublicationResponse(struct soap *soap, const char *tag,
       return (ns1__deletePublicationResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__deletePublicationResponse::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deletePublicationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:deletePublicationResponse", id,
                      type))
@@ -27741,7 +27951,7 @@ soap_get_ns1__deletePublicationResponse(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__deletePublicationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -27758,10 +27968,10 @@ soap_instantiate_ns1__deletePublicationResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__deletePublicationResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__deletePublicationResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__deletePublicationResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deletePublicationResponse);
     if (size)
@@ -27799,8 +28009,8 @@ soap_copy_ns1__deletePublicationResponse(struct soap *soap, int st, int tt,
 void ns1__deletePublication::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__deletePublication::sessionId = NULL;
-  this->ns1__deletePublication::publicationId = NULL;
+  this->ns1__deletePublication::sessionId = nullptr;
+  this->ns1__deletePublication::publicationId = nullptr;
 }
 
 void ns1__deletePublication::soap_serialize(struct soap *soap) const {
@@ -27847,13 +28057,13 @@ SOAP_FMAC3 ns1__deletePublication *SOAP_FMAC4
 soap_in_ns1__deletePublication(struct soap *soap, const char *tag,
                                ns1__deletePublication *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__deletePublication *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deletePublication,
       sizeof(ns1__deletePublication), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__deletePublication) {
@@ -27895,23 +28105,23 @@ soap_in_ns1__deletePublication(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__deletePublication *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__deletePublication,
         0, sizeof(ns1__deletePublication), 0, soap_copy_ns1__deletePublication);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__deletePublication::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deletePublication);
   if (this->soap_out(soap, tag ? tag : "ns1:deletePublication", id, type))
     return soap->error;
@@ -27928,7 +28138,7 @@ soap_get_ns1__deletePublication(struct soap *soap, ns1__deletePublication *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__deletePublication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -27943,9 +28153,9 @@ soap_instantiate_ns1__deletePublication(struct soap *soap, int n,
                       "soap_instantiate_ns1__deletePublication(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__deletePublication, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__deletePublication, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deletePublication);
     if (size)
@@ -27981,7 +28191,7 @@ soap_copy_ns1__deletePublication(struct soap *soap, int st, int tt, void *p,
 void ns1__loginResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__loginResponse::return_ = NULL;
+  this->ns1__loginResponse::return_ = nullptr;
 }
 
 void ns1__loginResponse::soap_serialize(struct soap *soap) const {
@@ -28021,13 +28231,13 @@ SOAP_FMAC3 ns1__loginResponse *SOAP_FMAC4
 soap_in_ns1__loginResponse(struct soap *soap, const char *tag,
                            ns1__loginResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__loginResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__loginResponse,
       sizeof(ns1__loginResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__loginResponse) {
@@ -28061,23 +28271,23 @@ soap_in_ns1__loginResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__loginResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__loginResponse, 0,
         sizeof(ns1__loginResponse), 0, soap_copy_ns1__loginResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__loginResponse::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__loginResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:loginResponse", id, type))
     return soap->error;
@@ -28094,7 +28304,7 @@ soap_get_ns1__loginResponse(struct soap *soap, ns1__loginResponse *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__loginResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -28107,9 +28317,9 @@ soap_instantiate_ns1__loginResponse(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__loginResponse(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__loginResponse, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__loginResponse, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__loginResponse);
     if (size)
@@ -28145,8 +28355,8 @@ soap_copy_ns1__loginResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__login::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__login::username = NULL;
-  this->ns1__login::password = NULL;
+  this->ns1__login::username = nullptr;
+  this->ns1__login::password = nullptr;
 }
 
 void ns1__login::soap_serialize(struct soap *soap) const {
@@ -28189,13 +28399,13 @@ SOAP_FMAC3 ns1__login *SOAP_FMAC4
 soap_in_ns1__login(struct soap *soap, const char *tag, ns1__login *a,
                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__login *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__login, sizeof(ns1__login),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__login) {
@@ -28236,24 +28446,24 @@ soap_in_ns1__login(struct soap *soap, const char *tag, ns1__login *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__login *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__login, 0,
         sizeof(ns1__login), 0, soap_copy_ns1__login);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__login::soap_put(struct soap *soap, const char *tag,
                          const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat3_ns1__login);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat3_ns1__login);
   if (this->soap_out(soap, tag ? tag : "ns1:login", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -28269,7 +28479,7 @@ soap_get_ns1__login(struct soap *soap, ns1__login *p, const char *tag,
                     const char *type) {
   if ((p = soap_in_ns1__login(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -28281,9 +28491,9 @@ soap_instantiate_ns1__login(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__login(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__login, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__login, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__login);
     if (size)
@@ -28318,7 +28528,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__login(struct soap *soap, int st,
 void ns1__loginLifetimeResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__loginLifetimeResponse::return_ = NULL;
+  this->ns1__loginLifetimeResponse::return_ = nullptr;
 }
 
 void ns1__loginLifetimeResponse::soap_serialize(struct soap *soap) const {
@@ -28362,13 +28572,13 @@ soap_in_ns1__loginLifetimeResponse(struct soap *soap, const char *tag,
                                    ns1__loginLifetimeResponse *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__loginLifetimeResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__loginLifetimeResponse,
       sizeof(ns1__loginLifetimeResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__loginLifetimeResponse) {
@@ -28402,10 +28612,10 @@ soap_in_ns1__loginLifetimeResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__loginLifetimeResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -28413,14 +28623,14 @@ soap_in_ns1__loginLifetimeResponse(struct soap *soap, const char *tag,
         sizeof(ns1__loginLifetimeResponse), 0,
         soap_copy_ns1__loginLifetimeResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__loginLifetimeResponse::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__loginLifetimeResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:loginLifetimeResponse", id, type))
     return soap->error;
@@ -28438,7 +28648,7 @@ soap_get_ns1__loginLifetimeResponse(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__loginLifetimeResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -28453,10 +28663,11 @@ soap_instantiate_ns1__loginLifetimeResponse(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__loginLifetimeResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__loginLifetimeResponse, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__loginLifetimeResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__loginLifetimeResponse);
     if (size)
@@ -28493,8 +28704,8 @@ soap_copy_ns1__loginLifetimeResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__loginLifetime::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__loginLifetime::username = NULL;
-  this->ns1__loginLifetime::password = NULL;
+  this->ns1__loginLifetime::username = nullptr;
+  this->ns1__loginLifetime::password = nullptr;
   soap_default_int(soap, &this->ns1__loginLifetime::lifetime);
 }
 
@@ -28545,13 +28756,13 @@ SOAP_FMAC3 ns1__loginLifetime *SOAP_FMAC4
 soap_in_ns1__loginLifetime(struct soap *soap, const char *tag,
                            ns1__loginLifetime *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__loginLifetime *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__loginLifetime,
       sizeof(ns1__loginLifetime), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__loginLifetime) {
@@ -28601,27 +28812,27 @@ soap_in_ns1__loginLifetime(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__loginLifetime *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__loginLifetime, 0,
         sizeof(ns1__loginLifetime), 0, soap_copy_ns1__loginLifetime);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_lifetime1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__loginLifetime::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__loginLifetime);
   if (this->soap_out(soap, tag ? tag : "ns1:loginLifetime", id, type))
     return soap->error;
@@ -28638,7 +28849,7 @@ soap_get_ns1__loginLifetime(struct soap *soap, ns1__loginLifetime *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__loginLifetime(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -28651,9 +28862,9 @@ soap_instantiate_ns1__loginLifetime(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__loginLifetime(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__loginLifetime, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__loginLifetime, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__loginLifetime);
     if (size)
@@ -28736,13 +28947,13 @@ soap_in_ns1__getParameterByUnitsResponse(struct soap *soap, const char *tag,
                                          ns1__getParameterByUnitsResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getParameterByUnitsResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getParameterByUnitsResponse,
       sizeof(ns1__getParameterByUnitsResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getParameterByUnitsResponse) {
@@ -28772,10 +28983,10 @@ soap_in_ns1__getParameterByUnitsResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getParameterByUnitsResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -28783,7 +28994,7 @@ soap_in_ns1__getParameterByUnitsResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getParameterByUnitsResponse), 0,
         soap_copy_ns1__getParameterByUnitsResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -28791,7 +29002,7 @@ soap_in_ns1__getParameterByUnitsResponse(struct soap *soap, const char *tag,
 int ns1__getParameterByUnitsResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getParameterByUnitsResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getParameterByUnitsResponse", id,
                      type))
@@ -28811,7 +29022,7 @@ soap_get_ns1__getParameterByUnitsResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__getParameterByUnitsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -28828,10 +29039,10 @@ soap_instantiate_ns1__getParameterByUnitsResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__getParameterByUnitsResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getParameterByUnitsResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getParameterByUnitsResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getParameterByUnitsResponse);
     if (size)
@@ -28871,8 +29082,8 @@ soap_copy_ns1__getParameterByUnitsResponse(struct soap *soap, int st, int tt,
 void ns1__getParameterByUnits::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getParameterByUnits::sessionId = NULL;
-  this->ns1__getParameterByUnits::units = NULL;
+  this->ns1__getParameterByUnits::sessionId = nullptr;
+  this->ns1__getParameterByUnits::units = nullptr;
 }
 
 void ns1__getParameterByUnits::soap_serialize(struct soap *soap) const {
@@ -28920,13 +29131,13 @@ soap_in_ns1__getParameterByUnits(struct soap *soap, const char *tag,
                                  ns1__getParameterByUnits *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getParameterByUnits *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getParameterByUnits,
       sizeof(ns1__getParameterByUnits), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getParameterByUnits) {
@@ -28969,10 +29180,10 @@ soap_in_ns1__getParameterByUnits(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getParameterByUnits *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -28980,14 +29191,14 @@ soap_in_ns1__getParameterByUnits(struct soap *soap, const char *tag,
         sizeof(ns1__getParameterByUnits), 0,
         soap_copy_ns1__getParameterByUnits);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getParameterByUnits::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getParameterByUnits);
   if (this->soap_out(soap, tag ? tag : "ns1:getParameterByUnits", id, type))
     return soap->error;
@@ -29005,7 +29216,7 @@ soap_get_ns1__getParameterByUnits(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__getParameterByUnits(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -29019,10 +29230,11 @@ soap_instantiate_ns1__getParameterByUnits(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__getParameterByUnits(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getParameterByUnits, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getParameterByUnits, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getParameterByUnits);
     if (size)
@@ -29059,7 +29271,7 @@ soap_copy_ns1__getParameterByUnits(struct soap *soap, int st, int tt, void *p,
 void ns1__addSampleResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addSampleResponse::return_ = NULL;
+  this->ns1__addSampleResponse::return_ = nullptr;
 }
 
 void ns1__addSampleResponse::soap_serialize(struct soap *soap) const {
@@ -29101,13 +29313,13 @@ SOAP_FMAC3 ns1__addSampleResponse *SOAP_FMAC4
 soap_in_ns1__addSampleResponse(struct soap *soap, const char *tag,
                                ns1__addSampleResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addSampleResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addSampleResponse,
       sizeof(ns1__addSampleResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addSampleResponse) {
@@ -29140,23 +29352,23 @@ soap_in_ns1__addSampleResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addSampleResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__addSampleResponse,
         0, sizeof(ns1__addSampleResponse), 0, soap_copy_ns1__addSampleResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addSampleResponse::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addSampleResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:addSampleResponse", id, type))
     return soap->error;
@@ -29173,7 +29385,7 @@ soap_get_ns1__addSampleResponse(struct soap *soap, ns1__addSampleResponse *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__addSampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -29188,9 +29400,9 @@ soap_instantiate_ns1__addSampleResponse(struct soap *soap, int n,
                       "soap_instantiate_ns1__addSampleResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__addSampleResponse, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__addSampleResponse, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addSampleResponse);
     if (size)
@@ -29226,9 +29438,9 @@ soap_copy_ns1__addSampleResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__addSample::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addSample::sessionId = NULL;
-  this->ns1__addSample::sample = NULL;
-  this->ns1__addSample::investigationId = NULL;
+  this->ns1__addSample::sessionId = nullptr;
+  this->ns1__addSample::sample = nullptr;
+  this->ns1__addSample::investigationId = nullptr;
 }
 
 void ns1__addSample::soap_serialize(struct soap *soap) const {
@@ -29276,13 +29488,13 @@ SOAP_FMAC3 ns1__addSample *SOAP_FMAC4
 soap_in_ns1__addSample(struct soap *soap, const char *tag, ns1__addSample *a,
                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addSample *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addSample, sizeof(ns1__addSample),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addSample) {
@@ -29331,23 +29543,23 @@ soap_in_ns1__addSample(struct soap *soap, const char *tag, ns1__addSample *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addSample *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__addSample, 0,
         sizeof(ns1__addSample), 0, soap_copy_ns1__addSample);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addSample::soap_put(struct soap *soap, const char *tag,
                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addSample);
   if (this->soap_out(soap, tag ? tag : "ns1:addSample", id, type))
     return soap->error;
@@ -29364,7 +29576,7 @@ soap_get_ns1__addSample(struct soap *soap, ns1__addSample *p, const char *tag,
                         const char *type) {
   if ((p = soap_in_ns1__addSample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -29376,10 +29588,10 @@ soap_instantiate_ns1__addSample(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__addSample(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__addSample, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__addSample, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addSample);
     if (size)
@@ -29414,7 +29626,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__addSample(struct soap *soap, int st,
 void ns1__addAuthorisationResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addAuthorisationResponse::return_ = NULL;
+  this->ns1__addAuthorisationResponse::return_ = nullptr;
 }
 
 void ns1__addAuthorisationResponse::soap_serialize(struct soap *soap) const {
@@ -29459,13 +29671,13 @@ soap_in_ns1__addAuthorisationResponse(struct soap *soap, const char *tag,
                                       ns1__addAuthorisationResponse *a,
                                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addAuthorisationResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addAuthorisationResponse,
       sizeof(ns1__addAuthorisationResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addAuthorisationResponse) {
@@ -29498,10 +29710,10 @@ soap_in_ns1__addAuthorisationResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addAuthorisationResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -29509,14 +29721,14 @@ soap_in_ns1__addAuthorisationResponse(struct soap *soap, const char *tag,
         sizeof(ns1__addAuthorisationResponse), 0,
         soap_copy_ns1__addAuthorisationResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addAuthorisationResponse::soap_put(struct soap *soap, const char *tag,
                                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addAuthorisationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:addAuthorisationResponse", id,
                      type))
@@ -29536,7 +29748,7 @@ soap_get_ns1__addAuthorisationResponse(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_ns1__addAuthorisationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -29553,10 +29765,10 @@ soap_instantiate_ns1__addAuthorisationResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__addAuthorisationResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__addAuthorisationResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__addAuthorisationResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addAuthorisationResponse);
     if (size)
@@ -29594,11 +29806,11 @@ soap_copy_ns1__addAuthorisationResponse(struct soap *soap, int st, int tt,
 void ns1__addAuthorisation::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addAuthorisation::sessionId = NULL;
-  this->ns1__addAuthorisation::toAddFedId = NULL;
-  this->ns1__addAuthorisation::toAddRole = NULL;
-  this->ns1__addAuthorisation::elementId = NULL;
-  this->ns1__addAuthorisation::elementType = NULL;
+  this->ns1__addAuthorisation::sessionId = nullptr;
+  this->ns1__addAuthorisation::toAddFedId = nullptr;
+  this->ns1__addAuthorisation::toAddRole = nullptr;
+  this->ns1__addAuthorisation::elementId = nullptr;
+  this->ns1__addAuthorisation::elementType = nullptr;
 }
 
 void ns1__addAuthorisation::soap_serialize(struct soap *soap) const {
@@ -29660,13 +29872,13 @@ SOAP_FMAC3 ns1__addAuthorisation *SOAP_FMAC4
 soap_in_ns1__addAuthorisation(struct soap *soap, const char *tag,
                               ns1__addAuthorisation *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addAuthorisation *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addAuthorisation,
       sizeof(ns1__addAuthorisation), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addAuthorisation) {
@@ -29734,23 +29946,23 @@ soap_in_ns1__addAuthorisation(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addAuthorisation *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__addAuthorisation,
         0, sizeof(ns1__addAuthorisation), 0, soap_copy_ns1__addAuthorisation);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addAuthorisation::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addAuthorisation);
   if (this->soap_out(soap, tag ? tag : "ns1:addAuthorisation", id, type))
     return soap->error;
@@ -29767,7 +29979,7 @@ soap_get_ns1__addAuthorisation(struct soap *soap, ns1__addAuthorisation *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns1__addAuthorisation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -29782,9 +29994,9 @@ soap_instantiate_ns1__addAuthorisation(struct soap *soap, int n,
                       "soap_instantiate_ns1__addAuthorisation(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__addAuthorisation, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__addAuthorisation, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addAuthorisation);
     if (size)
@@ -29866,13 +30078,13 @@ soap_in_ns1__createDataFilesResponse(struct soap *soap, const char *tag,
                                      ns1__createDataFilesResponse *a,
                                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__createDataFilesResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__createDataFilesResponse,
       sizeof(ns1__createDataFilesResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__createDataFilesResponse) {
@@ -29902,10 +30114,10 @@ soap_in_ns1__createDataFilesResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__createDataFilesResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -29913,14 +30125,14 @@ soap_in_ns1__createDataFilesResponse(struct soap *soap, const char *tag,
         sizeof(ns1__createDataFilesResponse), 0,
         soap_copy_ns1__createDataFilesResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__createDataFilesResponse::soap_put(struct soap *soap, const char *tag,
                                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__createDataFilesResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:createDataFilesResponse", id, type))
     return soap->error;
@@ -29938,7 +30150,7 @@ soap_get_ns1__createDataFilesResponse(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in_ns1__createDataFilesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -29955,10 +30167,10 @@ soap_instantiate_ns1__createDataFilesResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__createDataFilesResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__createDataFilesResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__createDataFilesResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__createDataFilesResponse);
     if (size)
@@ -29996,10 +30208,10 @@ soap_copy_ns1__createDataFilesResponse(struct soap *soap, int st, int tt,
 void ns1__createDataFiles::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__createDataFiles::sessionId = NULL;
+  this->ns1__createDataFiles::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__datafile(
       soap, &this->ns1__createDataFiles::dataFiles);
-  this->ns1__createDataFiles::datasetId = NULL;
+  this->ns1__createDataFiles::datasetId = nullptr;
 }
 
 void ns1__createDataFiles::soap_serialize(struct soap *soap) const {
@@ -30049,13 +30261,13 @@ SOAP_FMAC3 ns1__createDataFiles *SOAP_FMAC4
 soap_in_ns1__createDataFiles(struct soap *soap, const char *tag,
                              ns1__createDataFiles *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__createDataFiles *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__createDataFiles,
       sizeof(ns1__createDataFiles), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__createDataFiles) {
@@ -30102,23 +30314,23 @@ soap_in_ns1__createDataFiles(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__createDataFiles *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__createDataFiles, 0,
         sizeof(ns1__createDataFiles), 0, soap_copy_ns1__createDataFiles);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__createDataFiles::soap_put(struct soap *soap, const char *tag,
                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__createDataFiles);
   if (this->soap_out(soap, tag ? tag : "ns1:createDataFiles", id, type))
     return soap->error;
@@ -30135,7 +30347,7 @@ soap_get_ns1__createDataFiles(struct soap *soap, ns1__createDataFiles *p,
                               const char *tag, const char *type) {
   if ((p = soap_in_ns1__createDataFiles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -30150,9 +30362,9 @@ soap_instantiate_ns1__createDataFiles(struct soap *soap, int n,
                       "soap_instantiate_ns1__createDataFiles(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__createDataFiles, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__createDataFiles, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__createDataFiles);
     if (size)
@@ -30188,7 +30400,7 @@ soap_copy_ns1__createDataFiles(struct soap *soap, int st, int tt, void *p,
 void ns1__addDataSetParameterResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addDataSetParameterResponse::return_ = NULL;
+  this->ns1__addDataSetParameterResponse::return_ = nullptr;
 }
 
 void ns1__addDataSetParameterResponse::soap_serialize(struct soap *soap) const {
@@ -30234,13 +30446,13 @@ soap_in_ns1__addDataSetParameterResponse(struct soap *soap, const char *tag,
                                          ns1__addDataSetParameterResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addDataSetParameterResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addDataSetParameterResponse,
       sizeof(ns1__addDataSetParameterResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addDataSetParameterResponse) {
@@ -30273,10 +30485,10 @@ soap_in_ns1__addDataSetParameterResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addDataSetParameterResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -30284,7 +30496,7 @@ soap_in_ns1__addDataSetParameterResponse(struct soap *soap, const char *tag,
         sizeof(ns1__addDataSetParameterResponse), 0,
         soap_copy_ns1__addDataSetParameterResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -30292,7 +30504,7 @@ soap_in_ns1__addDataSetParameterResponse(struct soap *soap, const char *tag,
 int ns1__addDataSetParameterResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addDataSetParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:addDataSetParameterResponse", id,
                      type))
@@ -30312,7 +30524,7 @@ soap_get_ns1__addDataSetParameterResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__addDataSetParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -30329,10 +30541,10 @@ soap_instantiate_ns1__addDataSetParameterResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__addDataSetParameterResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__addDataSetParameterResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__addDataSetParameterResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addDataSetParameterResponse);
     if (size)
@@ -30372,9 +30584,9 @@ soap_copy_ns1__addDataSetParameterResponse(struct soap *soap, int st, int tt,
 void ns1__addDataSetParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addDataSetParameter::sessionId = NULL;
-  this->ns1__addDataSetParameter::dataSetParameter = NULL;
-  this->ns1__addDataSetParameter::datasetId = NULL;
+  this->ns1__addDataSetParameter::sessionId = nullptr;
+  this->ns1__addDataSetParameter::dataSetParameter = nullptr;
+  this->ns1__addDataSetParameter::datasetId = nullptr;
 }
 
 void ns1__addDataSetParameter::soap_serialize(struct soap *soap) const {
@@ -30428,13 +30640,13 @@ soap_in_ns1__addDataSetParameter(struct soap *soap, const char *tag,
                                  ns1__addDataSetParameter *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addDataSetParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addDataSetParameter,
       sizeof(ns1__addDataSetParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addDataSetParameter) {
@@ -30485,10 +30697,10 @@ soap_in_ns1__addDataSetParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addDataSetParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -30496,14 +30708,14 @@ soap_in_ns1__addDataSetParameter(struct soap *soap, const char *tag,
         sizeof(ns1__addDataSetParameter), 0,
         soap_copy_ns1__addDataSetParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addDataSetParameter::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addDataSetParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:addDataSetParameter", id, type))
     return soap->error;
@@ -30521,7 +30733,7 @@ soap_get_ns1__addDataSetParameter(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__addDataSetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -30535,10 +30747,11 @@ soap_instantiate_ns1__addDataSetParameter(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__addDataSetParameter(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__addDataSetParameter, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__addDataSetParameter, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addDataSetParameter);
     if (size)
@@ -30608,14 +30821,14 @@ soap_in_ns1__modifyInvestigatorResponse(struct soap *soap, const char *tag,
                                         ns1__modifyInvestigatorResponse *a,
                                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__modifyInvestigatorResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifyInvestigatorResponse,
             sizeof(ns1__modifyInvestigatorResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -30625,14 +30838,14 @@ soap_in_ns1__modifyInvestigatorResponse(struct soap *soap, const char *tag,
       return (ns1__modifyInvestigatorResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__modifyInvestigatorResponse::soap_put(struct soap *soap,
                                               const char *tag,
                                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifyInvestigatorResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:modifyInvestigatorResponse", id,
                      type))
@@ -30652,7 +30865,7 @@ soap_get_ns1__modifyInvestigatorResponse(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_ns1__modifyInvestigatorResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -30669,10 +30882,10 @@ soap_instantiate_ns1__modifyInvestigatorResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__modifyInvestigatorResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__modifyInvestigatorResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__modifyInvestigatorResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifyInvestigatorResponse);
     if (size)
@@ -30710,8 +30923,8 @@ soap_copy_ns1__modifyInvestigatorResponse(struct soap *soap, int st, int tt,
 void ns1__modifyInvestigator::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__modifyInvestigator::sessionId = NULL;
-  this->ns1__modifyInvestigator::ns1__investigator_ = NULL;
+  this->ns1__modifyInvestigator::sessionId = nullptr;
+  this->ns1__modifyInvestigator::ns1__investigator_ = nullptr;
 }
 
 void ns1__modifyInvestigator::soap_serialize(struct soap *soap) const {
@@ -30759,13 +30972,13 @@ SOAP_FMAC3 ns1__modifyInvestigator *SOAP_FMAC4
 soap_in_ns1__modifyInvestigator(struct soap *soap, const char *tag,
                                 ns1__modifyInvestigator *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__modifyInvestigator *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifyInvestigator,
       sizeof(ns1__modifyInvestigator), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__modifyInvestigator) {
@@ -30808,24 +31021,24 @@ soap_in_ns1__modifyInvestigator(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__modifyInvestigator *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__modifyInvestigator,
         0, sizeof(ns1__modifyInvestigator), 0,
         soap_copy_ns1__modifyInvestigator);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__modifyInvestigator::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifyInvestigator);
   if (this->soap_out(soap, tag ? tag : "ns1:modifyInvestigator", id, type))
     return soap->error;
@@ -30842,7 +31055,7 @@ soap_get_ns1__modifyInvestigator(struct soap *soap, ns1__modifyInvestigator *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__modifyInvestigator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -30857,9 +31070,9 @@ soap_instantiate_ns1__modifyInvestigator(struct soap *soap, int n,
                       "soap_instantiate_ns1__modifyInvestigator(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__modifyInvestigator, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__modifyInvestigator, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifyInvestigator);
     if (size)
@@ -30929,15 +31142,15 @@ soap_in_ns1__modifySampleParameterResponse(
     struct soap *soap, const char *tag, ns1__modifySampleParameterResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__modifySampleParameterResponse *)soap_class_id_enter(
             soap, soap->id, a,
             SOAP_TYPE_ICat3_ns1__modifySampleParameterResponse,
             sizeof(ns1__modifySampleParameterResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -30947,14 +31160,14 @@ soap_in_ns1__modifySampleParameterResponse(
       return (ns1__modifySampleParameterResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__modifySampleParameterResponse::soap_put(struct soap *soap,
                                                  const char *tag,
                                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifySampleParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:modifySampleParameterResponse", id,
                      type))
@@ -30974,7 +31187,7 @@ soap_get_ns1__modifySampleParameterResponse(
     const char *type) {
   if ((p = soap_in_ns1__modifySampleParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -30991,11 +31204,11 @@ soap_instantiate_ns1__modifySampleParameterResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__modifySampleParameterResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__modifySampleParameterResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__modifySampleParameterResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifySampleParameterResponse);
     if (size)
@@ -31035,8 +31248,8 @@ soap_copy_ns1__modifySampleParameterResponse(struct soap *soap, int st, int tt,
 void ns1__modifySampleParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__modifySampleParameter::sessionId = NULL;
-  this->ns1__modifySampleParameter::sampleParameter = NULL;
+  this->ns1__modifySampleParameter::sessionId = nullptr;
+  this->ns1__modifySampleParameter::sampleParameter = nullptr;
 }
 
 void ns1__modifySampleParameter::soap_serialize(struct soap *soap) const {
@@ -31087,13 +31300,13 @@ soap_in_ns1__modifySampleParameter(struct soap *soap, const char *tag,
                                    ns1__modifySampleParameter *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__modifySampleParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifySampleParameter,
       sizeof(ns1__modifySampleParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__modifySampleParameter) {
@@ -31136,10 +31349,10 @@ soap_in_ns1__modifySampleParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__modifySampleParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -31147,14 +31360,14 @@ soap_in_ns1__modifySampleParameter(struct soap *soap, const char *tag,
         sizeof(ns1__modifySampleParameter), 0,
         soap_copy_ns1__modifySampleParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__modifySampleParameter::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifySampleParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:modifySampleParameter", id, type))
     return soap->error;
@@ -31172,7 +31385,7 @@ soap_get_ns1__modifySampleParameter(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__modifySampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -31187,10 +31400,11 @@ soap_instantiate_ns1__modifySampleParameter(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__modifySampleParameter(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__modifySampleParameter, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__modifySampleParameter, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifySampleParameter);
     if (size)
@@ -31274,13 +31488,13 @@ soap_in_ns1__listDatafileFormatsResponse(struct soap *soap, const char *tag,
                                          ns1__listDatafileFormatsResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listDatafileFormatsResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listDatafileFormatsResponse,
       sizeof(ns1__listDatafileFormatsResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listDatafileFormatsResponse) {
@@ -31310,10 +31524,10 @@ soap_in_ns1__listDatafileFormatsResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listDatafileFormatsResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -31321,7 +31535,7 @@ soap_in_ns1__listDatafileFormatsResponse(struct soap *soap, const char *tag,
         sizeof(ns1__listDatafileFormatsResponse), 0,
         soap_copy_ns1__listDatafileFormatsResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -31329,7 +31543,7 @@ soap_in_ns1__listDatafileFormatsResponse(struct soap *soap, const char *tag,
 int ns1__listDatafileFormatsResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listDatafileFormatsResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:listDatafileFormatsResponse", id,
                      type))
@@ -31349,7 +31563,7 @@ soap_get_ns1__listDatafileFormatsResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__listDatafileFormatsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -31366,10 +31580,10 @@ soap_instantiate_ns1__listDatafileFormatsResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__listDatafileFormatsResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__listDatafileFormatsResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__listDatafileFormatsResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listDatafileFormatsResponse);
     if (size)
@@ -31409,7 +31623,7 @@ soap_copy_ns1__listDatafileFormatsResponse(struct soap *soap, int st, int tt,
 void ns1__listDatafileFormats::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__listDatafileFormats::sessionId = NULL;
+  this->ns1__listDatafileFormats::sessionId = nullptr;
 }
 
 void ns1__listDatafileFormats::soap_serialize(struct soap *soap) const {
@@ -31452,13 +31666,13 @@ soap_in_ns1__listDatafileFormats(struct soap *soap, const char *tag,
                                  ns1__listDatafileFormats *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listDatafileFormats *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listDatafileFormats,
       sizeof(ns1__listDatafileFormats), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listDatafileFormats) {
@@ -31492,10 +31706,10 @@ soap_in_ns1__listDatafileFormats(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listDatafileFormats *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -31503,14 +31717,14 @@ soap_in_ns1__listDatafileFormats(struct soap *soap, const char *tag,
         sizeof(ns1__listDatafileFormats), 0,
         soap_copy_ns1__listDatafileFormats);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__listDatafileFormats::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listDatafileFormats);
   if (this->soap_out(soap, tag ? tag : "ns1:listDatafileFormats", id, type))
     return soap->error;
@@ -31528,7 +31742,7 @@ soap_get_ns1__listDatafileFormats(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__listDatafileFormats(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -31542,10 +31756,11 @@ soap_instantiate_ns1__listDatafileFormats(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__listDatafileFormats(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__listDatafileFormats, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__listDatafileFormats, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listDatafileFormats);
     if (size)
@@ -31633,15 +31848,15 @@ soap_in_ns1__searchInvestigationByParameterResponse(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByParameterResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterResponse,
       sizeof(ns1__searchInvestigationByParameterResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -31674,10 +31889,10 @@ soap_in_ns1__searchInvestigationByParameterResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByParameterResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -31685,7 +31900,7 @@ soap_in_ns1__searchInvestigationByParameterResponse(
         sizeof(ns1__searchInvestigationByParameterResponse), 0,
         soap_copy_ns1__searchInvestigationByParameterResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -31693,7 +31908,7 @@ soap_in_ns1__searchInvestigationByParameterResponse(
 int ns1__searchInvestigationByParameterResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchInvestigationByParameterResponse",
@@ -31716,7 +31931,7 @@ soap_get_ns1__searchInvestigationByParameterResponse(
   if ((p = soap_in_ns1__searchInvestigationByParameterResponse(soap, tag, p,
                                                                type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -31730,11 +31945,12 @@ soap_instantiate_ns1__searchInvestigationByParameterResponse(
                                     "searchInvestigationByParameterResponse(%d,"
                                     " %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterResponse,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchInvestigationByParameterResponse);
     if (size)
@@ -31777,7 +31993,7 @@ soap_copy_ns1__searchInvestigationByParameterResponse(struct soap *soap, int st,
 void ns1__searchInvestigationByParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchInvestigationByParameter::sessionId = NULL;
+  this->ns1__searchInvestigationByParameter::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__parameterSearch(
       soap, &this->ns1__searchInvestigationByParameter::parameters);
 }
@@ -31833,13 +32049,13 @@ soap_in_ns1__searchInvestigationByParameter(
     struct soap *soap, const char *tag, ns1__searchInvestigationByParameter *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchInvestigationByParameter,
       sizeof(ns1__searchInvestigationByParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -31881,10 +32097,10 @@ soap_in_ns1__searchInvestigationByParameter(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -31892,7 +32108,7 @@ soap_in_ns1__searchInvestigationByParameter(
         sizeof(ns1__searchInvestigationByParameter), 0,
         soap_copy_ns1__searchInvestigationByParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -31900,7 +32116,7 @@ soap_in_ns1__searchInvestigationByParameter(
 int ns1__searchInvestigationByParameter::soap_put(struct soap *soap,
                                                   const char *tag,
                                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:searchInvestigationByParameter", id,
                      type))
@@ -31920,7 +32136,7 @@ soap_get_ns1__searchInvestigationByParameter(
     const char *type) {
   if ((p = soap_in_ns1__searchInvestigationByParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -31937,11 +32153,11 @@ soap_instantiate_ns1__searchInvestigationByParameter(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__searchInvestigationByParameter(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchInvestigationByParameter,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchInvestigationByParameter, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchInvestigationByParameter);
     if (size)
@@ -32027,13 +32243,13 @@ soap_in_ns1__searchByAdvancedResponse(struct soap *soap, const char *tag,
                                       ns1__searchByAdvancedResponse *a,
                                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByAdvancedResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByAdvancedResponse,
       sizeof(ns1__searchByAdvancedResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByAdvancedResponse) {
@@ -32063,10 +32279,10 @@ soap_in_ns1__searchByAdvancedResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByAdvancedResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -32074,14 +32290,14 @@ soap_in_ns1__searchByAdvancedResponse(struct soap *soap, const char *tag,
         sizeof(ns1__searchByAdvancedResponse), 0,
         soap_copy_ns1__searchByAdvancedResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchByAdvancedResponse::soap_put(struct soap *soap, const char *tag,
                                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByAdvancedResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByAdvancedResponse", id,
                      type))
@@ -32101,7 +32317,7 @@ soap_get_ns1__searchByAdvancedResponse(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByAdvancedResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -32118,10 +32334,10 @@ soap_instantiate_ns1__searchByAdvancedResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__searchByAdvancedResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchByAdvancedResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByAdvancedResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByAdvancedResponse);
     if (size)
@@ -32159,8 +32375,8 @@ soap_copy_ns1__searchByAdvancedResponse(struct soap *soap, int st, int tt,
 void ns1__searchByAdvanced::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchByAdvanced::sessionId = NULL;
-  this->ns1__searchByAdvanced::advancedSearchDetails = NULL;
+  this->ns1__searchByAdvanced::sessionId = nullptr;
+  this->ns1__searchByAdvanced::advancedSearchDetails = nullptr;
 }
 
 void ns1__searchByAdvanced::soap_serialize(struct soap *soap) const {
@@ -32208,13 +32424,13 @@ SOAP_FMAC3 ns1__searchByAdvanced *SOAP_FMAC4
 soap_in_ns1__searchByAdvanced(struct soap *soap, const char *tag,
                               ns1__searchByAdvanced *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByAdvanced *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByAdvanced,
       sizeof(ns1__searchByAdvanced), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByAdvanced) {
@@ -32257,23 +32473,23 @@ soap_in_ns1__searchByAdvanced(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByAdvanced *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__searchByAdvanced,
         0, sizeof(ns1__searchByAdvanced), 0, soap_copy_ns1__searchByAdvanced);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchByAdvanced::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByAdvanced);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByAdvanced", id, type))
     return soap->error;
@@ -32290,7 +32506,7 @@ soap_get_ns1__searchByAdvanced(struct soap *soap, ns1__searchByAdvanced *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByAdvanced(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -32305,9 +32521,9 @@ soap_instantiate_ns1__searchByAdvanced(struct soap *soap, int n,
                       "soap_instantiate_ns1__searchByAdvanced(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchByAdvanced, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByAdvanced, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByAdvanced);
     if (size)
@@ -32393,15 +32609,15 @@ soap_in_ns1__searchByAdvancedPaginationResponse(
     struct soap *soap, const char *tag,
     ns1__searchByAdvancedPaginationResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByAdvancedPaginationResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchByAdvancedPaginationResponse,
       sizeof(ns1__searchByAdvancedPaginationResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -32434,10 +32650,10 @@ soap_in_ns1__searchByAdvancedPaginationResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByAdvancedPaginationResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -32445,7 +32661,7 @@ soap_in_ns1__searchByAdvancedPaginationResponse(
         sizeof(ns1__searchByAdvancedPaginationResponse), 0,
         soap_copy_ns1__searchByAdvancedPaginationResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -32453,7 +32669,7 @@ soap_in_ns1__searchByAdvancedPaginationResponse(
 int ns1__searchByAdvancedPaginationResponse::soap_put(struct soap *soap,
                                                       const char *tag,
                                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByAdvancedPaginationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByAdvancedPaginationResponse",
                      id, type))
@@ -32474,7 +32690,7 @@ soap_get_ns1__searchByAdvancedPaginationResponse(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByAdvancedPaginationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -32491,10 +32707,10 @@ soap_instantiate_ns1__searchByAdvancedPaginationResponse(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchByAdvancedPaginationResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByAdvancedPaginationResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByAdvancedPaginationResponse);
     if (size)
@@ -32535,27 +32751,27 @@ soap_copy_ns1__searchByAdvancedPaginationResponse(struct soap *soap, int st,
 void ns1__advancedSearchDetails::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__advancedSearchDetails::backCatalogueInvestigatorString = NULL;
+  this->ns1__advancedSearchDetails::backCatalogueInvestigatorString = nullptr;
   soap_default_bool(soap, &this->ns1__advancedSearchDetails::caseSensitive);
-  this->ns1__advancedSearchDetails::datafileName = NULL;
-  this->ns1__advancedSearchDetails::dateRangeEnd = NULL;
-  this->ns1__advancedSearchDetails::dateRangeStart = NULL;
-  this->ns1__advancedSearchDetails::experimentNumber = NULL;
-  this->ns1__advancedSearchDetails::grantId = NULL;
+  this->ns1__advancedSearchDetails::datafileName = nullptr;
+  this->ns1__advancedSearchDetails::dateRangeEnd = nullptr;
+  this->ns1__advancedSearchDetails::dateRangeStart = nullptr;
+  this->ns1__advancedSearchDetails::experimentNumber = nullptr;
+  this->ns1__advancedSearchDetails::grantId = nullptr;
   soap_default_std__vectorTemplateOfstd__string(
       soap, &this->ns1__advancedSearchDetails::instruments);
-  this->ns1__advancedSearchDetails::investigationAbstract = NULL;
-  this->ns1__advancedSearchDetails::investigationInclude = NULL;
-  this->ns1__advancedSearchDetails::investigationName = NULL;
-  this->ns1__advancedSearchDetails::investigationType = NULL;
+  this->ns1__advancedSearchDetails::investigationAbstract = nullptr;
+  this->ns1__advancedSearchDetails::investigationInclude = nullptr;
+  this->ns1__advancedSearchDetails::investigationName = nullptr;
+  this->ns1__advancedSearchDetails::investigationType = nullptr;
   soap_default_std__vectorTemplateOfstd__string(
       soap, &this->ns1__advancedSearchDetails::investigators);
   soap_default_std__vectorTemplateOfstd__string(
       soap, &this->ns1__advancedSearchDetails::keywords);
-  this->ns1__advancedSearchDetails::runEnd = NULL;
-  this->ns1__advancedSearchDetails::runStart = NULL;
-  this->ns1__advancedSearchDetails::sampleName = NULL;
-  this->ns1__advancedSearchDetails::visitId = NULL;
+  this->ns1__advancedSearchDetails::runEnd = nullptr;
+  this->ns1__advancedSearchDetails::runStart = nullptr;
+  this->ns1__advancedSearchDetails::sampleName = nullptr;
+  this->ns1__advancedSearchDetails::visitId = nullptr;
 }
 
 void ns1__advancedSearchDetails::soap_serialize(struct soap *soap) const {
@@ -32695,13 +32911,13 @@ soap_in_ns1__advancedSearchDetails(struct soap *soap, const char *tag,
                                    ns1__advancedSearchDetails *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__advancedSearchDetails *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__advancedSearchDetails,
       sizeof(ns1__advancedSearchDetails), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__advancedSearchDetails) {
@@ -32878,10 +33094,10 @@ soap_in_ns1__advancedSearchDetails(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__advancedSearchDetails *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -32889,18 +33105,18 @@ soap_in_ns1__advancedSearchDetails(struct soap *soap, const char *tag,
         sizeof(ns1__advancedSearchDetails), 0,
         soap_copy_ns1__advancedSearchDetails);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_caseSensitive1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__advancedSearchDetails::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__advancedSearchDetails);
   if (this->soap_out(soap, tag ? tag : "ns1:advancedSearchDetails", id, type))
     return soap->error;
@@ -32918,7 +33134,7 @@ soap_get_ns1__advancedSearchDetails(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__advancedSearchDetails(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -32933,10 +33149,11 @@ soap_instantiate_ns1__advancedSearchDetails(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__advancedSearchDetails(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__advancedSearchDetails, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__advancedSearchDetails, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__advancedSearchDetails);
     if (size)
@@ -32973,8 +33190,8 @@ soap_copy_ns1__advancedSearchDetails(struct soap *soap, int st, int tt, void *p,
 void ns1__searchByAdvancedPagination::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchByAdvancedPagination::sessionId = NULL;
-  this->ns1__searchByAdvancedPagination::advancedSearchDetails = NULL;
+  this->ns1__searchByAdvancedPagination::sessionId = nullptr;
+  this->ns1__searchByAdvancedPagination::advancedSearchDetails = nullptr;
   soap_default_int(soap, &this->ns1__searchByAdvancedPagination::startIndex);
   soap_default_int(soap,
                    &this->ns1__searchByAdvancedPagination::numberOfResults);
@@ -33039,13 +33256,13 @@ soap_in_ns1__searchByAdvancedPagination(struct soap *soap, const char *tag,
                                         ns1__searchByAdvancedPagination *a,
                                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByAdvancedPagination *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByAdvancedPagination,
       sizeof(ns1__searchByAdvancedPagination), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByAdvancedPagination) {
@@ -33105,10 +33322,10 @@ soap_in_ns1__searchByAdvancedPagination(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByAdvancedPagination *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -33116,12 +33333,12 @@ soap_in_ns1__searchByAdvancedPagination(struct soap *soap, const char *tag,
         sizeof(ns1__searchByAdvancedPagination), 0,
         soap_copy_ns1__searchByAdvancedPagination);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_startIndex1 > 0 || soap_flag_numberOfResults1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
@@ -33129,7 +33346,7 @@ soap_in_ns1__searchByAdvancedPagination(struct soap *soap, const char *tag,
 int ns1__searchByAdvancedPagination::soap_put(struct soap *soap,
                                               const char *tag,
                                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByAdvancedPagination);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByAdvancedPagination", id,
                      type))
@@ -33149,7 +33366,7 @@ soap_get_ns1__searchByAdvancedPagination(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByAdvancedPagination(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -33166,10 +33383,10 @@ soap_instantiate_ns1__searchByAdvancedPagination(struct soap *soap, int n,
              "soap_instantiate_ns1__searchByAdvancedPagination(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchByAdvancedPagination, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByAdvancedPagination,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByAdvancedPagination);
     if (size)
@@ -33259,15 +33476,15 @@ soap_in_ns1__searchDatafileByParameterComparisonResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterComparisonResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByParameterComparisonResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterComparisonResponse,
       sizeof(ns1__searchDatafileByParameterComparisonResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -33300,10 +33517,10 @@ soap_in_ns1__searchDatafileByParameterComparisonResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByParameterComparisonResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -33311,7 +33528,7 @@ soap_in_ns1__searchDatafileByParameterComparisonResponse(
         sizeof(ns1__searchDatafileByParameterComparisonResponse), 0,
         soap_copy_ns1__searchDatafileByParameterComparisonResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -33319,7 +33536,7 @@ soap_in_ns1__searchDatafileByParameterComparisonResponse(
 int ns1__searchDatafileByParameterComparisonResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterComparisonResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchDatafileByParameterComparisonResponse",
@@ -33341,7 +33558,7 @@ soap_get_ns1__searchDatafileByParameterComparisonResponse(
   if ((p = soap_in_ns1__searchDatafileByParameterComparisonResponse(soap, tag,
                                                                     p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -33356,11 +33573,11 @@ soap_instantiate_ns1__searchDatafileByParameterComparisonResponse(
                                     "e(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterComparisonResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(ns1__searchDatafileByParameterComparisonResponse);
@@ -33407,7 +33624,7 @@ soap_copy_ns1__searchDatafileByParameterComparisonResponse(struct soap *soap,
 void ns1__searchDatafileByParameterComparison::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatafileByParameterComparison::sessionId = NULL;
+  this->ns1__searchDatafileByParameterComparison::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__parameterComparisonCondition(
       soap, &this->ns1__searchDatafileByParameterComparison::comparison);
 }
@@ -33465,15 +33682,15 @@ soap_in_ns1__searchDatafileByParameterComparison(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterComparison *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByParameterComparison *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterComparison,
       sizeof(ns1__searchDatafileByParameterComparison), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -33516,10 +33733,10 @@ soap_in_ns1__searchDatafileByParameterComparison(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByParameterComparison *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -33527,7 +33744,7 @@ soap_in_ns1__searchDatafileByParameterComparison(
         sizeof(ns1__searchDatafileByParameterComparison), 0,
         soap_copy_ns1__searchDatafileByParameterComparison);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -33535,7 +33752,7 @@ soap_in_ns1__searchDatafileByParameterComparison(
 int ns1__searchDatafileByParameterComparison::soap_put(struct soap *soap,
                                                        const char *tag,
                                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterComparison);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchDatafileByParameterComparison", id,
@@ -33558,7 +33775,7 @@ soap_get_ns1__searchDatafileByParameterComparison(
   if ((p = soap_in_ns1__searchDatafileByParameterComparison(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -33575,10 +33792,10 @@ soap_instantiate_ns1__searchDatafileByParameterComparison(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatafileByParameterComparison, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatafileByParameterComparison,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatafileByParameterComparison);
     if (size)
@@ -33668,13 +33885,13 @@ soap_in_ns1__searchByRunNumberResponse(struct soap *soap, const char *tag,
                                        ns1__searchByRunNumberResponse *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByRunNumberResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByRunNumberResponse,
       sizeof(ns1__searchByRunNumberResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByRunNumberResponse) {
@@ -33704,10 +33921,10 @@ soap_in_ns1__searchByRunNumberResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByRunNumberResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -33715,14 +33932,14 @@ soap_in_ns1__searchByRunNumberResponse(struct soap *soap, const char *tag,
         sizeof(ns1__searchByRunNumberResponse), 0,
         soap_copy_ns1__searchByRunNumberResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchByRunNumberResponse::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByRunNumberResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByRunNumberResponse", id,
                      type))
@@ -33742,7 +33959,7 @@ soap_get_ns1__searchByRunNumberResponse(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByRunNumberResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -33759,10 +33976,10 @@ soap_instantiate_ns1__searchByRunNumberResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__searchByRunNumberResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchByRunNumberResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByRunNumberResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByRunNumberResponse);
     if (size)
@@ -33800,7 +34017,7 @@ soap_copy_ns1__searchByRunNumberResponse(struct soap *soap, int st, int tt,
 void ns1__searchByRunNumber::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchByRunNumber::sessionId = NULL;
+  this->ns1__searchByRunNumber::sessionId = nullptr;
   soap_default_std__vectorTemplateOfstd__string(
       soap, &this->ns1__searchByRunNumber::instruments);
   soap_default_float(soap, &this->ns1__searchByRunNumber::startRun);
@@ -33858,13 +34075,13 @@ SOAP_FMAC3 ns1__searchByRunNumber *SOAP_FMAC4
 soap_in_ns1__searchByRunNumber(struct soap *soap, const char *tag,
                                ns1__searchByRunNumber *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByRunNumber *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByRunNumber,
       sizeof(ns1__searchByRunNumber), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByRunNumber) {
@@ -33918,28 +34135,28 @@ soap_in_ns1__searchByRunNumber(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByRunNumber *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__searchByRunNumber,
         0, sizeof(ns1__searchByRunNumber), 0, soap_copy_ns1__searchByRunNumber);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_startRun1 > 0 || soap_flag_endRun1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__searchByRunNumber::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByRunNumber);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByRunNumber", id, type))
     return soap->error;
@@ -33956,7 +34173,7 @@ soap_get_ns1__searchByRunNumber(struct soap *soap, ns1__searchByRunNumber *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByRunNumber(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -33971,9 +34188,9 @@ soap_instantiate_ns1__searchByRunNumber(struct soap *soap, int n,
                       "soap_instantiate_ns1__searchByRunNumber(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchByRunNumber, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByRunNumber, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByRunNumber);
     if (size)
@@ -34060,15 +34277,15 @@ soap_in_ns1__searchByRunNumberPaginationResponse(
     struct soap *soap, const char *tag,
     ns1__searchByRunNumberPaginationResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByRunNumberPaginationResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchByRunNumberPaginationResponse,
       sizeof(ns1__searchByRunNumberPaginationResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -34101,10 +34318,10 @@ soap_in_ns1__searchByRunNumberPaginationResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByRunNumberPaginationResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -34112,7 +34329,7 @@ soap_in_ns1__searchByRunNumberPaginationResponse(
         sizeof(ns1__searchByRunNumberPaginationResponse), 0,
         soap_copy_ns1__searchByRunNumberPaginationResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -34120,7 +34337,7 @@ soap_in_ns1__searchByRunNumberPaginationResponse(
 int ns1__searchByRunNumberPaginationResponse::soap_put(struct soap *soap,
                                                        const char *tag,
                                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByRunNumberPaginationResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchByRunNumberPaginationResponse", id,
@@ -34143,7 +34360,7 @@ soap_get_ns1__searchByRunNumberPaginationResponse(
   if ((p = soap_in_ns1__searchByRunNumberPaginationResponse(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -34160,10 +34377,10 @@ soap_instantiate_ns1__searchByRunNumberPaginationResponse(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchByRunNumberPaginationResponse, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByRunNumberPaginationResponse,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByRunNumberPaginationResponse);
     if (size)
@@ -34205,7 +34422,7 @@ soap_copy_ns1__searchByRunNumberPaginationResponse(struct soap *soap, int st,
 void ns1__searchByRunNumberPagination::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchByRunNumberPagination::sessionId = NULL;
+  this->ns1__searchByRunNumberPagination::sessionId = nullptr;
   soap_default_std__vectorTemplateOfstd__string(
       soap, &this->ns1__searchByRunNumberPagination::instruments);
   soap_default_float(soap, &this->ns1__searchByRunNumberPagination::startRun);
@@ -34280,13 +34497,13 @@ soap_in_ns1__searchByRunNumberPagination(struct soap *soap, const char *tag,
                                          ns1__searchByRunNumberPagination *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByRunNumberPagination *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByRunNumberPagination,
       sizeof(ns1__searchByRunNumberPagination), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByRunNumberPagination) {
@@ -34359,10 +34576,10 @@ soap_in_ns1__searchByRunNumberPagination(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByRunNumberPagination *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -34370,13 +34587,13 @@ soap_in_ns1__searchByRunNumberPagination(struct soap *soap, const char *tag,
         sizeof(ns1__searchByRunNumberPagination), 0,
         soap_copy_ns1__searchByRunNumberPagination);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_startRun1 > 0 || soap_flag_endRun1 > 0 ||
        soap_flag_startIndex1 > 0 || soap_flag_numberOfResults1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
@@ -34384,7 +34601,7 @@ soap_in_ns1__searchByRunNumberPagination(struct soap *soap, const char *tag,
 int ns1__searchByRunNumberPagination::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByRunNumberPagination);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByRunNumberPagination", id,
                      type))
@@ -34404,7 +34621,7 @@ soap_get_ns1__searchByRunNumberPagination(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByRunNumberPagination(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -34421,10 +34638,10 @@ soap_instantiate_ns1__searchByRunNumberPagination(struct soap *soap, int n,
              "soap_instantiate_ns1__searchByRunNumberPagination(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchByRunNumberPagination, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByRunNumberPagination,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByRunNumberPagination);
     if (size)
@@ -34512,13 +34729,13 @@ soap_in_ns1__addDataSetParametersResponse(struct soap *soap, const char *tag,
                                           ns1__addDataSetParametersResponse *a,
                                           const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addDataSetParametersResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addDataSetParametersResponse,
       sizeof(ns1__addDataSetParametersResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -34550,10 +34767,10 @@ soap_in_ns1__addDataSetParametersResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addDataSetParametersResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -34561,7 +34778,7 @@ soap_in_ns1__addDataSetParametersResponse(struct soap *soap, const char *tag,
         sizeof(ns1__addDataSetParametersResponse), 0,
         soap_copy_ns1__addDataSetParametersResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -34569,7 +34786,7 @@ soap_in_ns1__addDataSetParametersResponse(struct soap *soap, const char *tag,
 int ns1__addDataSetParametersResponse::soap_put(struct soap *soap,
                                                 const char *tag,
                                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addDataSetParametersResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:addDataSetParametersResponse", id,
                      type))
@@ -34589,7 +34806,7 @@ soap_get_ns1__addDataSetParametersResponse(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__addDataSetParametersResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -34605,11 +34822,11 @@ soap_instantiate_ns1__addDataSetParametersResponse(struct soap *soap, int n,
              fdebug,
              "soap_instantiate_ns1__addDataSetParametersResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__addDataSetParametersResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__addDataSetParametersResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addDataSetParametersResponse);
     if (size)
@@ -34649,10 +34866,10 @@ soap_copy_ns1__addDataSetParametersResponse(struct soap *soap, int st, int tt,
 void ns1__addDataSetParameters::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addDataSetParameters::sessionId = NULL;
+  this->ns1__addDataSetParameters::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__datasetParameter(
       soap, &this->ns1__addDataSetParameters::dataSetParameters);
-  this->ns1__addDataSetParameters::datasetId = NULL;
+  this->ns1__addDataSetParameters::datasetId = nullptr;
 }
 
 void ns1__addDataSetParameters::soap_serialize(struct soap *soap) const {
@@ -34708,13 +34925,13 @@ soap_in_ns1__addDataSetParameters(struct soap *soap, const char *tag,
                                   ns1__addDataSetParameters *a,
                                   const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addDataSetParameters *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addDataSetParameters,
       sizeof(ns1__addDataSetParameters), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addDataSetParameters) {
@@ -34762,10 +34979,10 @@ soap_in_ns1__addDataSetParameters(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addDataSetParameters *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -34773,14 +34990,14 @@ soap_in_ns1__addDataSetParameters(struct soap *soap, const char *tag,
         sizeof(ns1__addDataSetParameters), 0,
         soap_copy_ns1__addDataSetParameters);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addDataSetParameters::soap_put(struct soap *soap, const char *tag,
                                         const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addDataSetParameters);
   if (this->soap_out(soap, tag ? tag : "ns1:addDataSetParameters", id, type))
     return soap->error;
@@ -34798,7 +35015,7 @@ soap_get_ns1__addDataSetParameters(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in_ns1__addDataSetParameters(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -34813,10 +35030,11 @@ soap_instantiate_ns1__addDataSetParameters(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate_ns1__addDataSetParameters(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__addDataSetParameters, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__addDataSetParameters, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addDataSetParameters);
     if (size)
@@ -34885,13 +35103,13 @@ soap_in_ns1__deleteKeywordResponse(struct soap *soap, const char *tag,
                                    ns1__deleteKeywordResponse *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__deleteKeywordResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteKeywordResponse,
             sizeof(ns1__deleteKeywordResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -34901,13 +35119,13 @@ soap_in_ns1__deleteKeywordResponse(struct soap *soap, const char *tag,
       return (ns1__deleteKeywordResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__deleteKeywordResponse::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteKeywordResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteKeywordResponse", id, type))
     return soap->error;
@@ -34925,7 +35143,7 @@ soap_get_ns1__deleteKeywordResponse(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteKeywordResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -34940,10 +35158,11 @@ soap_instantiate_ns1__deleteKeywordResponse(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__deleteKeywordResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__deleteKeywordResponse, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteKeywordResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteKeywordResponse);
     if (size)
@@ -34980,8 +35199,8 @@ soap_copy_ns1__deleteKeywordResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__deleteKeyword::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__deleteKeyword::sessionId = NULL;
-  this->ns1__deleteKeyword::keywordPK = NULL;
+  this->ns1__deleteKeyword::sessionId = nullptr;
+  this->ns1__deleteKeyword::keywordPK = nullptr;
 }
 
 void ns1__deleteKeyword::soap_serialize(struct soap *soap) const {
@@ -35027,13 +35246,13 @@ SOAP_FMAC3 ns1__deleteKeyword *SOAP_FMAC4
 soap_in_ns1__deleteKeyword(struct soap *soap, const char *tag,
                            ns1__deleteKeyword *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__deleteKeyword *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteKeyword,
       sizeof(ns1__deleteKeyword), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__deleteKeyword) {
@@ -35075,23 +35294,23 @@ soap_in_ns1__deleteKeyword(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__deleteKeyword *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__deleteKeyword, 0,
         sizeof(ns1__deleteKeyword), 0, soap_copy_ns1__deleteKeyword);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__deleteKeyword::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteKeyword);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteKeyword", id, type))
     return soap->error;
@@ -35108,7 +35327,7 @@ soap_get_ns1__deleteKeyword(struct soap *soap, ns1__deleteKeyword *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteKeyword(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -35121,9 +35340,9 @@ soap_instantiate_ns1__deleteKeyword(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__deleteKeyword(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__deleteKeyword, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteKeyword, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteKeyword);
     if (size)
@@ -35208,14 +35427,14 @@ soap_in_ns1__searchDatasetByParameterResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByParameterResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchDatasetByParameterResponse,
       sizeof(ns1__searchDatasetByParameterResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -35248,10 +35467,10 @@ soap_in_ns1__searchDatasetByParameterResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByParameterResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -35259,7 +35478,7 @@ soap_in_ns1__searchDatasetByParameterResponse(
         sizeof(ns1__searchDatasetByParameterResponse), 0,
         soap_copy_ns1__searchDatasetByParameterResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -35267,7 +35486,7 @@ soap_in_ns1__searchDatasetByParameterResponse(
 int ns1__searchDatasetByParameterResponse::soap_put(struct soap *soap,
                                                     const char *tag,
                                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatasetByParameterResponse",
                      id, type))
@@ -35287,7 +35506,7 @@ soap_get_ns1__searchDatasetByParameterResponse(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchDatasetByParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -35303,10 +35522,10 @@ soap_instantiate_ns1__searchDatasetByParameterResponse(struct soap *soap, int n,
                               "searchDatasetByParameterResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatasetByParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatasetByParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetByParameterResponse);
     if (size)
@@ -35346,7 +35565,7 @@ soap_copy_ns1__searchDatasetByParameterResponse(struct soap *soap, int st,
 void ns1__searchDatasetByParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatasetByParameter::sessionId = NULL;
+  this->ns1__searchDatasetByParameter::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__parameterSearch(
       soap, &this->ns1__searchDatasetByParameter::parameters);
 }
@@ -35400,13 +35619,13 @@ soap_in_ns1__searchDatasetByParameter(struct soap *soap, const char *tag,
                                       ns1__searchDatasetByParameter *a,
                                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchDatasetByParameter,
       sizeof(ns1__searchDatasetByParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchDatasetByParameter) {
@@ -35446,10 +35665,10 @@ soap_in_ns1__searchDatasetByParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -35457,14 +35676,14 @@ soap_in_ns1__searchDatasetByParameter(struct soap *soap, const char *tag,
         sizeof(ns1__searchDatasetByParameter), 0,
         soap_copy_ns1__searchDatasetByParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchDatasetByParameter::soap_put(struct soap *soap, const char *tag,
                                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatasetByParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatasetByParameter", id,
                      type))
@@ -35484,7 +35703,7 @@ soap_get_ns1__searchDatasetByParameter(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchDatasetByParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -35501,10 +35720,10 @@ soap_instantiate_ns1__searchDatasetByParameter(struct soap *soap, int n,
              "soap_instantiate_ns1__searchDatasetByParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatasetByParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatasetByParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetByParameter);
     if (size)
@@ -35574,13 +35793,13 @@ soap_in_ns1__deleteSampleResponse(struct soap *soap, const char *tag,
                                   ns1__deleteSampleResponse *a,
                                   const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__deleteSampleResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteSampleResponse,
             sizeof(ns1__deleteSampleResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -35590,13 +35809,13 @@ soap_in_ns1__deleteSampleResponse(struct soap *soap, const char *tag,
       return (ns1__deleteSampleResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__deleteSampleResponse::soap_put(struct soap *soap, const char *tag,
                                         const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteSampleResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteSampleResponse", id, type))
     return soap->error;
@@ -35614,7 +35833,7 @@ soap_get_ns1__deleteSampleResponse(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteSampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -35629,10 +35848,11 @@ soap_instantiate_ns1__deleteSampleResponse(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate_ns1__deleteSampleResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__deleteSampleResponse, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteSampleResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteSampleResponse);
     if (size)
@@ -35669,8 +35889,8 @@ soap_copy_ns1__deleteSampleResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__deleteSample::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__deleteSample::sessionId = NULL;
-  this->ns1__deleteSample::sampleId = NULL;
+  this->ns1__deleteSample::sessionId = nullptr;
+  this->ns1__deleteSample::sampleId = nullptr;
 }
 
 void ns1__deleteSample::soap_serialize(struct soap *soap) const {
@@ -35715,13 +35935,13 @@ SOAP_FMAC3 ns1__deleteSample *SOAP_FMAC4
 soap_in_ns1__deleteSample(struct soap *soap, const char *tag,
                           ns1__deleteSample *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__deleteSample *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteSample,
       sizeof(ns1__deleteSample), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__deleteSample) {
@@ -35763,23 +35983,23 @@ soap_in_ns1__deleteSample(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__deleteSample *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__deleteSample, 0,
         sizeof(ns1__deleteSample), 0, soap_copy_ns1__deleteSample);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__deleteSample::soap_put(struct soap *soap, const char *tag,
                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteSample);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteSample", id, type))
     return soap->error;
@@ -35796,7 +36016,7 @@ soap_get_ns1__deleteSample(struct soap *soap, ns1__deleteSample *p,
                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteSample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -35809,9 +36029,9 @@ soap_instantiate_ns1__deleteSample(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__deleteSample(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__deleteSample, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteSample, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteSample);
     if (size)
@@ -35895,13 +36115,13 @@ soap_in_ns1__listDatasetStatusResponse(struct soap *soap, const char *tag,
                                        ns1__listDatasetStatusResponse *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listDatasetStatusResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listDatasetStatusResponse,
       sizeof(ns1__listDatasetStatusResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listDatasetStatusResponse) {
@@ -35931,10 +36151,10 @@ soap_in_ns1__listDatasetStatusResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listDatasetStatusResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -35942,14 +36162,14 @@ soap_in_ns1__listDatasetStatusResponse(struct soap *soap, const char *tag,
         sizeof(ns1__listDatasetStatusResponse), 0,
         soap_copy_ns1__listDatasetStatusResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__listDatasetStatusResponse::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listDatasetStatusResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:listDatasetStatusResponse", id,
                      type))
@@ -35969,7 +36189,7 @@ soap_get_ns1__listDatasetStatusResponse(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__listDatasetStatusResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -35986,10 +36206,10 @@ soap_instantiate_ns1__listDatasetStatusResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__listDatasetStatusResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__listDatasetStatusResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__listDatasetStatusResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listDatasetStatusResponse);
     if (size)
@@ -36027,7 +36247,7 @@ soap_copy_ns1__listDatasetStatusResponse(struct soap *soap, int st, int tt,
 void ns1__listDatasetStatus::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__listDatasetStatus::sessionId = NULL;
+  this->ns1__listDatasetStatus::sessionId = nullptr;
 }
 
 void ns1__listDatasetStatus::soap_serialize(struct soap *soap) const {
@@ -36069,13 +36289,13 @@ SOAP_FMAC3 ns1__listDatasetStatus *SOAP_FMAC4
 soap_in_ns1__listDatasetStatus(struct soap *soap, const char *tag,
                                ns1__listDatasetStatus *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listDatasetStatus *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listDatasetStatus,
       sizeof(ns1__listDatasetStatus), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listDatasetStatus) {
@@ -36109,23 +36329,23 @@ soap_in_ns1__listDatasetStatus(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listDatasetStatus *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__listDatasetStatus,
         0, sizeof(ns1__listDatasetStatus), 0, soap_copy_ns1__listDatasetStatus);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__listDatasetStatus::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listDatasetStatus);
   if (this->soap_out(soap, tag ? tag : "ns1:listDatasetStatus", id, type))
     return soap->error;
@@ -36142,7 +36362,7 @@ soap_get_ns1__listDatasetStatus(struct soap *soap, ns1__listDatasetStatus *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__listDatasetStatus(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36157,9 +36377,9 @@ soap_instantiate_ns1__listDatasetStatus(struct soap *soap, int n,
                       "soap_instantiate_ns1__listDatasetStatus(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__listDatasetStatus, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__listDatasetStatus, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listDatasetStatus);
     if (size)
@@ -36228,14 +36448,14 @@ soap_in_ns1__modifyInvestigationResponse(struct soap *soap, const char *tag,
                                          ns1__modifyInvestigationResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__modifyInvestigationResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifyInvestigationResponse,
             sizeof(ns1__modifyInvestigationResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -36245,14 +36465,14 @@ soap_in_ns1__modifyInvestigationResponse(struct soap *soap, const char *tag,
       return (ns1__modifyInvestigationResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__modifyInvestigationResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifyInvestigationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:modifyInvestigationResponse", id,
                      type))
@@ -36272,7 +36492,7 @@ soap_get_ns1__modifyInvestigationResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__modifyInvestigationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36289,10 +36509,10 @@ soap_instantiate_ns1__modifyInvestigationResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__modifyInvestigationResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__modifyInvestigationResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__modifyInvestigationResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifyInvestigationResponse);
     if (size)
@@ -36332,8 +36552,8 @@ soap_copy_ns1__modifyInvestigationResponse(struct soap *soap, int st, int tt,
 void ns1__modifyInvestigation::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__modifyInvestigation::sessionId = NULL;
-  this->ns1__modifyInvestigation::investigaion = NULL;
+  this->ns1__modifyInvestigation::sessionId = nullptr;
+  this->ns1__modifyInvestigation::investigaion = nullptr;
 }
 
 void ns1__modifyInvestigation::soap_serialize(struct soap *soap) const {
@@ -36382,13 +36602,13 @@ soap_in_ns1__modifyInvestigation(struct soap *soap, const char *tag,
                                  ns1__modifyInvestigation *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__modifyInvestigation *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifyInvestigation,
       sizeof(ns1__modifyInvestigation), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__modifyInvestigation) {
@@ -36431,10 +36651,10 @@ soap_in_ns1__modifyInvestigation(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__modifyInvestigation *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -36442,14 +36662,14 @@ soap_in_ns1__modifyInvestigation(struct soap *soap, const char *tag,
         sizeof(ns1__modifyInvestigation), 0,
         soap_copy_ns1__modifyInvestigation);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__modifyInvestigation::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifyInvestigation);
   if (this->soap_out(soap, tag ? tag : "ns1:modifyInvestigation", id, type))
     return soap->error;
@@ -36467,7 +36687,7 @@ soap_get_ns1__modifyInvestigation(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__modifyInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36481,10 +36701,11 @@ soap_instantiate_ns1__modifyInvestigation(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__modifyInvestigation(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__modifyInvestigation, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__modifyInvestigation, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifyInvestigation);
     if (size)
@@ -36522,12 +36743,12 @@ void ns1__icatAuthorisation::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__icatAuthorisation::elementId = NULL;
-  this->ns1__icatAuthorisation::elementType = NULL;
-  this->ns1__icatAuthorisation::id = NULL;
-  this->ns1__icatAuthorisation::role = NULL;
-  this->ns1__icatAuthorisation::userChildRecord = NULL;
-  this->ns1__icatAuthorisation::userId = NULL;
+  this->ns1__icatAuthorisation::elementId = nullptr;
+  this->ns1__icatAuthorisation::elementType = nullptr;
+  this->ns1__icatAuthorisation::id = nullptr;
+  this->ns1__icatAuthorisation::role = nullptr;
+  this->ns1__icatAuthorisation::userChildRecord = nullptr;
+  this->ns1__icatAuthorisation::userId = nullptr;
 }
 
 void ns1__icatAuthorisation::soap_serialize(struct soap *soap) const {
@@ -36608,13 +36829,13 @@ SOAP_FMAC3 ns1__icatAuthorisation *SOAP_FMAC4
 soap_in_ns1__icatAuthorisation(struct soap *soap, const char *tag,
                                ns1__icatAuthorisation *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__icatAuthorisation *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__icatAuthorisation,
       sizeof(ns1__icatAuthorisation), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__icatAuthorisation) {
@@ -36719,28 +36940,28 @@ soap_in_ns1__icatAuthorisation(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__icatAuthorisation *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__icatAuthorisation,
         0, sizeof(ns1__icatAuthorisation), 0, soap_copy_ns1__icatAuthorisation);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__icatAuthorisation::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__icatAuthorisation);
   if (this->soap_out(soap, tag ? tag : "ns1:icatAuthorisation", id, type))
     return soap->error;
@@ -36757,7 +36978,7 @@ soap_get_ns1__icatAuthorisation(struct soap *soap, ns1__icatAuthorisation *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__icatAuthorisation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36772,9 +36993,9 @@ soap_instantiate_ns1__icatAuthorisation(struct soap *soap, int n,
                       "soap_instantiate_ns1__icatAuthorisation(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__icatAuthorisation, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__icatAuthorisation, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__icatAuthorisation);
     if (size)
@@ -36858,13 +37079,13 @@ soap_in_ns1__getAuthorisationsResponse(struct soap *soap, const char *tag,
                                        ns1__getAuthorisationsResponse *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getAuthorisationsResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getAuthorisationsResponse,
       sizeof(ns1__getAuthorisationsResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getAuthorisationsResponse) {
@@ -36894,10 +37115,10 @@ soap_in_ns1__getAuthorisationsResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getAuthorisationsResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -36905,14 +37126,14 @@ soap_in_ns1__getAuthorisationsResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getAuthorisationsResponse), 0,
         soap_copy_ns1__getAuthorisationsResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getAuthorisationsResponse::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getAuthorisationsResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getAuthorisationsResponse", id,
                      type))
@@ -36932,7 +37153,7 @@ soap_get_ns1__getAuthorisationsResponse(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__getAuthorisationsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36949,10 +37170,10 @@ soap_instantiate_ns1__getAuthorisationsResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__getAuthorisationsResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getAuthorisationsResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getAuthorisationsResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getAuthorisationsResponse);
     if (size)
@@ -36990,9 +37211,9 @@ soap_copy_ns1__getAuthorisationsResponse(struct soap *soap, int st, int tt,
 void ns1__getAuthorisations::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getAuthorisations::sessionId = NULL;
-  this->ns1__getAuthorisations::elementId = NULL;
-  this->ns1__getAuthorisations::elementType = NULL;
+  this->ns1__getAuthorisations::sessionId = nullptr;
+  this->ns1__getAuthorisations::elementId = nullptr;
+  this->ns1__getAuthorisations::elementType = nullptr;
 }
 
 void ns1__getAuthorisations::soap_serialize(struct soap *soap) const {
@@ -37045,13 +37266,13 @@ SOAP_FMAC3 ns1__getAuthorisations *SOAP_FMAC4
 soap_in_ns1__getAuthorisations(struct soap *soap, const char *tag,
                                ns1__getAuthorisations *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getAuthorisations *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getAuthorisations,
       sizeof(ns1__getAuthorisations), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getAuthorisations) {
@@ -37101,23 +37322,23 @@ soap_in_ns1__getAuthorisations(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getAuthorisations *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__getAuthorisations,
         0, sizeof(ns1__getAuthorisations), 0, soap_copy_ns1__getAuthorisations);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getAuthorisations::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getAuthorisations);
   if (this->soap_out(soap, tag ? tag : "ns1:getAuthorisations", id, type))
     return soap->error;
@@ -37134,7 +37355,7 @@ soap_get_ns1__getAuthorisations(struct soap *soap, ns1__getAuthorisations *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__getAuthorisations(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37149,9 +37370,9 @@ soap_instantiate_ns1__getAuthorisations(struct soap *soap, int n,
                       "soap_instantiate_ns1__getAuthorisations(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getAuthorisations, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getAuthorisations, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getAuthorisations);
     if (size)
@@ -37187,7 +37408,7 @@ soap_copy_ns1__getAuthorisations(struct soap *soap, int st, int tt, void *p,
 void ns1__addKeywordResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addKeywordResponse::return_ = NULL;
+  this->ns1__addKeywordResponse::return_ = nullptr;
 }
 
 void ns1__addKeywordResponse::soap_serialize(struct soap *soap) const {
@@ -37229,13 +37450,13 @@ SOAP_FMAC3 ns1__addKeywordResponse *SOAP_FMAC4
 soap_in_ns1__addKeywordResponse(struct soap *soap, const char *tag,
                                 ns1__addKeywordResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addKeywordResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addKeywordResponse,
       sizeof(ns1__addKeywordResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addKeywordResponse) {
@@ -37268,24 +37489,24 @@ soap_in_ns1__addKeywordResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addKeywordResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__addKeywordResponse,
         0, sizeof(ns1__addKeywordResponse), 0,
         soap_copy_ns1__addKeywordResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addKeywordResponse::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addKeywordResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:addKeywordResponse", id, type))
     return soap->error;
@@ -37302,7 +37523,7 @@ soap_get_ns1__addKeywordResponse(struct soap *soap, ns1__addKeywordResponse *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__addKeywordResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37317,9 +37538,9 @@ soap_instantiate_ns1__addKeywordResponse(struct soap *soap, int n,
                       "soap_instantiate_ns1__addKeywordResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__addKeywordResponse, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__addKeywordResponse, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addKeywordResponse);
     if (size)
@@ -37355,9 +37576,9 @@ soap_copy_ns1__addKeywordResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__addKeyword::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addKeyword::sessionId = NULL;
-  this->ns1__addKeyword::keyword = NULL;
-  this->ns1__addKeyword::investigationId = NULL;
+  this->ns1__addKeyword::sessionId = nullptr;
+  this->ns1__addKeyword::keyword = nullptr;
+  this->ns1__addKeyword::investigationId = nullptr;
 }
 
 void ns1__addKeyword::soap_serialize(struct soap *soap) const {
@@ -37405,13 +37626,13 @@ SOAP_FMAC3 ns1__addKeyword *SOAP_FMAC4
 soap_in_ns1__addKeyword(struct soap *soap, const char *tag, ns1__addKeyword *a,
                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addKeyword *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addKeyword,
       sizeof(ns1__addKeyword), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addKeyword) {
@@ -37461,23 +37682,23 @@ soap_in_ns1__addKeyword(struct soap *soap, const char *tag, ns1__addKeyword *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addKeyword *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__addKeyword, 0,
         sizeof(ns1__addKeyword), 0, soap_copy_ns1__addKeyword);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addKeyword::soap_put(struct soap *soap, const char *tag,
                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addKeyword);
   if (this->soap_out(soap, tag ? tag : "ns1:addKeyword", id, type))
     return soap->error;
@@ -37494,7 +37715,7 @@ soap_get_ns1__addKeyword(struct soap *soap, ns1__addKeyword *p, const char *tag,
                          const char *type) {
   if ((p = soap_in_ns1__addKeyword(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37506,10 +37727,10 @@ soap_instantiate_ns1__addKeyword(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__addKeyword(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__addKeyword, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__addKeyword, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addKeyword);
     if (size)
@@ -37597,15 +37818,15 @@ soap_in_ns1__searchDatasetByRestrictionComparisonResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByRestrictionComparisonResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByRestrictionComparisonResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionComparisonResponse,
       sizeof(ns1__searchDatasetByRestrictionComparisonResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -37639,10 +37860,10 @@ soap_in_ns1__searchDatasetByRestrictionComparisonResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByRestrictionComparisonResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -37650,7 +37871,7 @@ soap_in_ns1__searchDatasetByRestrictionComparisonResponse(
         sizeof(ns1__searchDatasetByRestrictionComparisonResponse), 0,
         soap_copy_ns1__searchDatasetByRestrictionComparisonResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37658,7 +37879,7 @@ soap_in_ns1__searchDatasetByRestrictionComparisonResponse(
 int ns1__searchDatasetByRestrictionComparisonResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionComparisonResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchDatasetByRestrictionComparisonResponse",
@@ -37680,7 +37901,7 @@ soap_get_ns1__searchDatasetByRestrictionComparisonResponse(
   if ((p = soap_in_ns1__searchDatasetByRestrictionComparisonResponse(soap, tag,
                                                                      p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37695,11 +37916,11 @@ soap_instantiate_ns1__searchDatasetByRestrictionComparisonResponse(
                                     "se(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionComparisonResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(ns1__searchDatasetByRestrictionComparisonResponse);
@@ -37746,7 +37967,7 @@ void ns1__searchDatasetByRestrictionComparison::soap_default(
     struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatasetByRestrictionComparison::sessionId = NULL;
+  this->ns1__searchDatasetByRestrictionComparison::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__restrictionComparisonCondition(
       soap, &this->ns1__searchDatasetByRestrictionComparison::restriction);
 }
@@ -37803,15 +38024,15 @@ soap_in_ns1__searchDatasetByRestrictionComparison(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByRestrictionComparison *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByRestrictionComparison *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionComparison,
       sizeof(ns1__searchDatasetByRestrictionComparison), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -37854,10 +38075,10 @@ soap_in_ns1__searchDatasetByRestrictionComparison(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByRestrictionComparison *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -37865,7 +38086,7 @@ soap_in_ns1__searchDatasetByRestrictionComparison(
         sizeof(ns1__searchDatasetByRestrictionComparison), 0,
         soap_copy_ns1__searchDatasetByRestrictionComparison);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37873,7 +38094,7 @@ soap_in_ns1__searchDatasetByRestrictionComparison(
 int ns1__searchDatasetByRestrictionComparison::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionComparison);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchDatasetByRestrictionComparison", id,
@@ -37896,7 +38117,7 @@ soap_get_ns1__searchDatasetByRestrictionComparison(
   if ((p = soap_in_ns1__searchDatasetByRestrictionComparison(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37911,10 +38132,10 @@ soap_instantiate_ns1__searchDatasetByRestrictionComparison(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionComparison, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionComparison,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetByRestrictionComparison);
     if (size)
@@ -38007,15 +38228,15 @@ soap_in_ns1__searchSampleByParameterLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterLogicalResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByParameterLogicalResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchSampleByParameterLogicalResponse,
       sizeof(ns1__searchSampleByParameterLogicalResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -38048,10 +38269,10 @@ soap_in_ns1__searchSampleByParameterLogicalResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByParameterLogicalResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -38059,7 +38280,7 @@ soap_in_ns1__searchSampleByParameterLogicalResponse(
         sizeof(ns1__searchSampleByParameterLogicalResponse), 0,
         soap_copy_ns1__searchSampleByParameterLogicalResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38067,7 +38288,7 @@ soap_in_ns1__searchSampleByParameterLogicalResponse(
 int ns1__searchSampleByParameterLogicalResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchSampleByParameterLogicalResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchSampleByParameterLogicalResponse",
@@ -38090,7 +38311,7 @@ soap_get_ns1__searchSampleByParameterLogicalResponse(
   if ((p = soap_in_ns1__searchSampleByParameterLogicalResponse(soap, tag, p,
                                                                type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38104,11 +38325,12 @@ soap_instantiate_ns1__searchSampleByParameterLogicalResponse(
                                     "searchSampleByParameterLogicalResponse(%d,"
                                     " %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchSampleByParameterLogicalResponse,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_ns1__searchSampleByParameterLogicalResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByParameterLogicalResponse);
     if (size)
@@ -38151,8 +38373,8 @@ soap_copy_ns1__searchSampleByParameterLogicalResponse(struct soap *soap, int st,
 void ns1__searchSampleByParameterLogical::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchSampleByParameterLogical::sessionId = NULL;
-  this->ns1__searchSampleByParameterLogical::logicalCondition = NULL;
+  this->ns1__searchSampleByParameterLogical::sessionId = nullptr;
+  this->ns1__searchSampleByParameterLogical::logicalCondition = nullptr;
 }
 
 void ns1__searchSampleByParameterLogical::soap_serialize(
@@ -38206,13 +38428,13 @@ soap_in_ns1__searchSampleByParameterLogical(
     struct soap *soap, const char *tag, ns1__searchSampleByParameterLogical *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByParameterLogical *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchSampleByParameterLogical,
       sizeof(ns1__searchSampleByParameterLogical), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -38257,10 +38479,10 @@ soap_in_ns1__searchSampleByParameterLogical(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByParameterLogical *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -38268,7 +38490,7 @@ soap_in_ns1__searchSampleByParameterLogical(
         sizeof(ns1__searchSampleByParameterLogical), 0,
         soap_copy_ns1__searchSampleByParameterLogical);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38276,7 +38498,7 @@ soap_in_ns1__searchSampleByParameterLogical(
 int ns1__searchSampleByParameterLogical::soap_put(struct soap *soap,
                                                   const char *tag,
                                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchSampleByParameterLogical);
   if (this->soap_out(soap, tag ? tag : "ns1:searchSampleByParameterLogical", id,
                      type))
@@ -38296,7 +38518,7 @@ soap_get_ns1__searchSampleByParameterLogical(
     const char *type) {
   if ((p = soap_in_ns1__searchSampleByParameterLogical(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38313,11 +38535,11 @@ soap_instantiate_ns1__searchSampleByParameterLogical(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__searchSampleByParameterLogical(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchSampleByParameterLogical,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchSampleByParameterLogical, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByParameterLogical);
     if (size)
@@ -38389,13 +38611,13 @@ soap_in_ns1__removeDataSetResponse(struct soap *soap, const char *tag,
                                    ns1__removeDataSetResponse *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__removeDataSetResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeDataSetResponse,
             sizeof(ns1__removeDataSetResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -38405,13 +38627,13 @@ soap_in_ns1__removeDataSetResponse(struct soap *soap, const char *tag,
       return (ns1__removeDataSetResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__removeDataSetResponse::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeDataSetResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:removeDataSetResponse", id, type))
     return soap->error;
@@ -38429,7 +38651,7 @@ soap_get_ns1__removeDataSetResponse(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeDataSetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38444,10 +38666,11 @@ soap_instantiate_ns1__removeDataSetResponse(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__removeDataSetResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__removeDataSetResponse, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__removeDataSetResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeDataSetResponse);
     if (size)
@@ -38484,8 +38707,8 @@ soap_copy_ns1__removeDataSetResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__removeDataSet::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__removeDataSet::sessionId = NULL;
-  this->ns1__removeDataSet::dataSetId = NULL;
+  this->ns1__removeDataSet::sessionId = nullptr;
+  this->ns1__removeDataSet::dataSetId = nullptr;
 }
 
 void ns1__removeDataSet::soap_serialize(struct soap *soap) const {
@@ -38530,13 +38753,13 @@ SOAP_FMAC3 ns1__removeDataSet *SOAP_FMAC4
 soap_in_ns1__removeDataSet(struct soap *soap, const char *tag,
                            ns1__removeDataSet *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__removeDataSet *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeDataSet,
       sizeof(ns1__removeDataSet), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__removeDataSet) {
@@ -38578,23 +38801,23 @@ soap_in_ns1__removeDataSet(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__removeDataSet *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__removeDataSet, 0,
         sizeof(ns1__removeDataSet), 0, soap_copy_ns1__removeDataSet);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__removeDataSet::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeDataSet);
   if (this->soap_out(soap, tag ? tag : "ns1:removeDataSet", id, type))
     return soap->error;
@@ -38611,7 +38834,7 @@ soap_get_ns1__removeDataSet(struct soap *soap, ns1__removeDataSet *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeDataSet(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38624,9 +38847,9 @@ soap_instantiate_ns1__removeDataSet(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__removeDataSet(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__removeDataSet, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__removeDataSet, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeDataSet);
     if (size)
@@ -38697,15 +38920,15 @@ soap_in_ns1__modifyDataSetParameterResponse(
     struct soap *soap, const char *tag, ns1__modifyDataSetParameterResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__modifyDataSetParameterResponse *)soap_class_id_enter(
             soap, soap->id, a,
             SOAP_TYPE_ICat3_ns1__modifyDataSetParameterResponse,
             sizeof(ns1__modifyDataSetParameterResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -38716,14 +38939,14 @@ soap_in_ns1__modifyDataSetParameterResponse(
       return (ns1__modifyDataSetParameterResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__modifyDataSetParameterResponse::soap_put(struct soap *soap,
                                                   const char *tag,
                                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifyDataSetParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:modifyDataSetParameterResponse", id,
                      type))
@@ -38743,7 +38966,7 @@ soap_get_ns1__modifyDataSetParameterResponse(
     const char *type) {
   if ((p = soap_in_ns1__modifyDataSetParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38760,11 +38983,11 @@ soap_instantiate_ns1__modifyDataSetParameterResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__modifyDataSetParameterResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__modifyDataSetParameterResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__modifyDataSetParameterResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifyDataSetParameterResponse);
     if (size)
@@ -38804,8 +39027,8 @@ soap_copy_ns1__modifyDataSetParameterResponse(struct soap *soap, int st, int tt,
 void ns1__modifyDataSetParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__modifyDataSetParameter::sessionId = NULL;
-  this->ns1__modifyDataSetParameter::dataSetParameter = NULL;
+  this->ns1__modifyDataSetParameter::sessionId = nullptr;
+  this->ns1__modifyDataSetParameter::dataSetParameter = nullptr;
 }
 
 void ns1__modifyDataSetParameter::soap_serialize(struct soap *soap) const {
@@ -38856,13 +39079,13 @@ soap_in_ns1__modifyDataSetParameter(struct soap *soap, const char *tag,
                                     ns1__modifyDataSetParameter *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__modifyDataSetParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifyDataSetParameter,
       sizeof(ns1__modifyDataSetParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__modifyDataSetParameter) {
@@ -38905,10 +39128,10 @@ soap_in_ns1__modifyDataSetParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__modifyDataSetParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -38916,14 +39139,14 @@ soap_in_ns1__modifyDataSetParameter(struct soap *soap, const char *tag,
         sizeof(ns1__modifyDataSetParameter), 0,
         soap_copy_ns1__modifyDataSetParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__modifyDataSetParameter::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifyDataSetParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:modifyDataSetParameter", id, type))
     return soap->error;
@@ -38941,7 +39164,7 @@ soap_get_ns1__modifyDataSetParameter(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__modifyDataSetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38957,10 +39180,10 @@ soap_instantiate_ns1__modifyDataSetParameter(struct soap *soap, int n,
                    "soap_instantiate_ns1__modifyDataSetParameter(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__modifyDataSetParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__modifyDataSetParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifyDataSetParameter);
     if (size)
@@ -39047,13 +39270,13 @@ soap_in_ns1__listInvestigationTypesResponse(
     struct soap *soap, const char *tag, ns1__listInvestigationTypesResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listInvestigationTypesResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listInvestigationTypesResponse,
       sizeof(ns1__listInvestigationTypesResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -39085,10 +39308,10 @@ soap_in_ns1__listInvestigationTypesResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listInvestigationTypesResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -39096,7 +39319,7 @@ soap_in_ns1__listInvestigationTypesResponse(
         sizeof(ns1__listInvestigationTypesResponse), 0,
         soap_copy_ns1__listInvestigationTypesResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39104,7 +39327,7 @@ soap_in_ns1__listInvestigationTypesResponse(
 int ns1__listInvestigationTypesResponse::soap_put(struct soap *soap,
                                                   const char *tag,
                                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listInvestigationTypesResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:listInvestigationTypesResponse", id,
                      type))
@@ -39124,7 +39347,7 @@ soap_get_ns1__listInvestigationTypesResponse(
     const char *type) {
   if ((p = soap_in_ns1__listInvestigationTypesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39141,11 +39364,11 @@ soap_instantiate_ns1__listInvestigationTypesResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__listInvestigationTypesResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__listInvestigationTypesResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__listInvestigationTypesResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listInvestigationTypesResponse);
     if (size)
@@ -39185,7 +39408,7 @@ soap_copy_ns1__listInvestigationTypesResponse(struct soap *soap, int st, int tt,
 void ns1__listInvestigationTypes::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__listInvestigationTypes::sessionId = NULL;
+  this->ns1__listInvestigationTypes::sessionId = nullptr;
 }
 
 void ns1__listInvestigationTypes::soap_serialize(struct soap *soap) const {
@@ -39230,13 +39453,13 @@ soap_in_ns1__listInvestigationTypes(struct soap *soap, const char *tag,
                                     ns1__listInvestigationTypes *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listInvestigationTypes *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listInvestigationTypes,
       sizeof(ns1__listInvestigationTypes), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listInvestigationTypes) {
@@ -39270,10 +39493,10 @@ soap_in_ns1__listInvestigationTypes(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listInvestigationTypes *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -39281,14 +39504,14 @@ soap_in_ns1__listInvestigationTypes(struct soap *soap, const char *tag,
         sizeof(ns1__listInvestigationTypes), 0,
         soap_copy_ns1__listInvestigationTypes);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__listInvestigationTypes::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listInvestigationTypes);
   if (this->soap_out(soap, tag ? tag : "ns1:listInvestigationTypes", id, type))
     return soap->error;
@@ -39306,7 +39529,7 @@ soap_get_ns1__listInvestigationTypes(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__listInvestigationTypes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39322,10 +39545,10 @@ soap_instantiate_ns1__listInvestigationTypes(struct soap *soap, int n,
                    "soap_instantiate_ns1__listInvestigationTypes(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__listInvestigationTypes, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__listInvestigationTypes, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listInvestigationTypes);
     if (size)
@@ -39410,13 +39633,13 @@ soap_in_ns1__getKeywordsForUserResponse(struct soap *soap, const char *tag,
                                         ns1__getKeywordsForUserResponse *a,
                                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getKeywordsForUserResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getKeywordsForUserResponse,
       sizeof(ns1__getKeywordsForUserResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getKeywordsForUserResponse) {
@@ -39446,10 +39669,10 @@ soap_in_ns1__getKeywordsForUserResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getKeywordsForUserResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -39457,7 +39680,7 @@ soap_in_ns1__getKeywordsForUserResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getKeywordsForUserResponse), 0,
         soap_copy_ns1__getKeywordsForUserResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39465,7 +39688,7 @@ soap_in_ns1__getKeywordsForUserResponse(struct soap *soap, const char *tag,
 int ns1__getKeywordsForUserResponse::soap_put(struct soap *soap,
                                               const char *tag,
                                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getKeywordsForUserResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getKeywordsForUserResponse", id,
                      type))
@@ -39485,7 +39708,7 @@ soap_get_ns1__getKeywordsForUserResponse(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_ns1__getKeywordsForUserResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39502,10 +39725,10 @@ soap_instantiate_ns1__getKeywordsForUserResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__getKeywordsForUserResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getKeywordsForUserResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getKeywordsForUserResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getKeywordsForUserResponse);
     if (size)
@@ -39543,7 +39766,7 @@ soap_copy_ns1__getKeywordsForUserResponse(struct soap *soap, int st, int tt,
 void ns1__getKeywordsForUser::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getKeywordsForUser::sessionId = NULL;
+  this->ns1__getKeywordsForUser::sessionId = nullptr;
 }
 
 void ns1__getKeywordsForUser::soap_serialize(struct soap *soap) const {
@@ -39585,13 +39808,13 @@ SOAP_FMAC3 ns1__getKeywordsForUser *SOAP_FMAC4
 soap_in_ns1__getKeywordsForUser(struct soap *soap, const char *tag,
                                 ns1__getKeywordsForUser *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getKeywordsForUser *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getKeywordsForUser,
       sizeof(ns1__getKeywordsForUser), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getKeywordsForUser) {
@@ -39625,24 +39848,24 @@ soap_in_ns1__getKeywordsForUser(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getKeywordsForUser *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__getKeywordsForUser,
         0, sizeof(ns1__getKeywordsForUser), 0,
         soap_copy_ns1__getKeywordsForUser);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getKeywordsForUser::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getKeywordsForUser);
   if (this->soap_out(soap, tag ? tag : "ns1:getKeywordsForUser", id, type))
     return soap->error;
@@ -39659,7 +39882,7 @@ soap_get_ns1__getKeywordsForUser(struct soap *soap, ns1__getKeywordsForUser *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__getKeywordsForUser(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39674,9 +39897,9 @@ soap_instantiate_ns1__getKeywordsForUser(struct soap *soap, int n,
                       "soap_instantiate_ns1__getKeywordsForUser(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getKeywordsForUser, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getKeywordsForUser, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getKeywordsForUser);
     if (size)
@@ -39763,15 +39986,15 @@ soap_in_ns1__getKeywordsForUserStartWithMaxResponse(
     struct soap *soap, const char *tag,
     ns1__getKeywordsForUserStartWithMaxResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getKeywordsForUserStartWithMaxResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__getKeywordsForUserStartWithMaxResponse,
       sizeof(ns1__getKeywordsForUserStartWithMaxResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -39804,10 +40027,10 @@ soap_in_ns1__getKeywordsForUserStartWithMaxResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getKeywordsForUserStartWithMaxResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -39815,7 +40038,7 @@ soap_in_ns1__getKeywordsForUserStartWithMaxResponse(
         sizeof(ns1__getKeywordsForUserStartWithMaxResponse), 0,
         soap_copy_ns1__getKeywordsForUserStartWithMaxResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39823,7 +40046,7 @@ soap_in_ns1__getKeywordsForUserStartWithMaxResponse(
 int ns1__getKeywordsForUserStartWithMaxResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__getKeywordsForUserStartWithMaxResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:getKeywordsForUserStartWithMaxResponse",
@@ -39846,7 +40069,7 @@ soap_get_ns1__getKeywordsForUserStartWithMaxResponse(
   if ((p = soap_in_ns1__getKeywordsForUserStartWithMaxResponse(soap, tag, p,
                                                                type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39860,11 +40083,12 @@ soap_instantiate_ns1__getKeywordsForUserStartWithMaxResponse(
                                     "getKeywordsForUserStartWithMaxResponse(%d,"
                                     " %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getKeywordsForUserStartWithMaxResponse,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_ns1__getKeywordsForUserStartWithMaxResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getKeywordsForUserStartWithMaxResponse);
     if (size)
@@ -39907,8 +40131,8 @@ soap_copy_ns1__getKeywordsForUserStartWithMaxResponse(struct soap *soap, int st,
 void ns1__getKeywordsForUserStartWithMax::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getKeywordsForUserStartWithMax::sessionId = NULL;
-  this->ns1__getKeywordsForUserStartWithMax::startKeyword = NULL;
+  this->ns1__getKeywordsForUserStartWithMax::sessionId = nullptr;
+  this->ns1__getKeywordsForUserStartWithMax::startKeyword = nullptr;
   soap_default_int(soap,
                    &this->ns1__getKeywordsForUserStartWithMax::numberReturned);
 }
@@ -39971,13 +40195,13 @@ soap_in_ns1__getKeywordsForUserStartWithMax(
     struct soap *soap, const char *tag, ns1__getKeywordsForUserStartWithMax *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getKeywordsForUserStartWithMax *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getKeywordsForUserStartWithMax,
       sizeof(ns1__getKeywordsForUserStartWithMax), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -40032,10 +40256,10 @@ soap_in_ns1__getKeywordsForUserStartWithMax(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getKeywordsForUserStartWithMax *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -40043,11 +40267,11 @@ soap_in_ns1__getKeywordsForUserStartWithMax(
         sizeof(ns1__getKeywordsForUserStartWithMax), 0,
         soap_copy_ns1__getKeywordsForUserStartWithMax);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_numberReturned1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
@@ -40055,7 +40279,7 @@ soap_in_ns1__getKeywordsForUserStartWithMax(
 int ns1__getKeywordsForUserStartWithMax::soap_put(struct soap *soap,
                                                   const char *tag,
                                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getKeywordsForUserStartWithMax);
   if (this->soap_out(soap, tag ? tag : "ns1:getKeywordsForUserStartWithMax", id,
                      type))
@@ -40075,7 +40299,7 @@ soap_get_ns1__getKeywordsForUserStartWithMax(
     const char *type) {
   if ((p = soap_in_ns1__getKeywordsForUserStartWithMax(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -40092,11 +40316,11 @@ soap_instantiate_ns1__getKeywordsForUserStartWithMax(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__getKeywordsForUserStartWithMax(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getKeywordsForUserStartWithMax,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getKeywordsForUserStartWithMax, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getKeywordsForUserStartWithMax);
     if (size)
@@ -40184,13 +40408,13 @@ soap_in_ns1__getKeywordsForUserMaxResponse(
     struct soap *soap, const char *tag, ns1__getKeywordsForUserMaxResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getKeywordsForUserMaxResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getKeywordsForUserMaxResponse,
       sizeof(ns1__getKeywordsForUserMaxResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -40222,10 +40446,10 @@ soap_in_ns1__getKeywordsForUserMaxResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getKeywordsForUserMaxResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -40233,7 +40457,7 @@ soap_in_ns1__getKeywordsForUserMaxResponse(
         sizeof(ns1__getKeywordsForUserMaxResponse), 0,
         soap_copy_ns1__getKeywordsForUserMaxResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -40241,7 +40465,7 @@ soap_in_ns1__getKeywordsForUserMaxResponse(
 int ns1__getKeywordsForUserMaxResponse::soap_put(struct soap *soap,
                                                  const char *tag,
                                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getKeywordsForUserMaxResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getKeywordsForUserMaxResponse", id,
                      type))
@@ -40261,7 +40485,7 @@ soap_get_ns1__getKeywordsForUserMaxResponse(
     const char *type) {
   if ((p = soap_in_ns1__getKeywordsForUserMaxResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -40278,11 +40502,11 @@ soap_instantiate_ns1__getKeywordsForUserMaxResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__getKeywordsForUserMaxResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getKeywordsForUserMaxResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getKeywordsForUserMaxResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getKeywordsForUserMaxResponse);
     if (size)
@@ -40322,7 +40546,7 @@ soap_copy_ns1__getKeywordsForUserMaxResponse(struct soap *soap, int st, int tt,
 void ns1__getKeywordsForUserMax::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getKeywordsForUserMax::sessionId = NULL;
+  this->ns1__getKeywordsForUserMax::sessionId = nullptr;
   soap_default_int(soap, &this->ns1__getKeywordsForUserMax::numberReturned);
 }
 
@@ -40373,13 +40597,13 @@ soap_in_ns1__getKeywordsForUserMax(struct soap *soap, const char *tag,
                                    ns1__getKeywordsForUserMax *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getKeywordsForUserMax *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getKeywordsForUserMax,
       sizeof(ns1__getKeywordsForUserMax), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getKeywordsForUserMax) {
@@ -40421,10 +40645,10 @@ soap_in_ns1__getKeywordsForUserMax(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getKeywordsForUserMax *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -40432,18 +40656,18 @@ soap_in_ns1__getKeywordsForUserMax(struct soap *soap, const char *tag,
         sizeof(ns1__getKeywordsForUserMax), 0,
         soap_copy_ns1__getKeywordsForUserMax);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_numberReturned1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__getKeywordsForUserMax::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getKeywordsForUserMax);
   if (this->soap_out(soap, tag ? tag : "ns1:getKeywordsForUserMax", id, type))
     return soap->error;
@@ -40461,7 +40685,7 @@ soap_get_ns1__getKeywordsForUserMax(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__getKeywordsForUserMax(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -40476,10 +40700,11 @@ soap_instantiate_ns1__getKeywordsForUserMax(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__getKeywordsForUserMax(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getKeywordsForUserMax, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getKeywordsForUserMax, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getKeywordsForUserMax);
     if (size)
@@ -40565,13 +40790,13 @@ soap_in_ns1__getKeywordsForUserTypeResponse(
     struct soap *soap, const char *tag, ns1__getKeywordsForUserTypeResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getKeywordsForUserTypeResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getKeywordsForUserTypeResponse,
       sizeof(ns1__getKeywordsForUserTypeResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -40603,10 +40828,10 @@ soap_in_ns1__getKeywordsForUserTypeResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getKeywordsForUserTypeResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -40614,7 +40839,7 @@ soap_in_ns1__getKeywordsForUserTypeResponse(
         sizeof(ns1__getKeywordsForUserTypeResponse), 0,
         soap_copy_ns1__getKeywordsForUserTypeResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -40622,7 +40847,7 @@ soap_in_ns1__getKeywordsForUserTypeResponse(
 int ns1__getKeywordsForUserTypeResponse::soap_put(struct soap *soap,
                                                   const char *tag,
                                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getKeywordsForUserTypeResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getKeywordsForUserTypeResponse", id,
                      type))
@@ -40642,7 +40867,7 @@ soap_get_ns1__getKeywordsForUserTypeResponse(
     const char *type) {
   if ((p = soap_in_ns1__getKeywordsForUserTypeResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -40659,11 +40884,11 @@ soap_instantiate_ns1__getKeywordsForUserTypeResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__getKeywordsForUserTypeResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getKeywordsForUserTypeResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getKeywordsForUserTypeResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getKeywordsForUserTypeResponse);
     if (size)
@@ -40703,8 +40928,8 @@ soap_copy_ns1__getKeywordsForUserTypeResponse(struct soap *soap, int st, int tt,
 void ns1__getKeywordsForUserType::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getKeywordsForUserType::sessionId = NULL;
-  this->ns1__getKeywordsForUserType::keywordType = NULL;
+  this->ns1__getKeywordsForUserType::sessionId = nullptr;
+  this->ns1__getKeywordsForUserType::keywordType = nullptr;
 }
 
 void ns1__getKeywordsForUserType::soap_serialize(struct soap *soap) const {
@@ -40755,13 +40980,13 @@ soap_in_ns1__getKeywordsForUserType(struct soap *soap, const char *tag,
                                     ns1__getKeywordsForUserType *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getKeywordsForUserType *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getKeywordsForUserType,
       sizeof(ns1__getKeywordsForUserType), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getKeywordsForUserType) {
@@ -40804,10 +41029,10 @@ soap_in_ns1__getKeywordsForUserType(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getKeywordsForUserType *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -40815,14 +41040,14 @@ soap_in_ns1__getKeywordsForUserType(struct soap *soap, const char *tag,
         sizeof(ns1__getKeywordsForUserType), 0,
         soap_copy_ns1__getKeywordsForUserType);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getKeywordsForUserType::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getKeywordsForUserType);
   if (this->soap_out(soap, tag ? tag : "ns1:getKeywordsForUserType", id, type))
     return soap->error;
@@ -40840,7 +41065,7 @@ soap_get_ns1__getKeywordsForUserType(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__getKeywordsForUserType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -40856,10 +41081,10 @@ soap_instantiate_ns1__getKeywordsForUserType(struct soap *soap, int n,
                    "soap_instantiate_ns1__getKeywordsForUserType(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getKeywordsForUserType, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getKeywordsForUserType, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getKeywordsForUserType);
     if (size)
@@ -40944,13 +41169,13 @@ soap_in_ns1__getParameterByNameResponse(struct soap *soap, const char *tag,
                                         ns1__getParameterByNameResponse *a,
                                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getParameterByNameResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getParameterByNameResponse,
       sizeof(ns1__getParameterByNameResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getParameterByNameResponse) {
@@ -40980,10 +41205,10 @@ soap_in_ns1__getParameterByNameResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getParameterByNameResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -40991,7 +41216,7 @@ soap_in_ns1__getParameterByNameResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getParameterByNameResponse), 0,
         soap_copy_ns1__getParameterByNameResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -40999,7 +41224,7 @@ soap_in_ns1__getParameterByNameResponse(struct soap *soap, const char *tag,
 int ns1__getParameterByNameResponse::soap_put(struct soap *soap,
                                               const char *tag,
                                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getParameterByNameResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getParameterByNameResponse", id,
                      type))
@@ -41019,7 +41244,7 @@ soap_get_ns1__getParameterByNameResponse(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_ns1__getParameterByNameResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41036,10 +41261,10 @@ soap_instantiate_ns1__getParameterByNameResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__getParameterByNameResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getParameterByNameResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getParameterByNameResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getParameterByNameResponse);
     if (size)
@@ -41077,8 +41302,8 @@ soap_copy_ns1__getParameterByNameResponse(struct soap *soap, int st, int tt,
 void ns1__getParameterByName::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getParameterByName::sessionId = NULL;
-  this->ns1__getParameterByName::name = NULL;
+  this->ns1__getParameterByName::sessionId = nullptr;
+  this->ns1__getParameterByName::name = nullptr;
 }
 
 void ns1__getParameterByName::soap_serialize(struct soap *soap) const {
@@ -41125,13 +41350,13 @@ SOAP_FMAC3 ns1__getParameterByName *SOAP_FMAC4
 soap_in_ns1__getParameterByName(struct soap *soap, const char *tag,
                                 ns1__getParameterByName *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getParameterByName *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getParameterByName,
       sizeof(ns1__getParameterByName), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getParameterByName) {
@@ -41174,24 +41399,24 @@ soap_in_ns1__getParameterByName(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getParameterByName *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__getParameterByName,
         0, sizeof(ns1__getParameterByName), 0,
         soap_copy_ns1__getParameterByName);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getParameterByName::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getParameterByName);
   if (this->soap_out(soap, tag ? tag : "ns1:getParameterByName", id, type))
     return soap->error;
@@ -41208,7 +41433,7 @@ soap_get_ns1__getParameterByName(struct soap *soap, ns1__getParameterByName *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__getParameterByName(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41223,9 +41448,9 @@ soap_instantiate_ns1__getParameterByName(struct soap *soap, int n,
                       "soap_instantiate_ns1__getParameterByName(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getParameterByName, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getParameterByName, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getParameterByName);
     if (size)
@@ -41261,7 +41486,7 @@ soap_copy_ns1__getParameterByName(struct soap *soap, int st, int tt, void *p,
 void ns1__downloadDatafileResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__downloadDatafileResponse::URL = NULL;
+  this->ns1__downloadDatafileResponse::URL = nullptr;
 }
 
 void ns1__downloadDatafileResponse::soap_serialize(struct soap *soap) const {
@@ -41306,13 +41531,13 @@ soap_in_ns1__downloadDatafileResponse(struct soap *soap, const char *tag,
                                       ns1__downloadDatafileResponse *a,
                                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__downloadDatafileResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__downloadDatafileResponse,
       sizeof(ns1__downloadDatafileResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__downloadDatafileResponse) {
@@ -41346,10 +41571,10 @@ soap_in_ns1__downloadDatafileResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__downloadDatafileResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -41357,14 +41582,14 @@ soap_in_ns1__downloadDatafileResponse(struct soap *soap, const char *tag,
         sizeof(ns1__downloadDatafileResponse), 0,
         soap_copy_ns1__downloadDatafileResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__downloadDatafileResponse::soap_put(struct soap *soap, const char *tag,
                                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__downloadDatafileResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:downloadDatafileResponse", id,
                      type))
@@ -41384,7 +41609,7 @@ soap_get_ns1__downloadDatafileResponse(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_ns1__downloadDatafileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41401,10 +41626,10 @@ soap_instantiate_ns1__downloadDatafileResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__downloadDatafileResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__downloadDatafileResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__downloadDatafileResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__downloadDatafileResponse);
     if (size)
@@ -41442,8 +41667,8 @@ soap_copy_ns1__downloadDatafileResponse(struct soap *soap, int st, int tt,
 void ns1__downloadDatafile::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__downloadDatafile::sessionId = NULL;
-  this->ns1__downloadDatafile::datafileId = NULL;
+  this->ns1__downloadDatafile::sessionId = nullptr;
+  this->ns1__downloadDatafile::datafileId = nullptr;
 }
 
 void ns1__downloadDatafile::soap_serialize(struct soap *soap) const {
@@ -41490,13 +41715,13 @@ SOAP_FMAC3 ns1__downloadDatafile *SOAP_FMAC4
 soap_in_ns1__downloadDatafile(struct soap *soap, const char *tag,
                               ns1__downloadDatafile *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__downloadDatafile *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__downloadDatafile,
       sizeof(ns1__downloadDatafile), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__downloadDatafile) {
@@ -41538,23 +41763,23 @@ soap_in_ns1__downloadDatafile(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__downloadDatafile *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__downloadDatafile,
         0, sizeof(ns1__downloadDatafile), 0, soap_copy_ns1__downloadDatafile);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__downloadDatafile::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__downloadDatafile);
   if (this->soap_out(soap, tag ? tag : "ns1:downloadDatafile", id, type))
     return soap->error;
@@ -41571,7 +41796,7 @@ soap_get_ns1__downloadDatafile(struct soap *soap, ns1__downloadDatafile *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns1__downloadDatafile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41586,9 +41811,9 @@ soap_instantiate_ns1__downloadDatafile(struct soap *soap, int n,
                       "soap_instantiate_ns1__downloadDatafile(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__downloadDatafile, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__downloadDatafile, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__downloadDatafile);
     if (size)
@@ -41657,14 +41882,14 @@ soap_in_ns1__setDataSetSampleResponse(struct soap *soap, const char *tag,
                                       ns1__setDataSetSampleResponse *a,
                                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__setDataSetSampleResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__setDataSetSampleResponse,
             sizeof(ns1__setDataSetSampleResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -41674,13 +41899,13 @@ soap_in_ns1__setDataSetSampleResponse(struct soap *soap, const char *tag,
       return (ns1__setDataSetSampleResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__setDataSetSampleResponse::soap_put(struct soap *soap, const char *tag,
                                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__setDataSetSampleResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:setDataSetSampleResponse", id,
                      type))
@@ -41700,7 +41925,7 @@ soap_get_ns1__setDataSetSampleResponse(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_ns1__setDataSetSampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41717,10 +41942,10 @@ soap_instantiate_ns1__setDataSetSampleResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__setDataSetSampleResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__setDataSetSampleResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__setDataSetSampleResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__setDataSetSampleResponse);
     if (size)
@@ -41758,9 +41983,9 @@ soap_copy_ns1__setDataSetSampleResponse(struct soap *soap, int st, int tt,
 void ns1__setDataSetSample::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__setDataSetSample::sessionId = NULL;
-  this->ns1__setDataSetSample::sampleId = NULL;
-  this->ns1__setDataSetSample::datafileId = NULL;
+  this->ns1__setDataSetSample::sessionId = nullptr;
+  this->ns1__setDataSetSample::sampleId = nullptr;
+  this->ns1__setDataSetSample::datafileId = nullptr;
 }
 
 void ns1__setDataSetSample::soap_serialize(struct soap *soap) const {
@@ -41811,13 +42036,13 @@ SOAP_FMAC3 ns1__setDataSetSample *SOAP_FMAC4
 soap_in_ns1__setDataSetSample(struct soap *soap, const char *tag,
                               ns1__setDataSetSample *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__setDataSetSample *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__setDataSetSample,
       sizeof(ns1__setDataSetSample), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__setDataSetSample) {
@@ -41867,23 +42092,23 @@ soap_in_ns1__setDataSetSample(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__setDataSetSample *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__setDataSetSample,
         0, sizeof(ns1__setDataSetSample), 0, soap_copy_ns1__setDataSetSample);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__setDataSetSample::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__setDataSetSample);
   if (this->soap_out(soap, tag ? tag : "ns1:setDataSetSample", id, type))
     return soap->error;
@@ -41900,7 +42125,7 @@ soap_get_ns1__setDataSetSample(struct soap *soap, ns1__setDataSetSample *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns1__setDataSetSample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41915,9 +42140,9 @@ soap_instantiate_ns1__setDataSetSample(struct soap *soap, int n,
                       "soap_instantiate_ns1__setDataSetSample(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__setDataSetSample, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__setDataSetSample, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__setDataSetSample);
     if (size)
@@ -41988,15 +42213,15 @@ soap_in_ns1__deleteDataSetParameterResponse(
     struct soap *soap, const char *tag, ns1__deleteDataSetParameterResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__deleteDataSetParameterResponse *)soap_class_id_enter(
             soap, soap->id, a,
             SOAP_TYPE_ICat3_ns1__deleteDataSetParameterResponse,
             sizeof(ns1__deleteDataSetParameterResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -42007,14 +42232,14 @@ soap_in_ns1__deleteDataSetParameterResponse(
       return (ns1__deleteDataSetParameterResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__deleteDataSetParameterResponse::soap_put(struct soap *soap,
                                                   const char *tag,
                                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteDataSetParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteDataSetParameterResponse", id,
                      type))
@@ -42034,7 +42259,7 @@ soap_get_ns1__deleteDataSetParameterResponse(
     const char *type) {
   if ((p = soap_in_ns1__deleteDataSetParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42051,11 +42276,11 @@ soap_instantiate_ns1__deleteDataSetParameterResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__deleteDataSetParameterResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__deleteDataSetParameterResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteDataSetParameterResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteDataSetParameterResponse);
     if (size)
@@ -42095,8 +42320,8 @@ soap_copy_ns1__deleteDataSetParameterResponse(struct soap *soap, int st, int tt,
 void ns1__deleteDataSetParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__deleteDataSetParameter::sessionId = NULL;
-  this->ns1__deleteDataSetParameter::datasetParameterPK = NULL;
+  this->ns1__deleteDataSetParameter::sessionId = nullptr;
+  this->ns1__deleteDataSetParameter::datasetParameterPK = nullptr;
 }
 
 void ns1__deleteDataSetParameter::soap_serialize(struct soap *soap) const {
@@ -42147,13 +42372,13 @@ soap_in_ns1__deleteDataSetParameter(struct soap *soap, const char *tag,
                                     ns1__deleteDataSetParameter *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__deleteDataSetParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteDataSetParameter,
       sizeof(ns1__deleteDataSetParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__deleteDataSetParameter) {
@@ -42196,10 +42421,10 @@ soap_in_ns1__deleteDataSetParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__deleteDataSetParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -42207,14 +42432,14 @@ soap_in_ns1__deleteDataSetParameter(struct soap *soap, const char *tag,
         sizeof(ns1__deleteDataSetParameter), 0,
         soap_copy_ns1__deleteDataSetParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__deleteDataSetParameter::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteDataSetParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteDataSetParameter", id, type))
     return soap->error;
@@ -42232,7 +42457,7 @@ soap_get_ns1__deleteDataSetParameter(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteDataSetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42248,10 +42473,10 @@ soap_instantiate_ns1__deleteDataSetParameter(struct soap *soap, int n,
                    "soap_instantiate_ns1__deleteDataSetParameter(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__deleteDataSetParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteDataSetParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteDataSetParameter);
     if (size)
@@ -42323,15 +42548,15 @@ soap_in_ns1__removeSampleParameterResponse(
     struct soap *soap, const char *tag, ns1__removeSampleParameterResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__removeSampleParameterResponse *)soap_class_id_enter(
             soap, soap->id, a,
             SOAP_TYPE_ICat3_ns1__removeSampleParameterResponse,
             sizeof(ns1__removeSampleParameterResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -42341,14 +42566,14 @@ soap_in_ns1__removeSampleParameterResponse(
       return (ns1__removeSampleParameterResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__removeSampleParameterResponse::soap_put(struct soap *soap,
                                                  const char *tag,
                                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeSampleParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:removeSampleParameterResponse", id,
                      type))
@@ -42368,7 +42593,7 @@ soap_get_ns1__removeSampleParameterResponse(
     const char *type) {
   if ((p = soap_in_ns1__removeSampleParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42385,11 +42610,11 @@ soap_instantiate_ns1__removeSampleParameterResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__removeSampleParameterResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__removeSampleParameterResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__removeSampleParameterResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeSampleParameterResponse);
     if (size)
@@ -42429,8 +42654,8 @@ soap_copy_ns1__removeSampleParameterResponse(struct soap *soap, int st, int tt,
 void ns1__removeSampleParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__removeSampleParameter::sessionId = NULL;
-  this->ns1__removeSampleParameter::sampleParameterPK = NULL;
+  this->ns1__removeSampleParameter::sessionId = nullptr;
+  this->ns1__removeSampleParameter::sampleParameterPK = nullptr;
 }
 
 void ns1__removeSampleParameter::soap_serialize(struct soap *soap) const {
@@ -42481,13 +42706,13 @@ soap_in_ns1__removeSampleParameter(struct soap *soap, const char *tag,
                                    ns1__removeSampleParameter *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__removeSampleParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeSampleParameter,
       sizeof(ns1__removeSampleParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__removeSampleParameter) {
@@ -42530,10 +42755,10 @@ soap_in_ns1__removeSampleParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__removeSampleParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -42541,14 +42766,14 @@ soap_in_ns1__removeSampleParameter(struct soap *soap, const char *tag,
         sizeof(ns1__removeSampleParameter), 0,
         soap_copy_ns1__removeSampleParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__removeSampleParameter::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeSampleParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:removeSampleParameter", id, type))
     return soap->error;
@@ -42566,7 +42791,7 @@ soap_get_ns1__removeSampleParameter(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeSampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42581,10 +42806,11 @@ soap_instantiate_ns1__removeSampleParameter(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__removeSampleParameter(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__removeSampleParameter, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__removeSampleParameter, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeSampleParameter);
     if (size)
@@ -42676,8 +42902,8 @@ soap_in_ns1__searchInvestigationByRestrictionLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByRestrictionLogicalResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByRestrictionLogicalResponse *)
       soap_class_id_enter(
           soap, soap->id, a,
@@ -42685,7 +42911,7 @@ soap_in_ns1__searchInvestigationByRestrictionLogicalResponse(
           sizeof(ns1__searchInvestigationByRestrictionLogicalResponse),
           soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -42719,10 +42945,10 @@ soap_in_ns1__searchInvestigationByRestrictionLogicalResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByRestrictionLogicalResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -42730,7 +42956,7 @@ soap_in_ns1__searchInvestigationByRestrictionLogicalResponse(
         sizeof(ns1__searchInvestigationByRestrictionLogicalResponse), 0,
         soap_copy_ns1__searchInvestigationByRestrictionLogicalResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42738,7 +42964,7 @@ soap_in_ns1__searchInvestigationByRestrictionLogicalResponse(
 int ns1__searchInvestigationByRestrictionLogicalResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionLogicalResponse);
   if (this->soap_out(
           soap,
@@ -42761,7 +42987,7 @@ soap_get_ns1__searchInvestigationByRestrictionLogicalResponse(
   if ((p = soap_in_ns1__searchInvestigationByRestrictionLogicalResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42776,11 +43002,11 @@ soap_instantiate_ns1__searchInvestigationByRestrictionLogicalResponse(
                                     "ponse(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionLogicalResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(ns1__searchInvestigationByRestrictionLogicalResponse);
@@ -42826,8 +43052,8 @@ void ns1__searchInvestigationByRestrictionLogical::soap_default(
     struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchInvestigationByRestrictionLogical::sessionId = NULL;
-  this->ns1__searchInvestigationByRestrictionLogical::restriction = NULL;
+  this->ns1__searchInvestigationByRestrictionLogical::sessionId = nullptr;
+  this->ns1__searchInvestigationByRestrictionLogical::restriction = nullptr;
 }
 
 void ns1__searchInvestigationByRestrictionLogical::soap_serialize(
@@ -42882,15 +43108,15 @@ soap_in_ns1__searchInvestigationByRestrictionLogical(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByRestrictionLogical *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByRestrictionLogical *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionLogical,
       sizeof(ns1__searchInvestigationByRestrictionLogical), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -42936,10 +43162,10 @@ soap_in_ns1__searchInvestigationByRestrictionLogical(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByRestrictionLogical *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -42947,7 +43173,7 @@ soap_in_ns1__searchInvestigationByRestrictionLogical(
         sizeof(ns1__searchInvestigationByRestrictionLogical), 0,
         soap_copy_ns1__searchInvestigationByRestrictionLogical);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42955,7 +43181,7 @@ soap_in_ns1__searchInvestigationByRestrictionLogical(
 int ns1__searchInvestigationByRestrictionLogical::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionLogical);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchInvestigationByRestrictionLogical",
@@ -42978,7 +43204,7 @@ soap_get_ns1__searchInvestigationByRestrictionLogical(
   if ((p = soap_in_ns1__searchInvestigationByRestrictionLogical(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42992,11 +43218,12 @@ soap_instantiate_ns1__searchInvestigationByRestrictionLogical(
                                     "searchInvestigationByRestrictionLogical(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionLogical,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionLogical, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchInvestigationByRestrictionLogical);
     if (size)
@@ -43093,15 +43320,15 @@ soap_in_ns1__searchDatafileByParameterRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterRestrictionResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByParameterRestrictionResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterRestrictionResponse,
       sizeof(ns1__searchDatafileByParameterRestrictionResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -43135,10 +43362,10 @@ soap_in_ns1__searchDatafileByParameterRestrictionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByParameterRestrictionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -43146,7 +43373,7 @@ soap_in_ns1__searchDatafileByParameterRestrictionResponse(
         sizeof(ns1__searchDatafileByParameterRestrictionResponse), 0,
         soap_copy_ns1__searchDatafileByParameterRestrictionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -43154,7 +43381,7 @@ soap_in_ns1__searchDatafileByParameterRestrictionResponse(
 int ns1__searchDatafileByParameterRestrictionResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterRestrictionResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchDatafileByParameterRestrictionResponse",
@@ -43176,7 +43403,7 @@ soap_get_ns1__searchDatafileByParameterRestrictionResponse(
   if ((p = soap_in_ns1__searchDatafileByParameterRestrictionResponse(soap, tag,
                                                                      p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43191,11 +43418,11 @@ soap_instantiate_ns1__searchDatafileByParameterRestrictionResponse(
                                     "se(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterRestrictionResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(ns1__searchDatafileByParameterRestrictionResponse);
@@ -43242,9 +43469,9 @@ void ns1__searchDatafileByParameterRestriction::soap_default(
     struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatafileByParameterRestriction::sessionId = NULL;
-  this->ns1__searchDatafileByParameterRestriction::parameterCondition = NULL;
-  this->ns1__searchDatafileByParameterRestriction::restrictions = NULL;
+  this->ns1__searchDatafileByParameterRestriction::sessionId = nullptr;
+  this->ns1__searchDatafileByParameterRestriction::parameterCondition = nullptr;
+  this->ns1__searchDatafileByParameterRestriction::restrictions = nullptr;
 }
 
 void ns1__searchDatafileByParameterRestriction::soap_serialize(
@@ -43307,15 +43534,15 @@ soap_in_ns1__searchDatafileByParameterRestriction(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterRestriction *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByParameterRestriction *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterRestriction,
       sizeof(ns1__searchDatafileByParameterRestriction), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -43371,10 +43598,10 @@ soap_in_ns1__searchDatafileByParameterRestriction(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByParameterRestriction *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -43382,7 +43609,7 @@ soap_in_ns1__searchDatafileByParameterRestriction(
         sizeof(ns1__searchDatafileByParameterRestriction), 0,
         soap_copy_ns1__searchDatafileByParameterRestriction);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -43390,7 +43617,7 @@ soap_in_ns1__searchDatafileByParameterRestriction(
 int ns1__searchDatafileByParameterRestriction::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchDatafileByParameterRestriction);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchDatafileByParameterRestriction", id,
@@ -43413,7 +43640,7 @@ soap_get_ns1__searchDatafileByParameterRestriction(
   if ((p = soap_in_ns1__searchDatafileByParameterRestriction(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43428,10 +43655,10 @@ soap_instantiate_ns1__searchDatafileByParameterRestriction(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatafileByParameterRestriction, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatafileByParameterRestriction,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatafileByParameterRestriction);
     if (size)
@@ -43473,7 +43700,7 @@ soap_copy_ns1__searchDatafileByParameterRestriction(struct soap *soap, int st,
 void ns1__createDataSetResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__createDataSetResponse::return_ = NULL;
+  this->ns1__createDataSetResponse::return_ = nullptr;
 }
 
 void ns1__createDataSetResponse::soap_serialize(struct soap *soap) const {
@@ -43517,13 +43744,13 @@ soap_in_ns1__createDataSetResponse(struct soap *soap, const char *tag,
                                    ns1__createDataSetResponse *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__createDataSetResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__createDataSetResponse,
       sizeof(ns1__createDataSetResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__createDataSetResponse) {
@@ -43556,10 +43783,10 @@ soap_in_ns1__createDataSetResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__createDataSetResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -43567,14 +43794,14 @@ soap_in_ns1__createDataSetResponse(struct soap *soap, const char *tag,
         sizeof(ns1__createDataSetResponse), 0,
         soap_copy_ns1__createDataSetResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__createDataSetResponse::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__createDataSetResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:createDataSetResponse", id, type))
     return soap->error;
@@ -43592,7 +43819,7 @@ soap_get_ns1__createDataSetResponse(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__createDataSetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43607,10 +43834,11 @@ soap_instantiate_ns1__createDataSetResponse(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__createDataSetResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__createDataSetResponse, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__createDataSetResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__createDataSetResponse);
     if (size)
@@ -43647,9 +43875,9 @@ soap_copy_ns1__createDataSetResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__createDataSet::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__createDataSet::sessionId = NULL;
-  this->ns1__createDataSet::dataSet = NULL;
-  this->ns1__createDataSet::investigationId = NULL;
+  this->ns1__createDataSet::sessionId = nullptr;
+  this->ns1__createDataSet::dataSet = nullptr;
+  this->ns1__createDataSet::investigationId = nullptr;
 }
 
 void ns1__createDataSet::soap_serialize(struct soap *soap) const {
@@ -43700,13 +43928,13 @@ SOAP_FMAC3 ns1__createDataSet *SOAP_FMAC4
 soap_in_ns1__createDataSet(struct soap *soap, const char *tag,
                            ns1__createDataSet *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__createDataSet *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__createDataSet,
       sizeof(ns1__createDataSet), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__createDataSet) {
@@ -43756,23 +43984,23 @@ soap_in_ns1__createDataSet(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__createDataSet *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__createDataSet, 0,
         sizeof(ns1__createDataSet), 0, soap_copy_ns1__createDataSet);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__createDataSet::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__createDataSet);
   if (this->soap_out(soap, tag ? tag : "ns1:createDataSet", id, type))
     return soap->error;
@@ -43789,7 +44017,7 @@ soap_get_ns1__createDataSet(struct soap *soap, ns1__createDataSet *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__createDataSet(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43802,9 +44030,9 @@ soap_instantiate_ns1__createDataSet(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__createDataSet(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__createDataSet, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__createDataSet, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__createDataSet);
     if (size)
@@ -43892,15 +44120,15 @@ soap_in_ns1__searchDatafileByParameterLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterLogicalResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByParameterLogicalResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterLogicalResponse,
       sizeof(ns1__searchDatafileByParameterLogicalResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -43933,10 +44161,10 @@ soap_in_ns1__searchDatafileByParameterLogicalResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByParameterLogicalResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -43944,7 +44172,7 @@ soap_in_ns1__searchDatafileByParameterLogicalResponse(
         sizeof(ns1__searchDatafileByParameterLogicalResponse), 0,
         soap_copy_ns1__searchDatafileByParameterLogicalResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -43952,7 +44180,7 @@ soap_in_ns1__searchDatafileByParameterLogicalResponse(
 int ns1__searchDatafileByParameterLogicalResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchDatafileByParameterLogicalResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchDatafileByParameterLogicalResponse",
@@ -43974,7 +44202,7 @@ soap_get_ns1__searchDatafileByParameterLogicalResponse(
   if ((p = soap_in_ns1__searchDatafileByParameterLogicalResponse(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43988,11 +44216,12 @@ soap_instantiate_ns1__searchDatafileByParameterLogicalResponse(
                                     "searchDatafileByParameterLogicalResponse(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatafileByParameterLogicalResponse,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_ns1__searchDatafileByParameterLogicalResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatafileByParameterLogicalResponse);
     if (size)
@@ -44037,8 +44266,8 @@ soap_copy_ns1__searchDatafileByParameterLogicalResponse(struct soap *soap,
 void ns1__searchDatafileByParameterLogical::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatafileByParameterLogical::sessionId = NULL;
-  this->ns1__searchDatafileByParameterLogical::logicalCondition = NULL;
+  this->ns1__searchDatafileByParameterLogical::sessionId = nullptr;
+  this->ns1__searchDatafileByParameterLogical::logicalCondition = nullptr;
 }
 
 void ns1__searchDatafileByParameterLogical::soap_serialize(
@@ -44092,14 +44321,14 @@ soap_in_ns1__searchDatafileByParameterLogical(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterLogical *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByParameterLogical *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchDatafileByParameterLogical,
       sizeof(ns1__searchDatafileByParameterLogical), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -44145,10 +44374,10 @@ soap_in_ns1__searchDatafileByParameterLogical(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByParameterLogical *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -44156,7 +44385,7 @@ soap_in_ns1__searchDatafileByParameterLogical(
         sizeof(ns1__searchDatafileByParameterLogical), 0,
         soap_copy_ns1__searchDatafileByParameterLogical);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -44164,7 +44393,7 @@ soap_in_ns1__searchDatafileByParameterLogical(
 int ns1__searchDatafileByParameterLogical::soap_put(struct soap *soap,
                                                     const char *tag,
                                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterLogical);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatafileByParameterLogical",
                      id, type))
@@ -44184,7 +44413,7 @@ soap_get_ns1__searchDatafileByParameterLogical(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchDatafileByParameterLogical(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -44200,10 +44429,10 @@ soap_instantiate_ns1__searchDatafileByParameterLogical(struct soap *soap, int n,
                               "searchDatafileByParameterLogical(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatafileByParameterLogical, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatafileByParameterLogical, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatafileByParameterLogical);
     if (size)
@@ -44243,7 +44472,7 @@ soap_copy_ns1__searchDatafileByParameterLogical(struct soap *soap, int st,
 void ns1__addInvestigatorResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addInvestigatorResponse::return_ = NULL;
+  this->ns1__addInvestigatorResponse::return_ = nullptr;
 }
 
 void ns1__addInvestigatorResponse::soap_serialize(struct soap *soap) const {
@@ -44288,13 +44517,13 @@ soap_in_ns1__addInvestigatorResponse(struct soap *soap, const char *tag,
                                      ns1__addInvestigatorResponse *a,
                                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addInvestigatorResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addInvestigatorResponse,
       sizeof(ns1__addInvestigatorResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addInvestigatorResponse) {
@@ -44327,10 +44556,10 @@ soap_in_ns1__addInvestigatorResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addInvestigatorResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -44338,14 +44567,14 @@ soap_in_ns1__addInvestigatorResponse(struct soap *soap, const char *tag,
         sizeof(ns1__addInvestigatorResponse), 0,
         soap_copy_ns1__addInvestigatorResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addInvestigatorResponse::soap_put(struct soap *soap, const char *tag,
                                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addInvestigatorResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:addInvestigatorResponse", id, type))
     return soap->error;
@@ -44363,7 +44592,7 @@ soap_get_ns1__addInvestigatorResponse(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in_ns1__addInvestigatorResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -44380,10 +44609,10 @@ soap_instantiate_ns1__addInvestigatorResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__addInvestigatorResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__addInvestigatorResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__addInvestigatorResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addInvestigatorResponse);
     if (size)
@@ -44421,9 +44650,9 @@ soap_copy_ns1__addInvestigatorResponse(struct soap *soap, int st, int tt,
 void ns1__addInvestigator::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addInvestigator::sessionId = NULL;
-  this->ns1__addInvestigator::ns1__investigator_ = NULL;
-  this->ns1__addInvestigator::investigationId = NULL;
+  this->ns1__addInvestigator::sessionId = nullptr;
+  this->ns1__addInvestigator::ns1__investigator_ = nullptr;
+  this->ns1__addInvestigator::investigationId = nullptr;
 }
 
 void ns1__addInvestigator::soap_serialize(struct soap *soap) const {
@@ -44475,13 +44704,13 @@ SOAP_FMAC3 ns1__addInvestigator *SOAP_FMAC4
 soap_in_ns1__addInvestigator(struct soap *soap, const char *tag,
                              ns1__addInvestigator *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addInvestigator *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addInvestigator,
       sizeof(ns1__addInvestigator), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addInvestigator) {
@@ -44532,23 +44761,23 @@ soap_in_ns1__addInvestigator(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addInvestigator *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__addInvestigator, 0,
         sizeof(ns1__addInvestigator), 0, soap_copy_ns1__addInvestigator);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addInvestigator::soap_put(struct soap *soap, const char *tag,
                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addInvestigator);
   if (this->soap_out(soap, tag ? tag : "ns1:addInvestigator", id, type))
     return soap->error;
@@ -44565,7 +44794,7 @@ soap_get_ns1__addInvestigator(struct soap *soap, ns1__addInvestigator *p,
                               const char *tag, const char *type) {
   if ((p = soap_in_ns1__addInvestigator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -44580,9 +44809,9 @@ soap_instantiate_ns1__addInvestigator(struct soap *soap, int n,
                       "soap_instantiate_ns1__addInvestigator(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__addInvestigator, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__addInvestigator, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addInvestigator);
     if (size)
@@ -44651,14 +44880,14 @@ soap_in_ns1__deleteInvestigatorResponse(struct soap *soap, const char *tag,
                                         ns1__deleteInvestigatorResponse *a,
                                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__deleteInvestigatorResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteInvestigatorResponse,
             sizeof(ns1__deleteInvestigatorResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -44668,14 +44897,14 @@ soap_in_ns1__deleteInvestigatorResponse(struct soap *soap, const char *tag,
       return (ns1__deleteInvestigatorResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__deleteInvestigatorResponse::soap_put(struct soap *soap,
                                               const char *tag,
                                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteInvestigatorResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteInvestigatorResponse", id,
                      type))
@@ -44695,7 +44924,7 @@ soap_get_ns1__deleteInvestigatorResponse(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteInvestigatorResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -44712,10 +44941,10 @@ soap_instantiate_ns1__deleteInvestigatorResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__deleteInvestigatorResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__deleteInvestigatorResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteInvestigatorResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteInvestigatorResponse);
     if (size)
@@ -44753,8 +44982,8 @@ soap_copy_ns1__deleteInvestigatorResponse(struct soap *soap, int st, int tt,
 void ns1__deleteInvestigator::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__deleteInvestigator::sessionId = NULL;
-  this->ns1__deleteInvestigator::investigatorPK = NULL;
+  this->ns1__deleteInvestigator::sessionId = nullptr;
+  this->ns1__deleteInvestigator::investigatorPK = nullptr;
 }
 
 void ns1__deleteInvestigator::soap_serialize(struct soap *soap) const {
@@ -44802,13 +45031,13 @@ SOAP_FMAC3 ns1__deleteInvestigator *SOAP_FMAC4
 soap_in_ns1__deleteInvestigator(struct soap *soap, const char *tag,
                                 ns1__deleteInvestigator *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__deleteInvestigator *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteInvestigator,
       sizeof(ns1__deleteInvestigator), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__deleteInvestigator) {
@@ -44851,24 +45080,24 @@ soap_in_ns1__deleteInvestigator(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__deleteInvestigator *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__deleteInvestigator,
         0, sizeof(ns1__deleteInvestigator), 0,
         soap_copy_ns1__deleteInvestigator);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__deleteInvestigator::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteInvestigator);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteInvestigator", id, type))
     return soap->error;
@@ -44885,7 +45114,7 @@ soap_get_ns1__deleteInvestigator(struct soap *soap, ns1__deleteInvestigator *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteInvestigator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -44900,9 +45129,9 @@ soap_instantiate_ns1__deleteInvestigator(struct soap *soap, int n,
                       "soap_instantiate_ns1__deleteInvestigator(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__deleteInvestigator, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteInvestigator, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteInvestigator);
     if (size)
@@ -44990,15 +45219,15 @@ soap_in_ns1__searchInvestigationByRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByRestrictionResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByRestrictionResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionResponse,
       sizeof(ns1__searchInvestigationByRestrictionResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -45031,10 +45260,10 @@ soap_in_ns1__searchInvestigationByRestrictionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByRestrictionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -45042,7 +45271,7 @@ soap_in_ns1__searchInvestigationByRestrictionResponse(
         sizeof(ns1__searchInvestigationByRestrictionResponse), 0,
         soap_copy_ns1__searchInvestigationByRestrictionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -45050,7 +45279,7 @@ soap_in_ns1__searchInvestigationByRestrictionResponse(
 int ns1__searchInvestigationByRestrictionResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchInvestigationByRestrictionResponse",
@@ -45072,7 +45301,7 @@ soap_get_ns1__searchInvestigationByRestrictionResponse(
   if ((p = soap_in_ns1__searchInvestigationByRestrictionResponse(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -45086,11 +45315,12 @@ soap_instantiate_ns1__searchInvestigationByRestrictionResponse(
                                     "searchInvestigationByRestrictionResponse(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionResponse,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchInvestigationByRestrictionResponse);
     if (size)
@@ -45135,8 +45365,8 @@ soap_copy_ns1__searchInvestigationByRestrictionResponse(struct soap *soap,
 void ns1__searchInvestigationByRestriction::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchInvestigationByRestriction::sessionId = NULL;
-  this->ns1__searchInvestigationByRestriction::restriction = NULL;
+  this->ns1__searchInvestigationByRestriction::sessionId = nullptr;
+  this->ns1__searchInvestigationByRestriction::restriction = nullptr;
 }
 
 void ns1__searchInvestigationByRestriction::soap_serialize(
@@ -45190,14 +45420,14 @@ soap_in_ns1__searchInvestigationByRestriction(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByRestriction *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByRestriction *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchInvestigationByRestriction,
       sizeof(ns1__searchInvestigationByRestriction), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -45243,10 +45473,10 @@ soap_in_ns1__searchInvestigationByRestriction(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByRestriction *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -45254,7 +45484,7 @@ soap_in_ns1__searchInvestigationByRestriction(
         sizeof(ns1__searchInvestigationByRestriction), 0,
         soap_copy_ns1__searchInvestigationByRestriction);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -45262,7 +45492,7 @@ soap_in_ns1__searchInvestigationByRestriction(
 int ns1__searchInvestigationByRestriction::soap_put(struct soap *soap,
                                                     const char *tag,
                                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestriction);
   if (this->soap_out(soap, tag ? tag : "ns1:searchInvestigationByRestriction",
                      id, type))
@@ -45282,7 +45512,7 @@ soap_get_ns1__searchInvestigationByRestriction(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchInvestigationByRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -45298,10 +45528,10 @@ soap_instantiate_ns1__searchInvestigationByRestriction(struct soap *soap, int n,
                               "searchInvestigationByRestriction(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchInvestigationByRestriction, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchInvestigationByRestriction, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchInvestigationByRestriction);
     if (size)
@@ -45341,7 +45571,7 @@ soap_copy_ns1__searchInvestigationByRestriction(struct soap *soap, int st,
 void ns1__getICATAPIVersionResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getICATAPIVersionResponse::return_ = NULL;
+  this->ns1__getICATAPIVersionResponse::return_ = nullptr;
 }
 
 void ns1__getICATAPIVersionResponse::soap_serialize(struct soap *soap) const {
@@ -45388,13 +45618,13 @@ soap_in_ns1__getICATAPIVersionResponse(struct soap *soap, const char *tag,
                                        ns1__getICATAPIVersionResponse *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getICATAPIVersionResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getICATAPIVersionResponse,
       sizeof(ns1__getICATAPIVersionResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getICATAPIVersionResponse) {
@@ -45428,10 +45658,10 @@ soap_in_ns1__getICATAPIVersionResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getICATAPIVersionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -45439,14 +45669,14 @@ soap_in_ns1__getICATAPIVersionResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getICATAPIVersionResponse), 0,
         soap_copy_ns1__getICATAPIVersionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getICATAPIVersionResponse::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getICATAPIVersionResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getICATAPIVersionResponse", id,
                      type))
@@ -45466,7 +45696,7 @@ soap_get_ns1__getICATAPIVersionResponse(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__getICATAPIVersionResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -45483,10 +45713,10 @@ soap_instantiate_ns1__getICATAPIVersionResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__getICATAPIVersionResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getICATAPIVersionResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getICATAPIVersionResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getICATAPIVersionResponse);
     if (size)
@@ -45524,7 +45754,7 @@ soap_copy_ns1__getICATAPIVersionResponse(struct soap *soap, int st, int tt,
 void ns1__getICATAPIVersion::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getICATAPIVersion::sessionId = NULL;
+  this->ns1__getICATAPIVersion::sessionId = nullptr;
 }
 
 void ns1__getICATAPIVersion::soap_serialize(struct soap *soap) const {
@@ -45566,13 +45796,13 @@ SOAP_FMAC3 ns1__getICATAPIVersion *SOAP_FMAC4
 soap_in_ns1__getICATAPIVersion(struct soap *soap, const char *tag,
                                ns1__getICATAPIVersion *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getICATAPIVersion *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getICATAPIVersion,
       sizeof(ns1__getICATAPIVersion), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getICATAPIVersion) {
@@ -45606,23 +45836,23 @@ soap_in_ns1__getICATAPIVersion(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getICATAPIVersion *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__getICATAPIVersion,
         0, sizeof(ns1__getICATAPIVersion), 0, soap_copy_ns1__getICATAPIVersion);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getICATAPIVersion::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getICATAPIVersion);
   if (this->soap_out(soap, tag ? tag : "ns1:getICATAPIVersion", id, type))
     return soap->error;
@@ -45639,7 +45869,7 @@ soap_get_ns1__getICATAPIVersion(struct soap *soap, ns1__getICATAPIVersion *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__getICATAPIVersion(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -45654,9 +45884,9 @@ soap_instantiate_ns1__getICATAPIVersion(struct soap *soap, int n,
                       "soap_instantiate_ns1__getICATAPIVersion(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getICATAPIVersion, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getICATAPIVersion, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getICATAPIVersion);
     if (size)
@@ -45737,13 +45967,13 @@ soap_in_ns1__getDatafilesResponse(struct soap *soap, const char *tag,
                                   ns1__getDatafilesResponse *a,
                                   const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getDatafilesResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getDatafilesResponse,
       sizeof(ns1__getDatafilesResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getDatafilesResponse) {
@@ -45773,10 +46003,10 @@ soap_in_ns1__getDatafilesResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getDatafilesResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -45784,14 +46014,14 @@ soap_in_ns1__getDatafilesResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getDatafilesResponse), 0,
         soap_copy_ns1__getDatafilesResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getDatafilesResponse::soap_put(struct soap *soap, const char *tag,
                                         const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getDatafilesResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getDatafilesResponse", id, type))
     return soap->error;
@@ -45809,7 +46039,7 @@ soap_get_ns1__getDatafilesResponse(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in_ns1__getDatafilesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -45824,10 +46054,11 @@ soap_instantiate_ns1__getDatafilesResponse(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate_ns1__getDatafilesResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getDatafilesResponse, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getDatafilesResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getDatafilesResponse);
     if (size)
@@ -45864,7 +46095,7 @@ soap_copy_ns1__getDatafilesResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__getDatafiles::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getDatafiles::sessionId = NULL;
+  this->ns1__getDatafiles::sessionId = nullptr;
   soap_default_std__vectorTemplateOfLONG64(
       soap, &this->ns1__getDatafiles::datafileIds);
 }
@@ -45912,13 +46143,13 @@ SOAP_FMAC3 ns1__getDatafiles *SOAP_FMAC4
 soap_in_ns1__getDatafiles(struct soap *soap, const char *tag,
                           ns1__getDatafiles *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getDatafiles *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getDatafiles,
       sizeof(ns1__getDatafiles), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getDatafiles) {
@@ -45957,23 +46188,23 @@ soap_in_ns1__getDatafiles(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getDatafiles *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__getDatafiles, 0,
         sizeof(ns1__getDatafiles), 0, soap_copy_ns1__getDatafiles);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getDatafiles::soap_put(struct soap *soap, const char *tag,
                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getDatafiles);
   if (this->soap_out(soap, tag ? tag : "ns1:getDatafiles", id, type))
     return soap->error;
@@ -45990,7 +46221,7 @@ soap_get_ns1__getDatafiles(struct soap *soap, ns1__getDatafiles *p,
                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__getDatafiles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -46003,9 +46234,9 @@ soap_instantiate_ns1__getDatafiles(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__getDatafiles(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getDatafiles, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getDatafiles, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getDatafiles);
     if (size)
@@ -46083,13 +46314,13 @@ soap_in_ns1__isSessionValidResponse(struct soap *soap, const char *tag,
                                     ns1__isSessionValidResponse *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__isSessionValidResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__isSessionValidResponse,
       sizeof(ns1__isSessionValidResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__isSessionValidResponse) {
@@ -46122,10 +46353,10 @@ soap_in_ns1__isSessionValidResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__isSessionValidResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -46133,18 +46364,18 @@ soap_in_ns1__isSessionValidResponse(struct soap *soap, const char *tag,
         sizeof(ns1__isSessionValidResponse), 0,
         soap_copy_ns1__isSessionValidResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_return_1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__isSessionValidResponse::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__isSessionValidResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:isSessionValidResponse", id, type))
     return soap->error;
@@ -46162,7 +46393,7 @@ soap_get_ns1__isSessionValidResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__isSessionValidResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -46178,10 +46409,10 @@ soap_instantiate_ns1__isSessionValidResponse(struct soap *soap, int n,
                    "soap_instantiate_ns1__isSessionValidResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__isSessionValidResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__isSessionValidResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__isSessionValidResponse);
     if (size)
@@ -46219,7 +46450,7 @@ soap_copy_ns1__isSessionValidResponse(struct soap *soap, int st, int tt,
 void ns1__isSessionValid::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__isSessionValid::sessionId = NULL;
+  this->ns1__isSessionValid::sessionId = nullptr;
 }
 
 void ns1__isSessionValid::soap_serialize(struct soap *soap) const {
@@ -46260,13 +46491,13 @@ SOAP_FMAC3 ns1__isSessionValid *SOAP_FMAC4
 soap_in_ns1__isSessionValid(struct soap *soap, const char *tag,
                             ns1__isSessionValid *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__isSessionValid *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__isSessionValid,
       sizeof(ns1__isSessionValid), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__isSessionValid) {
@@ -46300,23 +46531,23 @@ soap_in_ns1__isSessionValid(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__isSessionValid *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__isSessionValid, 0,
         sizeof(ns1__isSessionValid), 0, soap_copy_ns1__isSessionValid);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__isSessionValid::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__isSessionValid);
   if (this->soap_out(soap, tag ? tag : "ns1:isSessionValid", id, type))
     return soap->error;
@@ -46333,7 +46564,7 @@ soap_get_ns1__isSessionValid(struct soap *soap, ns1__isSessionValid *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__isSessionValid(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -46346,9 +46577,9 @@ soap_instantiate_ns1__isSessionValid(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__isSessionValid(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__isSessionValid, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__isSessionValid, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__isSessionValid);
     if (size)
@@ -46440,8 +46671,8 @@ soap_in_ns1__searchInvestigationByParameterComparisonResponse(
     ns1__searchInvestigationByParameterComparisonResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByParameterComparisonResponse *)
       soap_class_id_enter(
           soap, soap->id, a,
@@ -46449,7 +46680,7 @@ soap_in_ns1__searchInvestigationByParameterComparisonResponse(
           sizeof(ns1__searchInvestigationByParameterComparisonResponse),
           soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -46483,10 +46714,10 @@ soap_in_ns1__searchInvestigationByParameterComparisonResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByParameterComparisonResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -46494,7 +46725,7 @@ soap_in_ns1__searchInvestigationByParameterComparisonResponse(
         0, sizeof(ns1__searchInvestigationByParameterComparisonResponse), 0,
         soap_copy_ns1__searchInvestigationByParameterComparisonResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -46502,7 +46733,7 @@ soap_in_ns1__searchInvestigationByParameterComparisonResponse(
 int ns1__searchInvestigationByParameterComparisonResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterComparisonResponse);
   if (this->soap_out(
           soap,
@@ -46525,7 +46756,7 @@ soap_get_ns1__searchInvestigationByParameterComparisonResponse(
   if ((p = soap_in_ns1__searchInvestigationByParameterComparisonResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -46540,11 +46771,11 @@ soap_instantiate_ns1__searchInvestigationByParameterComparisonResponse(
                                     "sponse(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterComparisonResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(ns1__searchInvestigationByParameterComparisonResponse);
@@ -46590,7 +46821,7 @@ void ns1__searchInvestigationByParameterComparison::soap_default(
     struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchInvestigationByParameterComparison::sessionId = NULL;
+  this->ns1__searchInvestigationByParameterComparison::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__parameterComparisonCondition(
       soap, &this->ns1__searchInvestigationByParameterComparison::
                  comparisionCondition);
@@ -46652,15 +46883,15 @@ soap_in_ns1__searchInvestigationByParameterComparison(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterComparison *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByParameterComparison *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterComparison,
       sizeof(ns1__searchInvestigationByParameterComparison), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -46704,10 +46935,10 @@ soap_in_ns1__searchInvestigationByParameterComparison(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByParameterComparison *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -46715,7 +46946,7 @@ soap_in_ns1__searchInvestigationByParameterComparison(
         sizeof(ns1__searchInvestigationByParameterComparison), 0,
         soap_copy_ns1__searchInvestigationByParameterComparison);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -46723,7 +46954,7 @@ soap_in_ns1__searchInvestigationByParameterComparison(
 int ns1__searchInvestigationByParameterComparison::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterComparison);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchInvestigationByParameterComparison",
@@ -46745,7 +46976,7 @@ soap_get_ns1__searchInvestigationByParameterComparison(
   if ((p = soap_in_ns1__searchInvestigationByParameterComparison(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -46759,11 +46990,12 @@ soap_instantiate_ns1__searchInvestigationByParameterComparison(
                                     "searchInvestigationByParameterComparison(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterComparison,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterComparison,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchInvestigationByParameterComparison);
     if (size)
@@ -46840,13 +47072,13 @@ soap_in_ns1__deleteDataSetResponse(struct soap *soap, const char *tag,
                                    ns1__deleteDataSetResponse *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__deleteDataSetResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteDataSetResponse,
             sizeof(ns1__deleteDataSetResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -46856,13 +47088,13 @@ soap_in_ns1__deleteDataSetResponse(struct soap *soap, const char *tag,
       return (ns1__deleteDataSetResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__deleteDataSetResponse::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteDataSetResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteDataSetResponse", id, type))
     return soap->error;
@@ -46880,7 +47112,7 @@ soap_get_ns1__deleteDataSetResponse(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteDataSetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -46895,10 +47127,11 @@ soap_instantiate_ns1__deleteDataSetResponse(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__deleteDataSetResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__deleteDataSetResponse, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteDataSetResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteDataSetResponse);
     if (size)
@@ -46935,8 +47168,8 @@ soap_copy_ns1__deleteDataSetResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__deleteDataSet::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__deleteDataSet::sessionId = NULL;
-  this->ns1__deleteDataSet::dataSetId = NULL;
+  this->ns1__deleteDataSet::sessionId = nullptr;
+  this->ns1__deleteDataSet::dataSetId = nullptr;
 }
 
 void ns1__deleteDataSet::soap_serialize(struct soap *soap) const {
@@ -46981,13 +47214,13 @@ SOAP_FMAC3 ns1__deleteDataSet *SOAP_FMAC4
 soap_in_ns1__deleteDataSet(struct soap *soap, const char *tag,
                            ns1__deleteDataSet *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__deleteDataSet *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteDataSet,
       sizeof(ns1__deleteDataSet), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__deleteDataSet) {
@@ -47029,23 +47262,23 @@ soap_in_ns1__deleteDataSet(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__deleteDataSet *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__deleteDataSet, 0,
         sizeof(ns1__deleteDataSet), 0, soap_copy_ns1__deleteDataSet);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__deleteDataSet::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteDataSet);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteDataSet", id, type))
     return soap->error;
@@ -47062,7 +47295,7 @@ soap_get_ns1__deleteDataSet(struct soap *soap, ns1__deleteDataSet *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteDataSet(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -47075,9 +47308,9 @@ soap_instantiate_ns1__deleteDataSet(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__deleteDataSet(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__deleteDataSet, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteDataSet, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteDataSet);
     if (size)
@@ -47161,13 +47394,13 @@ soap_in_ns1__getInvestigationsResponse(struct soap *soap, const char *tag,
                                        ns1__getInvestigationsResponse *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getInvestigationsResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getInvestigationsResponse,
       sizeof(ns1__getInvestigationsResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getInvestigationsResponse) {
@@ -47197,10 +47430,10 @@ soap_in_ns1__getInvestigationsResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getInvestigationsResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -47208,14 +47441,14 @@ soap_in_ns1__getInvestigationsResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getInvestigationsResponse), 0,
         soap_copy_ns1__getInvestigationsResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getInvestigationsResponse::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getInvestigationsResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getInvestigationsResponse", id,
                      type))
@@ -47235,7 +47468,7 @@ soap_get_ns1__getInvestigationsResponse(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__getInvestigationsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -47252,10 +47485,10 @@ soap_instantiate_ns1__getInvestigationsResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__getInvestigationsResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getInvestigationsResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getInvestigationsResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getInvestigationsResponse);
     if (size)
@@ -47293,7 +47526,7 @@ soap_copy_ns1__getInvestigationsResponse(struct soap *soap, int st, int tt,
 void ns1__getInvestigations::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getInvestigations::userId = NULL;
+  this->ns1__getInvestigations::userId = nullptr;
   soap_default_std__vectorTemplateOfLONG64(
       soap, &this->ns1__getInvestigations::investigationIds);
 }
@@ -47343,13 +47576,13 @@ SOAP_FMAC3 ns1__getInvestigations *SOAP_FMAC4
 soap_in_ns1__getInvestigations(struct soap *soap, const char *tag,
                                ns1__getInvestigations *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getInvestigations *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getInvestigations,
       sizeof(ns1__getInvestigations), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getInvestigations) {
@@ -47388,23 +47621,23 @@ soap_in_ns1__getInvestigations(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getInvestigations *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__getInvestigations,
         0, sizeof(ns1__getInvestigations), 0, soap_copy_ns1__getInvestigations);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getInvestigations::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getInvestigations);
   if (this->soap_out(soap, tag ? tag : "ns1:getInvestigations", id, type))
     return soap->error;
@@ -47421,7 +47654,7 @@ soap_get_ns1__getInvestigations(struct soap *soap, ns1__getInvestigations *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__getInvestigations(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -47436,9 +47669,9 @@ soap_instantiate_ns1__getInvestigations(struct soap *soap, int n,
                       "soap_instantiate_ns1__getInvestigations(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getInvestigations, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getInvestigations, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getInvestigations);
     if (size)
@@ -47524,14 +47757,14 @@ soap_in_ns1__getInvestigationsIncludesResponse(
     struct soap *soap, const char *tag,
     ns1__getInvestigationsIncludesResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getInvestigationsIncludesResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getInvestigationsIncludesResponse,
       sizeof(ns1__getInvestigationsIncludesResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -47564,10 +47797,10 @@ soap_in_ns1__getInvestigationsIncludesResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getInvestigationsIncludesResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -47575,7 +47808,7 @@ soap_in_ns1__getInvestigationsIncludesResponse(
         sizeof(ns1__getInvestigationsIncludesResponse), 0,
         soap_copy_ns1__getInvestigationsIncludesResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -47583,7 +47816,7 @@ soap_in_ns1__getInvestigationsIncludesResponse(
 int ns1__getInvestigationsIncludesResponse::soap_put(struct soap *soap,
                                                      const char *tag,
                                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getInvestigationsIncludesResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getInvestigationsIncludesResponse",
                      id, type))
@@ -47603,7 +47836,7 @@ soap_get_ns1__getInvestigationsIncludesResponse(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__getInvestigationsIncludesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -47619,10 +47852,10 @@ soap_instantiate_ns1__getInvestigationsIncludesResponse(struct soap *soap,
                               "getInvestigationsIncludesResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getInvestigationsIncludesResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getInvestigationsIncludesResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getInvestigationsIncludesResponse);
     if (size)
@@ -47662,10 +47895,10 @@ soap_copy_ns1__getInvestigationsIncludesResponse(struct soap *soap, int st,
 void ns1__getInvestigationsIncludes::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getInvestigationsIncludes::userId = NULL;
+  this->ns1__getInvestigationsIncludes::userId = nullptr;
   soap_default_std__vectorTemplateOfLONG64(
       soap, &this->ns1__getInvestigationsIncludes::investigationIds);
-  this->ns1__getInvestigationsIncludes::investigationInclude = NULL;
+  this->ns1__getInvestigationsIncludes::investigationInclude = nullptr;
 }
 
 void ns1__getInvestigationsIncludes::soap_serialize(struct soap *soap) const {
@@ -47723,13 +47956,13 @@ soap_in_ns1__getInvestigationsIncludes(struct soap *soap, const char *tag,
                                        ns1__getInvestigationsIncludes *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getInvestigationsIncludes *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getInvestigationsIncludes,
       sizeof(ns1__getInvestigationsIncludes), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getInvestigationsIncludes) {
@@ -47778,10 +48011,10 @@ soap_in_ns1__getInvestigationsIncludes(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getInvestigationsIncludes *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -47789,14 +48022,14 @@ soap_in_ns1__getInvestigationsIncludes(struct soap *soap, const char *tag,
         sizeof(ns1__getInvestigationsIncludes), 0,
         soap_copy_ns1__getInvestigationsIncludes);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getInvestigationsIncludes::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getInvestigationsIncludes);
   if (this->soap_out(soap, tag ? tag : "ns1:getInvestigationsIncludes", id,
                      type))
@@ -47816,7 +48049,7 @@ soap_get_ns1__getInvestigationsIncludes(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__getInvestigationsIncludes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -47833,10 +48066,10 @@ soap_instantiate_ns1__getInvestigationsIncludes(struct soap *soap, int n,
              "soap_instantiate_ns1__getInvestigationsIncludes(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getInvestigationsIncludes, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getInvestigationsIncludes,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getInvestigationsIncludes);
     if (size)
@@ -47923,14 +48156,14 @@ soap_in_ns1__searchSampleByParameterResponse(
     struct soap *soap, const char *tag, ns1__searchSampleByParameterResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByParameterResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchSampleByParameterResponse,
       sizeof(ns1__searchSampleByParameterResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -47963,10 +48196,10 @@ soap_in_ns1__searchSampleByParameterResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByParameterResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -47974,7 +48207,7 @@ soap_in_ns1__searchSampleByParameterResponse(
         sizeof(ns1__searchSampleByParameterResponse), 0,
         soap_copy_ns1__searchSampleByParameterResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -47982,7 +48215,7 @@ soap_in_ns1__searchSampleByParameterResponse(
 int ns1__searchSampleByParameterResponse::soap_put(struct soap *soap,
                                                    const char *tag,
                                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchSampleByParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchSampleByParameterResponse",
                      id, type))
@@ -48002,7 +48235,7 @@ soap_get_ns1__searchSampleByParameterResponse(
     const char *type) {
   if ((p = soap_in_ns1__searchSampleByParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -48020,10 +48253,10 @@ soap_instantiate_ns1__searchSampleByParameterResponse(struct soap *soap, int n,
           "soap_instantiate_ns1__searchSampleByParameterResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchSampleByParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchSampleByParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByParameterResponse);
     if (size)
@@ -48063,7 +48296,7 @@ soap_copy_ns1__searchSampleByParameterResponse(struct soap *soap, int st,
 void ns1__searchSampleByParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchSampleByParameter::sessionId = NULL;
+  this->ns1__searchSampleByParameter::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__parameterSearch(
       soap, &this->ns1__searchSampleByParameter::parameters);
 }
@@ -48117,13 +48350,13 @@ soap_in_ns1__searchSampleByParameter(struct soap *soap, const char *tag,
                                      ns1__searchSampleByParameter *a,
                                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchSampleByParameter,
       sizeof(ns1__searchSampleByParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchSampleByParameter) {
@@ -48163,10 +48396,10 @@ soap_in_ns1__searchSampleByParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -48174,14 +48407,14 @@ soap_in_ns1__searchSampleByParameter(struct soap *soap, const char *tag,
         sizeof(ns1__searchSampleByParameter), 0,
         soap_copy_ns1__searchSampleByParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchSampleByParameter::soap_put(struct soap *soap, const char *tag,
                                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchSampleByParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:searchSampleByParameter", id, type))
     return soap->error;
@@ -48199,7 +48432,7 @@ soap_get_ns1__searchSampleByParameter(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchSampleByParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -48216,10 +48449,10 @@ soap_instantiate_ns1__searchSampleByParameter(struct soap *soap, int n,
              "soap_instantiate_ns1__searchSampleByParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchSampleByParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchSampleByParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByParameter);
     if (size)
@@ -48308,15 +48541,15 @@ soap_in_ns1__searchDatasetByParameterConditionResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterConditionResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByParameterConditionResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterConditionResponse,
       sizeof(ns1__searchDatasetByParameterConditionResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -48349,10 +48582,10 @@ soap_in_ns1__searchDatasetByParameterConditionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByParameterConditionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -48360,7 +48593,7 @@ soap_in_ns1__searchDatasetByParameterConditionResponse(
         sizeof(ns1__searchDatasetByParameterConditionResponse), 0,
         soap_copy_ns1__searchDatasetByParameterConditionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -48368,7 +48601,7 @@ soap_in_ns1__searchDatasetByParameterConditionResponse(
 int ns1__searchDatasetByParameterConditionResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterConditionResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchDatasetByParameterConditionResponse", id,
@@ -48390,7 +48623,7 @@ soap_get_ns1__searchDatasetByParameterConditionResponse(
   if ((p = soap_in_ns1__searchDatasetByParameterConditionResponse(soap, tag, p,
                                                                   type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -48405,11 +48638,11 @@ soap_instantiate_ns1__searchDatasetByParameterConditionResponse(
                                     "%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat3_ns1__searchDatasetByParameterConditionResponse,
                 n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetByParameterConditionResponse);
     if (size)
@@ -48455,8 +48688,8 @@ soap_copy_ns1__searchDatasetByParameterConditionResponse(struct soap *soap,
 void ns1__searchDatasetByParameterCondition::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatasetByParameterCondition::sessionId = NULL;
-  this->ns1__searchDatasetByParameterCondition::logicalCondition = NULL;
+  this->ns1__searchDatasetByParameterCondition::sessionId = nullptr;
+  this->ns1__searchDatasetByParameterCondition::logicalCondition = nullptr;
 }
 
 void ns1__searchDatasetByParameterCondition::soap_serialize(
@@ -48511,14 +48744,14 @@ soap_in_ns1__searchDatasetByParameterCondition(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterCondition *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByParameterCondition *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchDatasetByParameterCondition,
       sizeof(ns1__searchDatasetByParameterCondition), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -48564,10 +48797,10 @@ soap_in_ns1__searchDatasetByParameterCondition(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByParameterCondition *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -48575,7 +48808,7 @@ soap_in_ns1__searchDatasetByParameterCondition(
         sizeof(ns1__searchDatasetByParameterCondition), 0,
         soap_copy_ns1__searchDatasetByParameterCondition);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -48583,7 +48816,7 @@ soap_in_ns1__searchDatasetByParameterCondition(
 int ns1__searchDatasetByParameterCondition::soap_put(struct soap *soap,
                                                      const char *tag,
                                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterCondition);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatasetByParameterCondition",
                      id, type))
@@ -48603,7 +48836,7 @@ soap_get_ns1__searchDatasetByParameterCondition(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchDatasetByParameterCondition(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -48619,10 +48852,10 @@ soap_instantiate_ns1__searchDatasetByParameterCondition(struct soap *soap,
                               "searchDatasetByParameterCondition(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatasetByParameterCondition, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatasetByParameterCondition, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetByParameterCondition);
     if (size)
@@ -48697,15 +48930,15 @@ soap_in_ns1__removeDataFileParameterResponse(
     struct soap *soap, const char *tag, ns1__removeDataFileParameterResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__removeDataFileParameterResponse *)soap_class_id_enter(
             soap, soap->id, a,
             SOAP_TYPE_ICat3_ns1__removeDataFileParameterResponse,
             sizeof(ns1__removeDataFileParameterResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -48717,14 +48950,14 @@ soap_in_ns1__removeDataFileParameterResponse(
                                                                 type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__removeDataFileParameterResponse::soap_put(struct soap *soap,
                                                    const char *tag,
                                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeDataFileParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:removeDataFileParameterResponse",
                      id, type))
@@ -48744,7 +48977,7 @@ soap_get_ns1__removeDataFileParameterResponse(
     const char *type) {
   if ((p = soap_in_ns1__removeDataFileParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -48762,10 +48995,10 @@ soap_instantiate_ns1__removeDataFileParameterResponse(struct soap *soap, int n,
           "soap_instantiate_ns1__removeDataFileParameterResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__removeDataFileParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__removeDataFileParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeDataFileParameterResponse);
     if (size)
@@ -48805,8 +49038,8 @@ soap_copy_ns1__removeDataFileParameterResponse(struct soap *soap, int st,
 void ns1__removeDataFileParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__removeDataFileParameter::sessionId = NULL;
-  this->ns1__removeDataFileParameter::datafileParameterPK = NULL;
+  this->ns1__removeDataFileParameter::sessionId = nullptr;
+  this->ns1__removeDataFileParameter::datafileParameterPK = nullptr;
 }
 
 void ns1__removeDataFileParameter::soap_serialize(struct soap *soap) const {
@@ -48858,13 +49091,13 @@ soap_in_ns1__removeDataFileParameter(struct soap *soap, const char *tag,
                                      ns1__removeDataFileParameter *a,
                                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__removeDataFileParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeDataFileParameter,
       sizeof(ns1__removeDataFileParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__removeDataFileParameter) {
@@ -48907,10 +49140,10 @@ soap_in_ns1__removeDataFileParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__removeDataFileParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -48918,14 +49151,14 @@ soap_in_ns1__removeDataFileParameter(struct soap *soap, const char *tag,
         sizeof(ns1__removeDataFileParameter), 0,
         soap_copy_ns1__removeDataFileParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__removeDataFileParameter::soap_put(struct soap *soap, const char *tag,
                                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeDataFileParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:removeDataFileParameter", id, type))
     return soap->error;
@@ -48943,7 +49176,7 @@ soap_get_ns1__removeDataFileParameter(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeDataFileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -48960,10 +49193,10 @@ soap_instantiate_ns1__removeDataFileParameter(struct soap *soap, int n,
              "soap_instantiate_ns1__removeDataFileParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__removeDataFileParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__removeDataFileParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeDataFileParameter);
     if (size)
@@ -49052,15 +49285,15 @@ soap_in_ns1__searchDatasetByParameterLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterLogicalResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByParameterLogicalResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterLogicalResponse,
       sizeof(ns1__searchDatasetByParameterLogicalResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -49093,10 +49326,10 @@ soap_in_ns1__searchDatasetByParameterLogicalResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByParameterLogicalResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -49104,7 +49337,7 @@ soap_in_ns1__searchDatasetByParameterLogicalResponse(
         sizeof(ns1__searchDatasetByParameterLogicalResponse), 0,
         soap_copy_ns1__searchDatasetByParameterLogicalResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -49112,7 +49345,7 @@ soap_in_ns1__searchDatasetByParameterLogicalResponse(
 int ns1__searchDatasetByParameterLogicalResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchDatasetByParameterLogicalResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchDatasetByParameterLogicalResponse",
@@ -49135,7 +49368,7 @@ soap_get_ns1__searchDatasetByParameterLogicalResponse(
   if ((p = soap_in_ns1__searchDatasetByParameterLogicalResponse(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -49149,11 +49382,12 @@ soap_instantiate_ns1__searchDatasetByParameterLogicalResponse(
                                     "searchDatasetByParameterLogicalResponse(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatasetByParameterLogicalResponse,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_ns1__searchDatasetByParameterLogicalResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetByParameterLogicalResponse);
     if (size)
@@ -49198,8 +49432,8 @@ soap_copy_ns1__searchDatasetByParameterLogicalResponse(struct soap *soap,
 void ns1__searchDatasetByParameterLogical::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatasetByParameterLogical::sessionId = NULL;
-  this->ns1__searchDatasetByParameterLogical::logicalCondition = NULL;
+  this->ns1__searchDatasetByParameterLogical::sessionId = nullptr;
+  this->ns1__searchDatasetByParameterLogical::logicalCondition = nullptr;
 }
 
 void ns1__searchDatasetByParameterLogical::soap_serialize(
@@ -49253,14 +49487,14 @@ soap_in_ns1__searchDatasetByParameterLogical(
     struct soap *soap, const char *tag, ns1__searchDatasetByParameterLogical *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByParameterLogical *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchDatasetByParameterLogical,
       sizeof(ns1__searchDatasetByParameterLogical), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -49306,10 +49540,10 @@ soap_in_ns1__searchDatasetByParameterLogical(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByParameterLogical *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -49317,7 +49551,7 @@ soap_in_ns1__searchDatasetByParameterLogical(
         sizeof(ns1__searchDatasetByParameterLogical), 0,
         soap_copy_ns1__searchDatasetByParameterLogical);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -49325,7 +49559,7 @@ soap_in_ns1__searchDatasetByParameterLogical(
 int ns1__searchDatasetByParameterLogical::soap_put(struct soap *soap,
                                                    const char *tag,
                                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterLogical);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatasetByParameterLogical",
                      id, type))
@@ -49345,7 +49579,7 @@ soap_get_ns1__searchDatasetByParameterLogical(
     const char *type) {
   if ((p = soap_in_ns1__searchDatasetByParameterLogical(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -49363,10 +49597,10 @@ soap_instantiate_ns1__searchDatasetByParameterLogical(struct soap *soap, int n,
           "soap_instantiate_ns1__searchDatasetByParameterLogical(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatasetByParameterLogical, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatasetByParameterLogical, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetByParameterLogical);
     if (size)
@@ -49455,14 +49689,14 @@ soap_in_ns1__searchByUserIDPaginationResponse(
     struct soap *soap, const char *tag,
     ns1__searchByUserIDPaginationResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByUserIDPaginationResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByUserIDPaginationResponse,
       sizeof(ns1__searchByUserIDPaginationResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -49495,10 +49729,10 @@ soap_in_ns1__searchByUserIDPaginationResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByUserIDPaginationResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -49506,7 +49740,7 @@ soap_in_ns1__searchByUserIDPaginationResponse(
         sizeof(ns1__searchByUserIDPaginationResponse), 0,
         soap_copy_ns1__searchByUserIDPaginationResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -49514,7 +49748,7 @@ soap_in_ns1__searchByUserIDPaginationResponse(
 int ns1__searchByUserIDPaginationResponse::soap_put(struct soap *soap,
                                                     const char *tag,
                                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByUserIDPaginationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByUserIDPaginationResponse",
                      id, type))
@@ -49534,7 +49768,7 @@ soap_get_ns1__searchByUserIDPaginationResponse(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByUserIDPaginationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -49550,10 +49784,10 @@ soap_instantiate_ns1__searchByUserIDPaginationResponse(struct soap *soap, int n,
                               "searchByUserIDPaginationResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchByUserIDPaginationResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByUserIDPaginationResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByUserIDPaginationResponse);
     if (size)
@@ -49593,8 +49827,8 @@ soap_copy_ns1__searchByUserIDPaginationResponse(struct soap *soap, int st,
 void ns1__searchByUserIDPagination::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchByUserIDPagination::sessionId = NULL;
-  this->ns1__searchByUserIDPagination::userSearch = NULL;
+  this->ns1__searchByUserIDPagination::sessionId = nullptr;
+  this->ns1__searchByUserIDPagination::userSearch = nullptr;
   soap_default_int(soap, &this->ns1__searchByUserIDPagination::startIndex);
   soap_default_int(soap, &this->ns1__searchByUserIDPagination::numberOfResults);
 }
@@ -49658,13 +49892,13 @@ soap_in_ns1__searchByUserIDPagination(struct soap *soap, const char *tag,
                                       ns1__searchByUserIDPagination *a,
                                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByUserIDPagination *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByUserIDPagination,
       sizeof(ns1__searchByUserIDPagination), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByUserIDPagination) {
@@ -49724,10 +49958,10 @@ soap_in_ns1__searchByUserIDPagination(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByUserIDPagination *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -49735,19 +49969,19 @@ soap_in_ns1__searchByUserIDPagination(struct soap *soap, const char *tag,
         sizeof(ns1__searchByUserIDPagination), 0,
         soap_copy_ns1__searchByUserIDPagination);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_startIndex1 > 0 || soap_flag_numberOfResults1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__searchByUserIDPagination::soap_put(struct soap *soap, const char *tag,
                                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByUserIDPagination);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByUserIDPagination", id,
                      type))
@@ -49767,7 +50001,7 @@ soap_get_ns1__searchByUserIDPagination(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByUserIDPagination(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -49784,10 +50018,10 @@ soap_instantiate_ns1__searchByUserIDPagination(struct soap *soap, int n,
              "soap_instantiate_ns1__searchByUserIDPagination(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchByUserIDPagination, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByUserIDPagination, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByUserIDPagination);
     if (size)
@@ -49870,13 +50104,13 @@ soap_in_ns1__searchByUserIDResponse(struct soap *soap, const char *tag,
                                     ns1__searchByUserIDResponse *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByUserIDResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByUserIDResponse,
       sizeof(ns1__searchByUserIDResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByUserIDResponse) {
@@ -49906,10 +50140,10 @@ soap_in_ns1__searchByUserIDResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByUserIDResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -49917,14 +50151,14 @@ soap_in_ns1__searchByUserIDResponse(struct soap *soap, const char *tag,
         sizeof(ns1__searchByUserIDResponse), 0,
         soap_copy_ns1__searchByUserIDResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchByUserIDResponse::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByUserIDResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByUserIDResponse", id, type))
     return soap->error;
@@ -49942,7 +50176,7 @@ soap_get_ns1__searchByUserIDResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByUserIDResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -49958,10 +50192,10 @@ soap_instantiate_ns1__searchByUserIDResponse(struct soap *soap, int n,
                    "soap_instantiate_ns1__searchByUserIDResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchByUserIDResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByUserIDResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByUserIDResponse);
     if (size)
@@ -49999,8 +50233,8 @@ soap_copy_ns1__searchByUserIDResponse(struct soap *soap, int st, int tt,
 void ns1__searchByUserID::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchByUserID::sessionId = NULL;
-  this->ns1__searchByUserID::userSearch = NULL;
+  this->ns1__searchByUserID::sessionId = nullptr;
+  this->ns1__searchByUserID::userSearch = nullptr;
 }
 
 void ns1__searchByUserID::soap_serialize(struct soap *soap) const {
@@ -50046,13 +50280,13 @@ SOAP_FMAC3 ns1__searchByUserID *SOAP_FMAC4
 soap_in_ns1__searchByUserID(struct soap *soap, const char *tag,
                             ns1__searchByUserID *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByUserID *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByUserID,
       sizeof(ns1__searchByUserID), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByUserID) {
@@ -50095,23 +50329,23 @@ soap_in_ns1__searchByUserID(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByUserID *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__searchByUserID, 0,
         sizeof(ns1__searchByUserID), 0, soap_copy_ns1__searchByUserID);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchByUserID::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByUserID);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByUserID", id, type))
     return soap->error;
@@ -50128,7 +50362,7 @@ soap_get_ns1__searchByUserID(struct soap *soap, ns1__searchByUserID *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByUserID(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -50141,9 +50375,9 @@ soap_instantiate_ns1__searchByUserID(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__searchByUserID(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchByUserID, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByUserID, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByUserID);
     if (size)
@@ -50213,14 +50447,14 @@ soap_in_ns1__modifyPublicationResponse(struct soap *soap, const char *tag,
                                        ns1__modifyPublicationResponse *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__modifyPublicationResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifyPublicationResponse,
             sizeof(ns1__modifyPublicationResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -50230,13 +50464,13 @@ soap_in_ns1__modifyPublicationResponse(struct soap *soap, const char *tag,
       return (ns1__modifyPublicationResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__modifyPublicationResponse::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifyPublicationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:modifyPublicationResponse", id,
                      type))
@@ -50256,7 +50490,7 @@ soap_get_ns1__modifyPublicationResponse(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__modifyPublicationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -50273,10 +50507,10 @@ soap_instantiate_ns1__modifyPublicationResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__modifyPublicationResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__modifyPublicationResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__modifyPublicationResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifyPublicationResponse);
     if (size)
@@ -50314,8 +50548,8 @@ soap_copy_ns1__modifyPublicationResponse(struct soap *soap, int st, int tt,
 void ns1__modifyPublication::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__modifyPublication::sessionId = NULL;
-  this->ns1__modifyPublication::publication = NULL;
+  this->ns1__modifyPublication::sessionId = nullptr;
+  this->ns1__modifyPublication::publication = nullptr;
 }
 
 void ns1__modifyPublication::soap_serialize(struct soap *soap) const {
@@ -50363,13 +50597,13 @@ SOAP_FMAC3 ns1__modifyPublication *SOAP_FMAC4
 soap_in_ns1__modifyPublication(struct soap *soap, const char *tag,
                                ns1__modifyPublication *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__modifyPublication *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifyPublication,
       sizeof(ns1__modifyPublication), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__modifyPublication) {
@@ -50411,23 +50645,23 @@ soap_in_ns1__modifyPublication(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__modifyPublication *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__modifyPublication,
         0, sizeof(ns1__modifyPublication), 0, soap_copy_ns1__modifyPublication);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__modifyPublication::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifyPublication);
   if (this->soap_out(soap, tag ? tag : "ns1:modifyPublication", id, type))
     return soap->error;
@@ -50444,7 +50678,7 @@ soap_get_ns1__modifyPublication(struct soap *soap, ns1__modifyPublication *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__modifyPublication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -50459,9 +50693,9 @@ soap_instantiate_ns1__modifyPublication(struct soap *soap, int n,
                       "soap_instantiate_ns1__modifyPublication(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__modifyPublication, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__modifyPublication, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifyPublication);
     if (size)
@@ -50553,8 +50787,8 @@ soap_in_ns1__searchInvestigationByParameterRestrictionResponse(
     ns1__searchInvestigationByParameterRestrictionResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByParameterRestrictionResponse *)
       soap_class_id_enter(
           soap, soap->id, a,
@@ -50562,7 +50796,7 @@ soap_in_ns1__searchInvestigationByParameterRestrictionResponse(
           sizeof(ns1__searchInvestigationByParameterRestrictionResponse),
           soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -50596,10 +50830,10 @@ soap_in_ns1__searchInvestigationByParameterRestrictionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByParameterRestrictionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -50607,7 +50841,7 @@ soap_in_ns1__searchInvestigationByParameterRestrictionResponse(
         0, sizeof(ns1__searchInvestigationByParameterRestrictionResponse), 0,
         soap_copy_ns1__searchInvestigationByParameterRestrictionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -50615,7 +50849,7 @@ soap_in_ns1__searchInvestigationByParameterRestrictionResponse(
 int ns1__searchInvestigationByParameterRestrictionResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterRestrictionResponse);
   if (this->soap_out(
           soap,
@@ -50639,7 +50873,7 @@ soap_get_ns1__searchInvestigationByParameterRestrictionResponse(
   if ((p = soap_in_ns1__searchInvestigationByParameterRestrictionResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -50654,11 +50888,11 @@ soap_instantiate_ns1__searchInvestigationByParameterRestrictionResponse(
                                     "esponse(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterRestrictionResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(
         ns1__searchInvestigationByParameterRestrictionResponse);
@@ -50705,10 +50939,10 @@ void ns1__searchInvestigationByParameterRestriction::soap_default(
     struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchInvestigationByParameterRestriction::sessionId = NULL;
+  this->ns1__searchInvestigationByParameterRestriction::sessionId = nullptr;
   this->ns1__searchInvestigationByParameterRestriction::parameterCondition =
-      NULL;
-  this->ns1__searchInvestigationByParameterRestriction::restriction = NULL;
+      nullptr;
+  this->ns1__searchInvestigationByParameterRestriction::restriction = nullptr;
 }
 
 void ns1__searchInvestigationByParameterRestriction::soap_serialize(
@@ -50773,15 +51007,15 @@ soap_in_ns1__searchInvestigationByParameterRestriction(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterRestriction *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByParameterRestriction *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterRestriction,
       sizeof(ns1__searchInvestigationByParameterRestriction), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -50838,10 +51072,10 @@ soap_in_ns1__searchInvestigationByParameterRestriction(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByParameterRestriction *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -50849,7 +51083,7 @@ soap_in_ns1__searchInvestigationByParameterRestriction(
         sizeof(ns1__searchInvestigationByParameterRestriction), 0,
         soap_copy_ns1__searchInvestigationByParameterRestriction);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -50857,7 +51091,7 @@ soap_in_ns1__searchInvestigationByParameterRestriction(
 int ns1__searchInvestigationByParameterRestriction::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterRestriction);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchInvestigationByParameterRestriction", id,
@@ -50879,7 +51113,7 @@ soap_get_ns1__searchInvestigationByParameterRestriction(
   if ((p = soap_in_ns1__searchInvestigationByParameterRestriction(soap, tag, p,
                                                                   type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -50894,11 +51128,11 @@ soap_instantiate_ns1__searchInvestigationByParameterRestriction(
                                     "%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterRestriction,
                 n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchInvestigationByParameterRestriction);
     if (size)
@@ -50996,15 +51230,15 @@ soap_in_ns1__searchSampleByParameterConditionResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterConditionResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByParameterConditionResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchSampleByParameterConditionResponse,
       sizeof(ns1__searchSampleByParameterConditionResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -51037,10 +51271,10 @@ soap_in_ns1__searchSampleByParameterConditionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByParameterConditionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -51048,7 +51282,7 @@ soap_in_ns1__searchSampleByParameterConditionResponse(
         sizeof(ns1__searchSampleByParameterConditionResponse), 0,
         soap_copy_ns1__searchSampleByParameterConditionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -51056,7 +51290,7 @@ soap_in_ns1__searchSampleByParameterConditionResponse(
 int ns1__searchSampleByParameterConditionResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchSampleByParameterConditionResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchSampleByParameterConditionResponse",
@@ -51078,7 +51312,7 @@ soap_get_ns1__searchSampleByParameterConditionResponse(
   if ((p = soap_in_ns1__searchSampleByParameterConditionResponse(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -51092,11 +51326,12 @@ soap_instantiate_ns1__searchSampleByParameterConditionResponse(
                                     "searchSampleByParameterConditionResponse(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchSampleByParameterConditionResponse,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_ns1__searchSampleByParameterConditionResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByParameterConditionResponse);
     if (size)
@@ -51141,8 +51376,8 @@ soap_copy_ns1__searchSampleByParameterConditionResponse(struct soap *soap,
 void ns1__searchSampleByParameterCondition::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchSampleByParameterCondition::sessionId = NULL;
-  this->ns1__searchSampleByParameterCondition::logicalCondition = NULL;
+  this->ns1__searchSampleByParameterCondition::sessionId = nullptr;
+  this->ns1__searchSampleByParameterCondition::logicalCondition = nullptr;
 }
 
 void ns1__searchSampleByParameterCondition::soap_serialize(
@@ -51196,14 +51431,14 @@ soap_in_ns1__searchSampleByParameterCondition(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterCondition *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByParameterCondition *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchSampleByParameterCondition,
       sizeof(ns1__searchSampleByParameterCondition), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -51249,10 +51484,10 @@ soap_in_ns1__searchSampleByParameterCondition(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByParameterCondition *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -51260,7 +51495,7 @@ soap_in_ns1__searchSampleByParameterCondition(
         sizeof(ns1__searchSampleByParameterCondition), 0,
         soap_copy_ns1__searchSampleByParameterCondition);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -51268,7 +51503,7 @@ soap_in_ns1__searchSampleByParameterCondition(
 int ns1__searchSampleByParameterCondition::soap_put(struct soap *soap,
                                                     const char *tag,
                                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchSampleByParameterCondition);
   if (this->soap_out(soap, tag ? tag : "ns1:searchSampleByParameterCondition",
                      id, type))
@@ -51288,7 +51523,7 @@ soap_get_ns1__searchSampleByParameterCondition(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchSampleByParameterCondition(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -51304,10 +51539,10 @@ soap_instantiate_ns1__searchSampleByParameterCondition(struct soap *soap, int n,
                               "searchSampleByParameterCondition(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchSampleByParameterCondition, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchSampleByParameterCondition, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByParameterCondition);
     if (size)
@@ -51382,15 +51617,15 @@ soap_in_ns1__removeDataSetParameterResponse(
     struct soap *soap, const char *tag, ns1__removeDataSetParameterResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__removeDataSetParameterResponse *)soap_class_id_enter(
             soap, soap->id, a,
             SOAP_TYPE_ICat3_ns1__removeDataSetParameterResponse,
             sizeof(ns1__removeDataSetParameterResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -51401,14 +51636,14 @@ soap_in_ns1__removeDataSetParameterResponse(
       return (ns1__removeDataSetParameterResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__removeDataSetParameterResponse::soap_put(struct soap *soap,
                                                   const char *tag,
                                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeDataSetParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:removeDataSetParameterResponse", id,
                      type))
@@ -51428,7 +51663,7 @@ soap_get_ns1__removeDataSetParameterResponse(
     const char *type) {
   if ((p = soap_in_ns1__removeDataSetParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -51445,11 +51680,11 @@ soap_instantiate_ns1__removeDataSetParameterResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__removeDataSetParameterResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__removeDataSetParameterResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__removeDataSetParameterResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeDataSetParameterResponse);
     if (size)
@@ -51489,8 +51724,8 @@ soap_copy_ns1__removeDataSetParameterResponse(struct soap *soap, int st, int tt,
 void ns1__removeDataSetParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__removeDataSetParameter::sessionId = NULL;
-  this->ns1__removeDataSetParameter::datasetParameterPK = NULL;
+  this->ns1__removeDataSetParameter::sessionId = nullptr;
+  this->ns1__removeDataSetParameter::datasetParameterPK = nullptr;
 }
 
 void ns1__removeDataSetParameter::soap_serialize(struct soap *soap) const {
@@ -51541,13 +51776,13 @@ soap_in_ns1__removeDataSetParameter(struct soap *soap, const char *tag,
                                     ns1__removeDataSetParameter *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__removeDataSetParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeDataSetParameter,
       sizeof(ns1__removeDataSetParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__removeDataSetParameter) {
@@ -51590,10 +51825,10 @@ soap_in_ns1__removeDataSetParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__removeDataSetParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -51601,14 +51836,14 @@ soap_in_ns1__removeDataSetParameter(struct soap *soap, const char *tag,
         sizeof(ns1__removeDataSetParameter), 0,
         soap_copy_ns1__removeDataSetParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__removeDataSetParameter::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeDataSetParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:removeDataSetParameter", id, type))
     return soap->error;
@@ -51626,7 +51861,7 @@ soap_get_ns1__removeDataSetParameter(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeDataSetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -51642,10 +51877,10 @@ soap_instantiate_ns1__removeDataSetParameter(struct soap *soap, int n,
                    "soap_instantiate_ns1__removeDataSetParameter(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__removeDataSetParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__removeDataSetParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeDataSetParameter);
     if (size)
@@ -51735,15 +51970,15 @@ soap_in_ns1__searchSampleByParameterRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterRestrictionResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByParameterRestrictionResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchSampleByParameterRestrictionResponse,
       sizeof(ns1__searchSampleByParameterRestrictionResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -51776,10 +52011,10 @@ soap_in_ns1__searchSampleByParameterRestrictionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByParameterRestrictionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -51787,7 +52022,7 @@ soap_in_ns1__searchSampleByParameterRestrictionResponse(
         sizeof(ns1__searchSampleByParameterRestrictionResponse), 0,
         soap_copy_ns1__searchSampleByParameterRestrictionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -51795,7 +52030,7 @@ soap_in_ns1__searchSampleByParameterRestrictionResponse(
 int ns1__searchSampleByParameterRestrictionResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchSampleByParameterRestrictionResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchSampleByParameterRestrictionResponse",
@@ -51817,7 +52052,7 @@ soap_get_ns1__searchSampleByParameterRestrictionResponse(
   if ((p = soap_in_ns1__searchSampleByParameterRestrictionResponse(soap, tag, p,
                                                                    type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -51832,11 +52067,11 @@ soap_instantiate_ns1__searchSampleByParameterRestrictionResponse(
                                     "(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat3_ns1__searchSampleByParameterRestrictionResponse,
                 n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByParameterRestrictionResponse);
     if (size)
@@ -51882,9 +52117,9 @@ soap_copy_ns1__searchSampleByParameterRestrictionResponse(struct soap *soap,
 void ns1__searchSampleByParameterRestriction::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchSampleByParameterRestriction::sessionId = NULL;
-  this->ns1__searchSampleByParameterRestriction::parameterCondition = NULL;
-  this->ns1__searchSampleByParameterRestriction::restrictions = NULL;
+  this->ns1__searchSampleByParameterRestriction::sessionId = nullptr;
+  this->ns1__searchSampleByParameterRestriction::parameterCondition = nullptr;
+  this->ns1__searchSampleByParameterRestriction::restrictions = nullptr;
 }
 
 void ns1__searchSampleByParameterRestriction::soap_serialize(
@@ -51946,15 +52181,15 @@ soap_in_ns1__searchSampleByParameterRestriction(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterRestriction *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByParameterRestriction *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchSampleByParameterRestriction,
       sizeof(ns1__searchSampleByParameterRestriction), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -52010,10 +52245,10 @@ soap_in_ns1__searchSampleByParameterRestriction(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByParameterRestriction *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -52021,7 +52256,7 @@ soap_in_ns1__searchSampleByParameterRestriction(
         sizeof(ns1__searchSampleByParameterRestriction), 0,
         soap_copy_ns1__searchSampleByParameterRestriction);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -52029,7 +52264,7 @@ soap_in_ns1__searchSampleByParameterRestriction(
 int ns1__searchSampleByParameterRestriction::soap_put(struct soap *soap,
                                                       const char *tag,
                                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchSampleByParameterRestriction);
   if (this->soap_out(soap, tag ? tag : "ns1:searchSampleByParameterRestriction",
                      id, type))
@@ -52050,7 +52285,7 @@ soap_get_ns1__searchSampleByParameterRestriction(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchSampleByParameterRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -52067,10 +52302,10 @@ soap_instantiate_ns1__searchSampleByParameterRestriction(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchSampleByParameterRestriction, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchSampleByParameterRestriction, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByParameterRestriction);
     if (size)
@@ -52164,15 +52399,15 @@ soap_in_ns1__getMyInvestigationsIncludesPaginationResponse(
     struct soap *soap, const char *tag,
     ns1__getMyInvestigationsIncludesPaginationResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getMyInvestigationsIncludesPaginationResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesPaginationResponse,
       sizeof(ns1__getMyInvestigationsIncludesPaginationResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -52206,10 +52441,10 @@ soap_in_ns1__getMyInvestigationsIncludesPaginationResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getMyInvestigationsIncludesPaginationResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -52217,7 +52452,7 @@ soap_in_ns1__getMyInvestigationsIncludesPaginationResponse(
         sizeof(ns1__getMyInvestigationsIncludesPaginationResponse), 0,
         soap_copy_ns1__getMyInvestigationsIncludesPaginationResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -52225,7 +52460,7 @@ soap_in_ns1__getMyInvestigationsIncludesPaginationResponse(
 int ns1__getMyInvestigationsIncludesPaginationResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesPaginationResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:getMyInvestigationsIncludesPaginationResponse",
@@ -52247,7 +52482,7 @@ soap_get_ns1__getMyInvestigationsIncludesPaginationResponse(
   if ((p = soap_in_ns1__getMyInvestigationsIncludesPaginationResponse(soap, tag,
                                                                       p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -52262,11 +52497,11 @@ soap_instantiate_ns1__getMyInvestigationsIncludesPaginationResponse(
                                     "nse(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesPaginationResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(ns1__getMyInvestigationsIncludesPaginationResponse);
@@ -52312,8 +52547,9 @@ void ns1__getMyInvestigationsIncludesPagination::soap_default(
     struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getMyInvestigationsIncludesPagination::sessionId = NULL;
-  this->ns1__getMyInvestigationsIncludesPagination::investigationInclude = NULL;
+  this->ns1__getMyInvestigationsIncludesPagination::sessionId = nullptr;
+  this->ns1__getMyInvestigationsIncludesPagination::investigationInclude =
+      nullptr;
   soap_default_int(
       soap, &this->ns1__getMyInvestigationsIncludesPagination::startIndex);
   soap_default_int(
@@ -52390,15 +52626,15 @@ soap_in_ns1__getMyInvestigationsIncludesPagination(
     struct soap *soap, const char *tag,
     ns1__getMyInvestigationsIncludesPagination *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getMyInvestigationsIncludesPagination *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesPagination,
       sizeof(ns1__getMyInvestigationsIncludesPagination), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -52463,10 +52699,10 @@ soap_in_ns1__getMyInvestigationsIncludesPagination(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getMyInvestigationsIncludesPagination *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -52474,12 +52710,12 @@ soap_in_ns1__getMyInvestigationsIncludesPagination(
         sizeof(ns1__getMyInvestigationsIncludesPagination), 0,
         soap_copy_ns1__getMyInvestigationsIncludesPagination);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_startIndex1 > 0 || soap_flag_numberOfResults1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
@@ -52487,7 +52723,7 @@ soap_in_ns1__getMyInvestigationsIncludesPagination(
 int ns1__getMyInvestigationsIncludesPagination::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesPagination);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:getMyInvestigationsIncludesPagination",
@@ -52510,7 +52746,7 @@ soap_get_ns1__getMyInvestigationsIncludesPagination(
   if ((p = soap_in_ns1__getMyInvestigationsIncludesPagination(soap, tag, p,
                                                               type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -52525,10 +52761,10 @@ soap_instantiate_ns1__getMyInvestigationsIncludesPagination(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesPagination, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesPagination,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getMyInvestigationsIncludesPagination);
     if (size)
@@ -52622,15 +52858,15 @@ soap_in_ns1__getMyInvestigationsIncludesResponse(
     struct soap *soap, const char *tag,
     ns1__getMyInvestigationsIncludesResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getMyInvestigationsIncludesResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesResponse,
       sizeof(ns1__getMyInvestigationsIncludesResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -52663,10 +52899,10 @@ soap_in_ns1__getMyInvestigationsIncludesResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getMyInvestigationsIncludesResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -52674,7 +52910,7 @@ soap_in_ns1__getMyInvestigationsIncludesResponse(
         sizeof(ns1__getMyInvestigationsIncludesResponse), 0,
         soap_copy_ns1__getMyInvestigationsIncludesResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -52682,7 +52918,7 @@ soap_in_ns1__getMyInvestigationsIncludesResponse(
 int ns1__getMyInvestigationsIncludesResponse::soap_put(struct soap *soap,
                                                        const char *tag,
                                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:getMyInvestigationsIncludesResponse", id,
@@ -52705,7 +52941,7 @@ soap_get_ns1__getMyInvestigationsIncludesResponse(
   if ((p = soap_in_ns1__getMyInvestigationsIncludesResponse(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -52722,10 +52958,10 @@ soap_instantiate_ns1__getMyInvestigationsIncludesResponse(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesResponse, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesResponse,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getMyInvestigationsIncludesResponse);
     if (size)
@@ -52767,8 +53003,8 @@ soap_copy_ns1__getMyInvestigationsIncludesResponse(struct soap *soap, int st,
 void ns1__getMyInvestigationsIncludes::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getMyInvestigationsIncludes::sessionId = NULL;
-  this->ns1__getMyInvestigationsIncludes::investigationInclude = NULL;
+  this->ns1__getMyInvestigationsIncludes::sessionId = nullptr;
+  this->ns1__getMyInvestigationsIncludes::investigationInclude = nullptr;
 }
 
 void ns1__getMyInvestigationsIncludes::soap_serialize(struct soap *soap) const {
@@ -52820,13 +53056,13 @@ soap_in_ns1__getMyInvestigationsIncludes(struct soap *soap, const char *tag,
                                          ns1__getMyInvestigationsIncludes *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getMyInvestigationsIncludes *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludes,
       sizeof(ns1__getMyInvestigationsIncludes), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludes) {
@@ -52870,10 +53106,10 @@ soap_in_ns1__getMyInvestigationsIncludes(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getMyInvestigationsIncludes *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -52881,7 +53117,7 @@ soap_in_ns1__getMyInvestigationsIncludes(struct soap *soap, const char *tag,
         sizeof(ns1__getMyInvestigationsIncludes), 0,
         soap_copy_ns1__getMyInvestigationsIncludes);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -52889,7 +53125,7 @@ soap_in_ns1__getMyInvestigationsIncludes(struct soap *soap, const char *tag,
 int ns1__getMyInvestigationsIncludes::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludes);
   if (this->soap_out(soap, tag ? tag : "ns1:getMyInvestigationsIncludes", id,
                      type))
@@ -52909,7 +53145,7 @@ soap_get_ns1__getMyInvestigationsIncludes(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__getMyInvestigationsIncludes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -52926,10 +53162,10 @@ soap_instantiate_ns1__getMyInvestigationsIncludes(struct soap *soap, int n,
              "soap_instantiate_ns1__getMyInvestigationsIncludes(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludes, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludes,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getMyInvestigationsIncludes);
     if (size)
@@ -53016,13 +53252,13 @@ soap_in_ns1__getMyInvestigationsResponse(struct soap *soap, const char *tag,
                                          ns1__getMyInvestigationsResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getMyInvestigationsResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getMyInvestigationsResponse,
       sizeof(ns1__getMyInvestigationsResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getMyInvestigationsResponse) {
@@ -53052,10 +53288,10 @@ soap_in_ns1__getMyInvestigationsResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getMyInvestigationsResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -53063,7 +53299,7 @@ soap_in_ns1__getMyInvestigationsResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getMyInvestigationsResponse), 0,
         soap_copy_ns1__getMyInvestigationsResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -53071,7 +53307,7 @@ soap_in_ns1__getMyInvestigationsResponse(struct soap *soap, const char *tag,
 int ns1__getMyInvestigationsResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getMyInvestigationsResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getMyInvestigationsResponse", id,
                      type))
@@ -53091,7 +53327,7 @@ soap_get_ns1__getMyInvestigationsResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__getMyInvestigationsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -53108,10 +53344,10 @@ soap_instantiate_ns1__getMyInvestigationsResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__getMyInvestigationsResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getMyInvestigationsResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getMyInvestigationsResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getMyInvestigationsResponse);
     if (size)
@@ -53151,7 +53387,7 @@ soap_copy_ns1__getMyInvestigationsResponse(struct soap *soap, int st, int tt,
 void ns1__getMyInvestigations::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getMyInvestigations::sessionId = NULL;
+  this->ns1__getMyInvestigations::sessionId = nullptr;
 }
 
 void ns1__getMyInvestigations::soap_serialize(struct soap *soap) const {
@@ -53194,13 +53430,13 @@ soap_in_ns1__getMyInvestigations(struct soap *soap, const char *tag,
                                  ns1__getMyInvestigations *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getMyInvestigations *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getMyInvestigations,
       sizeof(ns1__getMyInvestigations), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getMyInvestigations) {
@@ -53234,10 +53470,10 @@ soap_in_ns1__getMyInvestigations(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getMyInvestigations *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -53245,14 +53481,14 @@ soap_in_ns1__getMyInvestigations(struct soap *soap, const char *tag,
         sizeof(ns1__getMyInvestigations), 0,
         soap_copy_ns1__getMyInvestigations);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getMyInvestigations::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getMyInvestigations);
   if (this->soap_out(soap, tag ? tag : "ns1:getMyInvestigations", id, type))
     return soap->error;
@@ -53270,7 +53506,7 @@ soap_get_ns1__getMyInvestigations(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__getMyInvestigations(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -53284,10 +53520,11 @@ soap_instantiate_ns1__getMyInvestigations(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__getMyInvestigations(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getMyInvestigations, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getMyInvestigations, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getMyInvestigations);
     if (size)
@@ -53376,15 +53613,15 @@ soap_in_ns1__searchDatafileByRestrictionLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByRestrictionLogicalResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByRestrictionLogicalResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionLogicalResponse,
       sizeof(ns1__searchDatafileByRestrictionLogicalResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -53417,10 +53654,10 @@ soap_in_ns1__searchDatafileByRestrictionLogicalResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByRestrictionLogicalResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -53428,7 +53665,7 @@ soap_in_ns1__searchDatafileByRestrictionLogicalResponse(
         sizeof(ns1__searchDatafileByRestrictionLogicalResponse), 0,
         soap_copy_ns1__searchDatafileByRestrictionLogicalResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -53436,7 +53673,7 @@ soap_in_ns1__searchDatafileByRestrictionLogicalResponse(
 int ns1__searchDatafileByRestrictionLogicalResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionLogicalResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchDatafileByRestrictionLogicalResponse",
@@ -53458,7 +53695,7 @@ soap_get_ns1__searchDatafileByRestrictionLogicalResponse(
   if ((p = soap_in_ns1__searchDatafileByRestrictionLogicalResponse(soap, tag, p,
                                                                    type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -53473,11 +53710,11 @@ soap_instantiate_ns1__searchDatafileByRestrictionLogicalResponse(
                                     "(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionLogicalResponse,
                 n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatafileByRestrictionLogicalResponse);
     if (size)
@@ -53523,8 +53760,8 @@ soap_copy_ns1__searchDatafileByRestrictionLogicalResponse(struct soap *soap,
 void ns1__searchDatafileByRestrictionLogical::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatafileByRestrictionLogical::sessionId = NULL;
-  this->ns1__searchDatafileByRestrictionLogical::restriction = NULL;
+  this->ns1__searchDatafileByRestrictionLogical::sessionId = nullptr;
+  this->ns1__searchDatafileByRestrictionLogical::restriction = nullptr;
 }
 
 void ns1__searchDatafileByRestrictionLogical::soap_serialize(
@@ -53579,15 +53816,15 @@ soap_in_ns1__searchDatafileByRestrictionLogical(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByRestrictionLogical *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByRestrictionLogical *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionLogical,
       sizeof(ns1__searchDatafileByRestrictionLogical), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -53633,10 +53870,10 @@ soap_in_ns1__searchDatafileByRestrictionLogical(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByRestrictionLogical *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -53644,7 +53881,7 @@ soap_in_ns1__searchDatafileByRestrictionLogical(
         sizeof(ns1__searchDatafileByRestrictionLogical), 0,
         soap_copy_ns1__searchDatafileByRestrictionLogical);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -53652,7 +53889,7 @@ soap_in_ns1__searchDatafileByRestrictionLogical(
 int ns1__searchDatafileByRestrictionLogical::soap_put(struct soap *soap,
                                                       const char *tag,
                                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionLogical);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatafileByRestrictionLogical",
                      id, type))
@@ -53673,7 +53910,7 @@ soap_get_ns1__searchDatafileByRestrictionLogical(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchDatafileByRestrictionLogical(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -53690,10 +53927,10 @@ soap_instantiate_ns1__searchDatafileByRestrictionLogical(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionLogical, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionLogical, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatafileByRestrictionLogical);
     if (size)
@@ -53782,13 +54019,13 @@ soap_in_ns1__getAllInstrumentsResponse(struct soap *soap, const char *tag,
                                        ns1__getAllInstrumentsResponse *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getAllInstrumentsResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getAllInstrumentsResponse,
       sizeof(ns1__getAllInstrumentsResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getAllInstrumentsResponse) {
@@ -53818,10 +54055,10 @@ soap_in_ns1__getAllInstrumentsResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getAllInstrumentsResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -53829,14 +54066,14 @@ soap_in_ns1__getAllInstrumentsResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getAllInstrumentsResponse), 0,
         soap_copy_ns1__getAllInstrumentsResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getAllInstrumentsResponse::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getAllInstrumentsResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getAllInstrumentsResponse", id,
                      type))
@@ -53856,7 +54093,7 @@ soap_get_ns1__getAllInstrumentsResponse(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__getAllInstrumentsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -53873,10 +54110,10 @@ soap_instantiate_ns1__getAllInstrumentsResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__getAllInstrumentsResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getAllInstrumentsResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getAllInstrumentsResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getAllInstrumentsResponse);
     if (size)
@@ -53914,7 +54151,7 @@ soap_copy_ns1__getAllInstrumentsResponse(struct soap *soap, int st, int tt,
 void ns1__getAllInstruments::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getAllInstruments::sessionId = NULL;
+  this->ns1__getAllInstruments::sessionId = nullptr;
 }
 
 void ns1__getAllInstruments::soap_serialize(struct soap *soap) const {
@@ -53956,13 +54193,13 @@ SOAP_FMAC3 ns1__getAllInstruments *SOAP_FMAC4
 soap_in_ns1__getAllInstruments(struct soap *soap, const char *tag,
                                ns1__getAllInstruments *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getAllInstruments *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getAllInstruments,
       sizeof(ns1__getAllInstruments), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getAllInstruments) {
@@ -53996,23 +54233,23 @@ soap_in_ns1__getAllInstruments(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getAllInstruments *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__getAllInstruments,
         0, sizeof(ns1__getAllInstruments), 0, soap_copy_ns1__getAllInstruments);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getAllInstruments::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getAllInstruments);
   if (this->soap_out(soap, tag ? tag : "ns1:getAllInstruments", id, type))
     return soap->error;
@@ -54029,7 +54266,7 @@ soap_get_ns1__getAllInstruments(struct soap *soap, ns1__getAllInstruments *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__getAllInstruments(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -54044,9 +54281,9 @@ soap_instantiate_ns1__getAllInstruments(struct soap *soap, int n,
                       "soap_instantiate_ns1__getAllInstruments(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getAllInstruments, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getAllInstruments, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getAllInstruments);
     if (size)
@@ -54129,13 +54366,13 @@ soap_in_ns1__searchByKeywordsAllResponse(struct soap *soap, const char *tag,
                                          ns1__searchByKeywordsAllResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByKeywordsAllResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByKeywordsAllResponse,
       sizeof(ns1__searchByKeywordsAllResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByKeywordsAllResponse) {
@@ -54165,10 +54402,10 @@ soap_in_ns1__searchByKeywordsAllResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByKeywordsAllResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -54176,7 +54413,7 @@ soap_in_ns1__searchByKeywordsAllResponse(struct soap *soap, const char *tag,
         sizeof(ns1__searchByKeywordsAllResponse), 0,
         soap_copy_ns1__searchByKeywordsAllResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -54184,7 +54421,7 @@ soap_in_ns1__searchByKeywordsAllResponse(struct soap *soap, const char *tag,
 int ns1__searchByKeywordsAllResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByKeywordsAllResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByKeywordsAllResponse", id,
                      type))
@@ -54204,7 +54441,7 @@ soap_get_ns1__searchByKeywordsAllResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByKeywordsAllResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -54221,10 +54458,10 @@ soap_instantiate_ns1__searchByKeywordsAllResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__searchByKeywordsAllResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchByKeywordsAllResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByKeywordsAllResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByKeywordsAllResponse);
     if (size)
@@ -54265,7 +54502,7 @@ void ns1__keywordDetails::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
   soap_default_bool(soap, &this->ns1__keywordDetails::caseSensitive);
-  this->ns1__keywordDetails::investigationInclude = NULL;
+  this->ns1__keywordDetails::investigationInclude = nullptr;
   soap_default_std__vectorTemplateOfstd__string(
       soap, &this->ns1__keywordDetails::keywords);
 }
@@ -54317,13 +54554,13 @@ SOAP_FMAC3 ns1__keywordDetails *SOAP_FMAC4
 soap_in_ns1__keywordDetails(struct soap *soap, const char *tag,
                             ns1__keywordDetails *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__keywordDetails *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__keywordDetails,
       sizeof(ns1__keywordDetails), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__keywordDetails) {
@@ -54370,27 +54607,27 @@ soap_in_ns1__keywordDetails(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__keywordDetails *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__keywordDetails, 0,
         sizeof(ns1__keywordDetails), 0, soap_copy_ns1__keywordDetails);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_caseSensitive1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__keywordDetails::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__keywordDetails);
   if (this->soap_out(soap, tag ? tag : "ns1:keywordDetails", id, type))
     return soap->error;
@@ -54407,7 +54644,7 @@ soap_get_ns1__keywordDetails(struct soap *soap, ns1__keywordDetails *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__keywordDetails(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -54420,9 +54657,9 @@ soap_instantiate_ns1__keywordDetails(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__keywordDetails(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__keywordDetails, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__keywordDetails, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__keywordDetails);
     if (size)
@@ -54458,8 +54695,8 @@ soap_copy_ns1__keywordDetails(struct soap *soap, int st, int tt, void *p,
 void ns1__searchByKeywordsAll::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchByKeywordsAll::sessionId = NULL;
-  this->ns1__searchByKeywordsAll::keywordDetails = NULL;
+  this->ns1__searchByKeywordsAll::sessionId = nullptr;
+  this->ns1__searchByKeywordsAll::keywordDetails = nullptr;
   soap_default_int(soap, &this->ns1__searchByKeywordsAll::startIndex);
   soap_default_int(soap, &this->ns1__searchByKeywordsAll::numberOfResults);
 }
@@ -54520,13 +54757,13 @@ soap_in_ns1__searchByKeywordsAll(struct soap *soap, const char *tag,
                                  ns1__searchByKeywordsAll *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByKeywordsAll *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByKeywordsAll,
       sizeof(ns1__searchByKeywordsAll), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByKeywordsAll) {
@@ -54585,10 +54822,10 @@ soap_in_ns1__searchByKeywordsAll(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByKeywordsAll *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -54596,19 +54833,19 @@ soap_in_ns1__searchByKeywordsAll(struct soap *soap, const char *tag,
         sizeof(ns1__searchByKeywordsAll), 0,
         soap_copy_ns1__searchByKeywordsAll);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_startIndex1 > 0 || soap_flag_numberOfResults1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__searchByKeywordsAll::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByKeywordsAll);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByKeywordsAll", id, type))
     return soap->error;
@@ -54626,7 +54863,7 @@ soap_get_ns1__searchByKeywordsAll(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__searchByKeywordsAll(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -54640,10 +54877,11 @@ soap_instantiate_ns1__searchByKeywordsAll(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__searchByKeywordsAll(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchByKeywordsAll, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByKeywordsAll, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByKeywordsAll);
     if (size)
@@ -54726,13 +54964,13 @@ soap_in_ns1__searchByKeywordsResponse(struct soap *soap, const char *tag,
                                       ns1__searchByKeywordsResponse *a,
                                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByKeywordsResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByKeywordsResponse,
       sizeof(ns1__searchByKeywordsResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByKeywordsResponse) {
@@ -54762,10 +55000,10 @@ soap_in_ns1__searchByKeywordsResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByKeywordsResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -54773,14 +55011,14 @@ soap_in_ns1__searchByKeywordsResponse(struct soap *soap, const char *tag,
         sizeof(ns1__searchByKeywordsResponse), 0,
         soap_copy_ns1__searchByKeywordsResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchByKeywordsResponse::soap_put(struct soap *soap, const char *tag,
                                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByKeywordsResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByKeywordsResponse", id,
                      type))
@@ -54800,7 +55038,7 @@ soap_get_ns1__searchByKeywordsResponse(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByKeywordsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -54817,10 +55055,10 @@ soap_instantiate_ns1__searchByKeywordsResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__searchByKeywordsResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchByKeywordsResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByKeywordsResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByKeywordsResponse);
     if (size)
@@ -54858,7 +55096,7 @@ soap_copy_ns1__searchByKeywordsResponse(struct soap *soap, int st, int tt,
 void ns1__searchByKeywords::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchByKeywords::sessionId = NULL;
+  this->ns1__searchByKeywords::sessionId = nullptr;
   soap_default_std__vectorTemplateOfstd__string(
       soap, &this->ns1__searchByKeywords::keywords);
 }
@@ -54907,13 +55145,13 @@ SOAP_FMAC3 ns1__searchByKeywords *SOAP_FMAC4
 soap_in_ns1__searchByKeywords(struct soap *soap, const char *tag,
                               ns1__searchByKeywords *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByKeywords *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByKeywords,
       sizeof(ns1__searchByKeywords), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByKeywords) {
@@ -54952,23 +55190,23 @@ soap_in_ns1__searchByKeywords(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByKeywords *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__searchByKeywords,
         0, sizeof(ns1__searchByKeywords), 0, soap_copy_ns1__searchByKeywords);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchByKeywords::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByKeywords);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByKeywords", id, type))
     return soap->error;
@@ -54985,7 +55223,7 @@ soap_get_ns1__searchByKeywords(struct soap *soap, ns1__searchByKeywords *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByKeywords(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -55000,9 +55238,9 @@ soap_instantiate_ns1__searchByKeywords(struct soap *soap, int n,
                       "soap_instantiate_ns1__searchByKeywords(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchByKeywords, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByKeywords, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByKeywords);
     if (size)
@@ -55038,7 +55276,7 @@ soap_copy_ns1__searchByKeywords(struct soap *soap, int st, int tt, void *p,
 void ns1__checkDatasetDownloadAccessResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__checkDatasetDownloadAccessResponse::downloadInfo = NULL;
+  this->ns1__checkDatasetDownloadAccessResponse::downloadInfo = nullptr;
 }
 
 void ns1__checkDatasetDownloadAccessResponse::soap_serialize(
@@ -55087,15 +55325,15 @@ soap_in_ns1__checkDatasetDownloadAccessResponse(
     struct soap *soap, const char *tag,
     ns1__checkDatasetDownloadAccessResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__checkDatasetDownloadAccessResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccessResponse,
       sizeof(ns1__checkDatasetDownloadAccessResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -55131,10 +55369,10 @@ soap_in_ns1__checkDatasetDownloadAccessResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__checkDatasetDownloadAccessResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -55142,7 +55380,7 @@ soap_in_ns1__checkDatasetDownloadAccessResponse(
         sizeof(ns1__checkDatasetDownloadAccessResponse), 0,
         soap_copy_ns1__checkDatasetDownloadAccessResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -55150,7 +55388,7 @@ soap_in_ns1__checkDatasetDownloadAccessResponse(
 int ns1__checkDatasetDownloadAccessResponse::soap_put(struct soap *soap,
                                                       const char *tag,
                                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccessResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:checkDatasetDownloadAccessResponse",
                      id, type))
@@ -55171,7 +55409,7 @@ soap_get_ns1__checkDatasetDownloadAccessResponse(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__checkDatasetDownloadAccessResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -55188,10 +55426,10 @@ soap_instantiate_ns1__checkDatasetDownloadAccessResponse(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccessResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccessResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__checkDatasetDownloadAccessResponse);
     if (size)
@@ -55232,8 +55470,8 @@ soap_copy_ns1__checkDatasetDownloadAccessResponse(struct soap *soap, int st,
 void ns1__checkDatasetDownloadAccess::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__checkDatasetDownloadAccess::sessionId = NULL;
-  this->ns1__checkDatasetDownloadAccess::datasetId = NULL;
+  this->ns1__checkDatasetDownloadAccess::sessionId = nullptr;
+  this->ns1__checkDatasetDownloadAccess::datasetId = nullptr;
 }
 
 void ns1__checkDatasetDownloadAccess::soap_serialize(struct soap *soap) const {
@@ -55285,13 +55523,13 @@ soap_in_ns1__checkDatasetDownloadAccess(struct soap *soap, const char *tag,
                                         ns1__checkDatasetDownloadAccess *a,
                                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__checkDatasetDownloadAccess *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccess,
       sizeof(ns1__checkDatasetDownloadAccess), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccess) {
@@ -55334,10 +55572,10 @@ soap_in_ns1__checkDatasetDownloadAccess(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__checkDatasetDownloadAccess *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -55345,7 +55583,7 @@ soap_in_ns1__checkDatasetDownloadAccess(struct soap *soap, const char *tag,
         sizeof(ns1__checkDatasetDownloadAccess), 0,
         soap_copy_ns1__checkDatasetDownloadAccess);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -55353,7 +55591,7 @@ soap_in_ns1__checkDatasetDownloadAccess(struct soap *soap, const char *tag,
 int ns1__checkDatasetDownloadAccess::soap_put(struct soap *soap,
                                               const char *tag,
                                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccess);
   if (this->soap_out(soap, tag ? tag : "ns1:checkDatasetDownloadAccess", id,
                      type))
@@ -55373,7 +55611,7 @@ soap_get_ns1__checkDatasetDownloadAccess(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_ns1__checkDatasetDownloadAccess(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -55390,10 +55628,10 @@ soap_instantiate_ns1__checkDatasetDownloadAccess(struct soap *soap, int n,
              "soap_instantiate_ns1__checkDatasetDownloadAccess(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccess, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccess,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__checkDatasetDownloadAccess);
     if (size)
@@ -55483,15 +55721,15 @@ soap_in_ns1__searchDatafileByParameterConditionResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterConditionResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByParameterConditionResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterConditionResponse,
       sizeof(ns1__searchDatafileByParameterConditionResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -55524,10 +55762,10 @@ soap_in_ns1__searchDatafileByParameterConditionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByParameterConditionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -55535,7 +55773,7 @@ soap_in_ns1__searchDatafileByParameterConditionResponse(
         sizeof(ns1__searchDatafileByParameterConditionResponse), 0,
         soap_copy_ns1__searchDatafileByParameterConditionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -55543,7 +55781,7 @@ soap_in_ns1__searchDatafileByParameterConditionResponse(
 int ns1__searchDatafileByParameterConditionResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterConditionResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchDatafileByParameterConditionResponse",
@@ -55565,7 +55803,7 @@ soap_get_ns1__searchDatafileByParameterConditionResponse(
   if ((p = soap_in_ns1__searchDatafileByParameterConditionResponse(soap, tag, p,
                                                                    type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -55580,11 +55818,11 @@ soap_instantiate_ns1__searchDatafileByParameterConditionResponse(
                                     "(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat3_ns1__searchDatafileByParameterConditionResponse,
                 n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatafileByParameterConditionResponse);
     if (size)
@@ -55630,8 +55868,8 @@ soap_copy_ns1__searchDatafileByParameterConditionResponse(struct soap *soap,
 void ns1__searchDatafileByParameterCondition::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatafileByParameterCondition::sessionId = NULL;
-  this->ns1__searchDatafileByParameterCondition::logicalCondition = NULL;
+  this->ns1__searchDatafileByParameterCondition::sessionId = nullptr;
+  this->ns1__searchDatafileByParameterCondition::logicalCondition = nullptr;
 }
 
 void ns1__searchDatafileByParameterCondition::soap_serialize(
@@ -55686,15 +55924,15 @@ soap_in_ns1__searchDatafileByParameterCondition(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterCondition *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByParameterCondition *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterCondition,
       sizeof(ns1__searchDatafileByParameterCondition), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -55740,10 +55978,10 @@ soap_in_ns1__searchDatafileByParameterCondition(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByParameterCondition *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -55751,7 +55989,7 @@ soap_in_ns1__searchDatafileByParameterCondition(
         sizeof(ns1__searchDatafileByParameterCondition), 0,
         soap_copy_ns1__searchDatafileByParameterCondition);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -55759,7 +55997,7 @@ soap_in_ns1__searchDatafileByParameterCondition(
 int ns1__searchDatafileByParameterCondition::soap_put(struct soap *soap,
                                                       const char *tag,
                                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterCondition);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatafileByParameterCondition",
                      id, type))
@@ -55780,7 +56018,7 @@ soap_get_ns1__searchDatafileByParameterCondition(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchDatafileByParameterCondition(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -55797,10 +56035,10 @@ soap_instantiate_ns1__searchDatafileByParameterCondition(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatafileByParameterCondition, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatafileByParameterCondition, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatafileByParameterCondition);
     if (size)
@@ -55892,15 +56130,15 @@ soap_in_ns1__searchByUserSurnamePaginationResponse(
     struct soap *soap, const char *tag,
     ns1__searchByUserSurnamePaginationResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByUserSurnamePaginationResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchByUserSurnamePaginationResponse,
       sizeof(ns1__searchByUserSurnamePaginationResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -55933,10 +56171,10 @@ soap_in_ns1__searchByUserSurnamePaginationResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByUserSurnamePaginationResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -55944,7 +56182,7 @@ soap_in_ns1__searchByUserSurnamePaginationResponse(
         sizeof(ns1__searchByUserSurnamePaginationResponse), 0,
         soap_copy_ns1__searchByUserSurnamePaginationResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -55952,7 +56190,7 @@ soap_in_ns1__searchByUserSurnamePaginationResponse(
 int ns1__searchByUserSurnamePaginationResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchByUserSurnamePaginationResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchByUserSurnamePaginationResponse",
@@ -55975,7 +56213,7 @@ soap_get_ns1__searchByUserSurnamePaginationResponse(
   if ((p = soap_in_ns1__searchByUserSurnamePaginationResponse(soap, tag, p,
                                                               type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -55990,10 +56228,10 @@ soap_instantiate_ns1__searchByUserSurnamePaginationResponse(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchByUserSurnamePaginationResponse, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByUserSurnamePaginationResponse,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByUserSurnamePaginationResponse);
     if (size)
@@ -56036,8 +56274,8 @@ soap_copy_ns1__searchByUserSurnamePaginationResponse(struct soap *soap, int st,
 void ns1__searchByUserSurnamePagination::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchByUserSurnamePagination::sessionId = NULL;
-  this->ns1__searchByUserSurnamePagination::surname = NULL;
+  this->ns1__searchByUserSurnamePagination::sessionId = nullptr;
+  this->ns1__searchByUserSurnamePagination::surname = nullptr;
   soap_default_int(soap, &this->ns1__searchByUserSurnamePagination::startIndex);
   soap_default_int(soap,
                    &this->ns1__searchByUserSurnamePagination::numberOfResults);
@@ -56105,13 +56343,13 @@ soap_in_ns1__searchByUserSurnamePagination(
     struct soap *soap, const char *tag, ns1__searchByUserSurnamePagination *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByUserSurnamePagination *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByUserSurnamePagination,
       sizeof(ns1__searchByUserSurnamePagination), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -56174,10 +56412,10 @@ soap_in_ns1__searchByUserSurnamePagination(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByUserSurnamePagination *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -56185,12 +56423,12 @@ soap_in_ns1__searchByUserSurnamePagination(
         sizeof(ns1__searchByUserSurnamePagination), 0,
         soap_copy_ns1__searchByUserSurnamePagination);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_startIndex1 > 0 || soap_flag_numberOfResults1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
@@ -56198,7 +56436,7 @@ soap_in_ns1__searchByUserSurnamePagination(
 int ns1__searchByUserSurnamePagination::soap_put(struct soap *soap,
                                                  const char *tag,
                                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByUserSurnamePagination);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByUserSurnamePagination", id,
                      type))
@@ -56218,7 +56456,7 @@ soap_get_ns1__searchByUserSurnamePagination(
     const char *type) {
   if ((p = soap_in_ns1__searchByUserSurnamePagination(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -56235,11 +56473,11 @@ soap_instantiate_ns1__searchByUserSurnamePagination(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__searchByUserSurnamePagination(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchByUserSurnamePagination,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByUserSurnamePagination, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByUserSurnamePagination);
     if (size)
@@ -56280,9 +56518,9 @@ void ns1__shiftPK::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityPrimaryKeyBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__shiftPK::endDate = NULL;
-  this->ns1__shiftPK::investigationId = NULL;
-  this->ns1__shiftPK::startDate = NULL;
+  this->ns1__shiftPK::endDate = nullptr;
+  this->ns1__shiftPK::investigationId = nullptr;
+  this->ns1__shiftPK::startDate = nullptr;
 }
 
 void ns1__shiftPK::soap_serialize(struct soap *soap) const {
@@ -56331,13 +56569,13 @@ SOAP_FMAC3 ns1__shiftPK *SOAP_FMAC4
 soap_in_ns1__shiftPK(struct soap *soap, const char *tag, ns1__shiftPK *a,
                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__shiftPK *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__shiftPK, sizeof(ns1__shiftPK),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__shiftPK) {
@@ -56385,23 +56623,23 @@ soap_in_ns1__shiftPK(struct soap *soap, const char *tag, ns1__shiftPK *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__shiftPK *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__shiftPK, 0,
         sizeof(ns1__shiftPK), 0, soap_copy_ns1__shiftPK);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__shiftPK::soap_put(struct soap *soap, const char *tag,
                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__shiftPK);
   if (this->soap_out(soap, tag ? tag : "ns1:shiftPK", id, type))
     return soap->error;
@@ -56418,7 +56656,7 @@ soap_get_ns1__shiftPK(struct soap *soap, ns1__shiftPK *p, const char *tag,
                       const char *type) {
   if ((p = soap_in_ns1__shiftPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -56431,9 +56669,9 @@ soap_instantiate_ns1__shiftPK(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__shiftPK(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__shiftPK, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__shiftPK, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__shiftPK);
     if (size)
@@ -56469,8 +56707,8 @@ void ns1__shift::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__shift::shiftComment = NULL;
-  this->ns1__shift::shiftPK = NULL;
+  this->ns1__shift::shiftComment = nullptr;
+  this->ns1__shift::shiftPK = nullptr;
 }
 
 void ns1__shift::soap_serialize(struct soap *soap) const {
@@ -56526,13 +56764,13 @@ SOAP_FMAC3 ns1__shift *SOAP_FMAC4
 soap_in_ns1__shift(struct soap *soap, const char *tag, ns1__shift *a,
                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__shift *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__shift, sizeof(ns1__shift),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__shift) {
@@ -56605,29 +56843,29 @@ soap_in_ns1__shift(struct soap *soap, const char *tag, ns1__shift *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__shift *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__shift, 0,
         sizeof(ns1__shift), 0, soap_copy_ns1__shift);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__shift::soap_put(struct soap *soap, const char *tag,
                          const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat3_ns1__shift);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat3_ns1__shift);
   if (this->soap_out(soap, tag ? tag : "ns1:shift", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -56643,7 +56881,7 @@ soap_get_ns1__shift(struct soap *soap, ns1__shift *p, const char *tag,
                     const char *type) {
   if ((p = soap_in_ns1__shift(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -56655,9 +56893,9 @@ soap_instantiate_ns1__shift(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__shift(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__shift, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__shift, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__shift);
     if (size)
@@ -56693,11 +56931,11 @@ void ns1__publication::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__publication::fullReference = NULL;
-  this->ns1__publication::id = NULL;
-  this->ns1__publication::repository = NULL;
-  this->ns1__publication::repositoryId = NULL;
-  this->ns1__publication::url = NULL;
+  this->ns1__publication::fullReference = nullptr;
+  this->ns1__publication::id = nullptr;
+  this->ns1__publication::repository = nullptr;
+  this->ns1__publication::repositoryId = nullptr;
+  this->ns1__publication::url = nullptr;
 }
 
 void ns1__publication::soap_serialize(struct soap *soap) const {
@@ -56768,13 +57006,13 @@ SOAP_FMAC3 ns1__publication *SOAP_FMAC4
 soap_in_ns1__publication(struct soap *soap, const char *tag,
                          ns1__publication *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__publication *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__publication,
       sizeof(ns1__publication), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__publication) {
@@ -56873,28 +57111,28 @@ soap_in_ns1__publication(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__publication *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__publication, 0,
         sizeof(ns1__publication), 0, soap_copy_ns1__publication);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__publication::soap_put(struct soap *soap, const char *tag,
                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__publication);
   if (this->soap_out(soap, tag ? tag : "ns1:publication", id, type))
     return soap->error;
@@ -56911,7 +57149,7 @@ soap_get_ns1__publication(struct soap *soap, ns1__publication *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__publication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -56923,10 +57161,10 @@ soap_instantiate_ns1__publication(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__publication(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__publication, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__publication, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__publication);
     if (size)
@@ -56963,7 +57201,7 @@ void ns1__keyword::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__keyword::keywordPK = NULL;
+  this->ns1__keyword::keywordPK = nullptr;
 }
 
 void ns1__keyword::soap_serialize(struct soap *soap) const {
@@ -57016,13 +57254,13 @@ SOAP_FMAC3 ns1__keyword *SOAP_FMAC4
 soap_in_ns1__keyword(struct soap *soap, const char *tag, ns1__keyword *a,
                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__keyword *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__keyword, sizeof(ns1__keyword),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__keyword) {
@@ -57087,28 +57325,28 @@ soap_in_ns1__keyword(struct soap *soap, const char *tag, ns1__keyword *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__keyword *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__keyword, 0,
         sizeof(ns1__keyword), 0, soap_copy_ns1__keyword);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__keyword::soap_put(struct soap *soap, const char *tag,
                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__keyword);
   if (this->soap_out(soap, tag ? tag : "ns1:keyword", id, type))
     return soap->error;
@@ -57125,7 +57363,7 @@ soap_get_ns1__keyword(struct soap *soap, ns1__keyword *p, const char *tag,
                       const char *type) {
   if ((p = soap_in_ns1__keyword(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -57138,9 +57376,9 @@ soap_instantiate_ns1__keyword(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__keyword(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__keyword, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__keyword, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__keyword);
     if (size)
@@ -57176,9 +57414,9 @@ void ns1__investigator::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__investigator::ns1__facilityUser_ = NULL;
-  this->ns1__investigator::investigatorPK = NULL;
-  this->ns1__investigator::role = NULL;
+  this->ns1__investigator::ns1__facilityUser_ = nullptr;
+  this->ns1__investigator::investigatorPK = nullptr;
+  this->ns1__investigator::role = nullptr;
 }
 
 void ns1__investigator::soap_serialize(struct soap *soap) const {
@@ -57243,13 +57481,13 @@ SOAP_FMAC3 ns1__investigator *SOAP_FMAC4
 soap_in_ns1__investigator(struct soap *soap, const char *tag,
                           ns1__investigator *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__investigator *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__investigator,
       sizeof(ns1__investigator), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__investigator) {
@@ -57331,28 +57569,28 @@ soap_in_ns1__investigator(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__investigator *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__investigator, 0,
         sizeof(ns1__investigator), 0, soap_copy_ns1__investigator);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__investigator::soap_put(struct soap *soap, const char *tag,
                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__investigator);
   if (this->soap_out(soap, tag ? tag : "ns1:investigator", id, type))
     return soap->error;
@@ -57369,7 +57607,7 @@ soap_get_ns1__investigator(struct soap *soap, ns1__investigator *p,
                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__investigator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -57382,9 +57620,9 @@ soap_instantiate_ns1__investigator(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__investigator(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__investigator, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__investigator, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__investigator);
     if (size)
@@ -57421,35 +57659,35 @@ void ns1__investigation::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__investigation::bcatInvStr = NULL;
+  this->ns1__investigation::bcatInvStr = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__dataset(
       soap, &this->ns1__investigation::datasetCollection);
-  this->ns1__investigation::facility = NULL;
-  this->ns1__investigation::facilityCycle = NULL;
-  this->ns1__investigation::grantId = NULL;
-  this->ns1__investigation::id = NULL;
-  this->ns1__investigation::instrument = NULL;
-  this->ns1__investigation::invAbstract = NULL;
-  this->ns1__investigation::invEndDate = NULL;
-  this->ns1__investigation::invNumber = NULL;
-  this->ns1__investigation::invParamName = NULL;
-  this->ns1__investigation::invParamValue = NULL;
-  this->ns1__investigation::invStartDate = NULL;
-  this->ns1__investigation::invType = NULL;
+  this->ns1__investigation::facility = nullptr;
+  this->ns1__investigation::facilityCycle = nullptr;
+  this->ns1__investigation::grantId = nullptr;
+  this->ns1__investigation::id = nullptr;
+  this->ns1__investigation::instrument = nullptr;
+  this->ns1__investigation::invAbstract = nullptr;
+  this->ns1__investigation::invEndDate = nullptr;
+  this->ns1__investigation::invNumber = nullptr;
+  this->ns1__investigation::invParamName = nullptr;
+  this->ns1__investigation::invParamValue = nullptr;
+  this->ns1__investigation::invStartDate = nullptr;
+  this->ns1__investigation::invType = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__investigator(
       soap, &this->ns1__investigation::investigatorCollection);
   soap_default_std__vectorTemplateOfPointerTons1__keyword(
       soap, &this->ns1__investigation::keywordCollection);
-  this->ns1__investigation::prevInvNumber = NULL;
+  this->ns1__investigation::prevInvNumber = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__publication(
       soap, &this->ns1__investigation::publicationCollection);
-  this->ns1__investigation::releaseDate = NULL;
+  this->ns1__investigation::releaseDate = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__sample(
       soap, &this->ns1__investigation::sampleCollection);
   soap_default_std__vectorTemplateOfPointerTons1__shift(
       soap, &this->ns1__investigation::shiftCollection);
-  this->ns1__investigation::title = NULL;
-  this->ns1__investigation::visitId = NULL;
+  this->ns1__investigation::title = nullptr;
+  this->ns1__investigation::visitId = nullptr;
 }
 
 void ns1__investigation::soap_serialize(struct soap *soap) const {
@@ -57614,13 +57852,13 @@ SOAP_FMAC3 ns1__investigation *SOAP_FMAC4
 soap_in_ns1__investigation(struct soap *soap, const char *tag,
                            ns1__investigation *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__investigation *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__investigation,
       sizeof(ns1__investigation), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__investigation) {
@@ -57854,28 +58092,28 @@ soap_in_ns1__investigation(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__investigation *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__investigation, 0,
         sizeof(ns1__investigation), 0, soap_copy_ns1__investigation);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__investigation::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__investigation);
   if (this->soap_out(soap, tag ? tag : "ns1:investigation", id, type))
     return soap->error;
@@ -57892,7 +58130,7 @@ soap_get_ns1__investigation(struct soap *soap, ns1__investigation *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__investigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -57905,9 +58143,9 @@ soap_instantiate_ns1__investigation(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__investigation(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__investigation, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__investigation, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__investigation);
     if (size)
@@ -57990,13 +58228,13 @@ soap_in_ns1__searchByUserSurnameResponse(struct soap *soap, const char *tag,
                                          ns1__searchByUserSurnameResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByUserSurnameResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByUserSurnameResponse,
       sizeof(ns1__searchByUserSurnameResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByUserSurnameResponse) {
@@ -58026,10 +58264,10 @@ soap_in_ns1__searchByUserSurnameResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByUserSurnameResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -58037,7 +58275,7 @@ soap_in_ns1__searchByUserSurnameResponse(struct soap *soap, const char *tag,
         sizeof(ns1__searchByUserSurnameResponse), 0,
         soap_copy_ns1__searchByUserSurnameResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -58045,7 +58283,7 @@ soap_in_ns1__searchByUserSurnameResponse(struct soap *soap, const char *tag,
 int ns1__searchByUserSurnameResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByUserSurnameResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByUserSurnameResponse", id,
                      type))
@@ -58065,7 +58303,7 @@ soap_get_ns1__searchByUserSurnameResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchByUserSurnameResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -58082,10 +58320,10 @@ soap_instantiate_ns1__searchByUserSurnameResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__searchByUserSurnameResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchByUserSurnameResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByUserSurnameResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByUserSurnameResponse);
     if (size)
@@ -58125,8 +58363,8 @@ soap_copy_ns1__searchByUserSurnameResponse(struct soap *soap, int st, int tt,
 void ns1__searchByUserSurname::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchByUserSurname::sessionId = NULL;
-  this->ns1__searchByUserSurname::surname = NULL;
+  this->ns1__searchByUserSurname::sessionId = nullptr;
+  this->ns1__searchByUserSurname::surname = nullptr;
 }
 
 void ns1__searchByUserSurname::soap_serialize(struct soap *soap) const {
@@ -58174,13 +58412,13 @@ soap_in_ns1__searchByUserSurname(struct soap *soap, const char *tag,
                                  ns1__searchByUserSurname *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchByUserSurname *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchByUserSurname,
       sizeof(ns1__searchByUserSurname), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchByUserSurname) {
@@ -58223,10 +58461,10 @@ soap_in_ns1__searchByUserSurname(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchByUserSurname *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -58234,14 +58472,14 @@ soap_in_ns1__searchByUserSurname(struct soap *soap, const char *tag,
         sizeof(ns1__searchByUserSurname), 0,
         soap_copy_ns1__searchByUserSurname);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchByUserSurname::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchByUserSurname);
   if (this->soap_out(soap, tag ? tag : "ns1:searchByUserSurname", id, type))
     return soap->error;
@@ -58259,7 +58497,7 @@ soap_get_ns1__searchByUserSurname(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__searchByUserSurname(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -58273,10 +58511,11 @@ soap_instantiate_ns1__searchByUserSurname(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__searchByUserSurname(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchByUserSurname, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchByUserSurname, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchByUserSurname);
     if (size)
@@ -58345,14 +58584,14 @@ soap_in_ns1__deleteDataFileResponse(struct soap *soap, const char *tag,
                                     ns1__deleteDataFileResponse *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__deleteDataFileResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteDataFileResponse,
             sizeof(ns1__deleteDataFileResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -58362,13 +58601,13 @@ soap_in_ns1__deleteDataFileResponse(struct soap *soap, const char *tag,
       return (ns1__deleteDataFileResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__deleteDataFileResponse::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteDataFileResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteDataFileResponse", id, type))
     return soap->error;
@@ -58386,7 +58625,7 @@ soap_get_ns1__deleteDataFileResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteDataFileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -58402,10 +58641,10 @@ soap_instantiate_ns1__deleteDataFileResponse(struct soap *soap, int n,
                    "soap_instantiate_ns1__deleteDataFileResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__deleteDataFileResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteDataFileResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteDataFileResponse);
     if (size)
@@ -58443,8 +58682,8 @@ soap_copy_ns1__deleteDataFileResponse(struct soap *soap, int st, int tt,
 void ns1__deleteDataFile::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__deleteDataFile::sessionId = NULL;
-  this->ns1__deleteDataFile::datafileId = NULL;
+  this->ns1__deleteDataFile::sessionId = nullptr;
+  this->ns1__deleteDataFile::datafileId = nullptr;
 }
 
 void ns1__deleteDataFile::soap_serialize(struct soap *soap) const {
@@ -58489,13 +58728,13 @@ SOAP_FMAC3 ns1__deleteDataFile *SOAP_FMAC4
 soap_in_ns1__deleteDataFile(struct soap *soap, const char *tag,
                             ns1__deleteDataFile *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__deleteDataFile *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteDataFile,
       sizeof(ns1__deleteDataFile), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__deleteDataFile) {
@@ -58537,23 +58776,23 @@ soap_in_ns1__deleteDataFile(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__deleteDataFile *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__deleteDataFile, 0,
         sizeof(ns1__deleteDataFile), 0, soap_copy_ns1__deleteDataFile);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__deleteDataFile::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteDataFile);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteDataFile", id, type))
     return soap->error;
@@ -58570,7 +58809,7 @@ soap_get_ns1__deleteDataFile(struct soap *soap, ns1__deleteDataFile *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteDataFile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -58583,9 +58822,9 @@ soap_instantiate_ns1__deleteDataFile(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__deleteDataFile(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__deleteDataFile, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteDataFile, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteDataFile);
     if (size)
@@ -58621,12 +58860,12 @@ soap_copy_ns1__deleteDataFile(struct soap *soap, int st, int tt, void *p,
 void ns1__downloadInfo::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__downloadInfo::credential = NULL;
+  this->ns1__downloadInfo::credential = nullptr;
   soap_default_std__vectorTemplateOfstd__string(
       soap, &this->ns1__downloadInfo::datafileLocations);
   soap_default_std__vectorTemplateOfPointerToxsd__anyType(
       soap, &this->ns1__downloadInfo::datafileNames);
-  this->ns1__downloadInfo::userId = NULL;
+  this->ns1__downloadInfo::userId = nullptr;
 }
 
 void ns1__downloadInfo::soap_serialize(struct soap *soap) const {
@@ -58683,13 +58922,13 @@ SOAP_FMAC3 ns1__downloadInfo *SOAP_FMAC4
 soap_in_ns1__downloadInfo(struct soap *soap, const char *tag,
                           ns1__downloadInfo *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__downloadInfo *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__downloadInfo,
       sizeof(ns1__downloadInfo), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__downloadInfo) {
@@ -58742,23 +58981,23 @@ soap_in_ns1__downloadInfo(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__downloadInfo *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__downloadInfo, 0,
         sizeof(ns1__downloadInfo), 0, soap_copy_ns1__downloadInfo);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__downloadInfo::soap_put(struct soap *soap, const char *tag,
                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__downloadInfo);
   if (this->soap_out(soap, tag ? tag : "ns1:downloadInfo", id, type))
     return soap->error;
@@ -58775,7 +59014,7 @@ soap_get_ns1__downloadInfo(struct soap *soap, ns1__downloadInfo *p,
                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__downloadInfo(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -58788,9 +59027,9 @@ soap_instantiate_ns1__downloadInfo(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__downloadInfo(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__downloadInfo, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__downloadInfo, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__downloadInfo);
     if (size)
@@ -58826,7 +59065,7 @@ soap_copy_ns1__downloadInfo(struct soap *soap, int st, int tt, void *p,
 void ns1__checkDatafileDownloadAccessResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__checkDatafileDownloadAccessResponse::downloadInfo = NULL;
+  this->ns1__checkDatafileDownloadAccessResponse::downloadInfo = nullptr;
 }
 
 void ns1__checkDatafileDownloadAccessResponse::soap_serialize(
@@ -58876,15 +59115,15 @@ soap_in_ns1__checkDatafileDownloadAccessResponse(
     struct soap *soap, const char *tag,
     ns1__checkDatafileDownloadAccessResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__checkDatafileDownloadAccessResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccessResponse,
       sizeof(ns1__checkDatafileDownloadAccessResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -58920,10 +59159,10 @@ soap_in_ns1__checkDatafileDownloadAccessResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__checkDatafileDownloadAccessResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -58931,7 +59170,7 @@ soap_in_ns1__checkDatafileDownloadAccessResponse(
         sizeof(ns1__checkDatafileDownloadAccessResponse), 0,
         soap_copy_ns1__checkDatafileDownloadAccessResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -58939,7 +59178,7 @@ soap_in_ns1__checkDatafileDownloadAccessResponse(
 int ns1__checkDatafileDownloadAccessResponse::soap_put(struct soap *soap,
                                                        const char *tag,
                                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccessResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:checkDatafileDownloadAccessResponse", id,
@@ -58962,7 +59201,7 @@ soap_get_ns1__checkDatafileDownloadAccessResponse(
   if ((p = soap_in_ns1__checkDatafileDownloadAccessResponse(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -58979,10 +59218,10 @@ soap_instantiate_ns1__checkDatafileDownloadAccessResponse(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccessResponse, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccessResponse,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__checkDatafileDownloadAccessResponse);
     if (size)
@@ -59024,7 +59263,7 @@ soap_copy_ns1__checkDatafileDownloadAccessResponse(struct soap *soap, int st,
 void ns1__checkDatafileDownloadAccess::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__checkDatafileDownloadAccess::sessionId = NULL;
+  this->ns1__checkDatafileDownloadAccess::sessionId = nullptr;
   soap_default_std__vectorTemplateOfLONG64(
       soap, &this->ns1__checkDatafileDownloadAccess::datafileIds);
 }
@@ -59078,13 +59317,13 @@ soap_in_ns1__checkDatafileDownloadAccess(struct soap *soap, const char *tag,
                                          ns1__checkDatafileDownloadAccess *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__checkDatafileDownloadAccess *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccess,
       sizeof(ns1__checkDatafileDownloadAccess), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccess) {
@@ -59125,10 +59364,10 @@ soap_in_ns1__checkDatafileDownloadAccess(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__checkDatafileDownloadAccess *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -59136,7 +59375,7 @@ soap_in_ns1__checkDatafileDownloadAccess(struct soap *soap, const char *tag,
         sizeof(ns1__checkDatafileDownloadAccess), 0,
         soap_copy_ns1__checkDatafileDownloadAccess);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -59144,7 +59383,7 @@ soap_in_ns1__checkDatafileDownloadAccess(struct soap *soap, const char *tag,
 int ns1__checkDatafileDownloadAccess::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccess);
   if (this->soap_out(soap, tag ? tag : "ns1:checkDatafileDownloadAccess", id,
                      type))
@@ -59164,7 +59403,7 @@ soap_get_ns1__checkDatafileDownloadAccess(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__checkDatafileDownloadAccess(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -59181,10 +59420,10 @@ soap_instantiate_ns1__checkDatafileDownloadAccess(struct soap *soap, int n,
              "soap_instantiate_ns1__checkDatafileDownloadAccess(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccess, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccess,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__checkDatafileDownloadAccess);
     if (size)
@@ -59225,7 +59464,7 @@ void ns1__getFacilityUserByFacilityUserIdResponse::soap_default(
     struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getFacilityUserByFacilityUserIdResponse::return_ = NULL;
+  this->ns1__getFacilityUserByFacilityUserIdResponse::return_ = nullptr;
 }
 
 void ns1__getFacilityUserByFacilityUserIdResponse::soap_serialize(
@@ -59274,15 +59513,15 @@ soap_in_ns1__getFacilityUserByFacilityUserIdResponse(
     struct soap *soap, const char *tag,
     ns1__getFacilityUserByFacilityUserIdResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getFacilityUserByFacilityUserIdResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__getFacilityUserByFacilityUserIdResponse,
       sizeof(ns1__getFacilityUserByFacilityUserIdResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -59318,10 +59557,10 @@ soap_in_ns1__getFacilityUserByFacilityUserIdResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getFacilityUserByFacilityUserIdResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -59329,7 +59568,7 @@ soap_in_ns1__getFacilityUserByFacilityUserIdResponse(
         sizeof(ns1__getFacilityUserByFacilityUserIdResponse), 0,
         soap_copy_ns1__getFacilityUserByFacilityUserIdResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -59337,7 +59576,7 @@ soap_in_ns1__getFacilityUserByFacilityUserIdResponse(
 int ns1__getFacilityUserByFacilityUserIdResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__getFacilityUserByFacilityUserIdResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:getFacilityUserByFacilityUserIdResponse",
@@ -59360,7 +59599,7 @@ soap_get_ns1__getFacilityUserByFacilityUserIdResponse(
   if ((p = soap_in_ns1__getFacilityUserByFacilityUserIdResponse(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -59374,11 +59613,12 @@ soap_instantiate_ns1__getFacilityUserByFacilityUserIdResponse(
                                     "getFacilityUserByFacilityUserIdResponse(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getFacilityUserByFacilityUserIdResponse,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_ns1__getFacilityUserByFacilityUserIdResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getFacilityUserByFacilityUserIdResponse);
     if (size)
@@ -59423,8 +59663,8 @@ soap_copy_ns1__getFacilityUserByFacilityUserIdResponse(struct soap *soap,
 void ns1__getFacilityUserByFacilityUserId::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getFacilityUserByFacilityUserId::sessionId = NULL;
-  this->ns1__getFacilityUserByFacilityUserId::facilityUserId = NULL;
+  this->ns1__getFacilityUserByFacilityUserId::sessionId = nullptr;
+  this->ns1__getFacilityUserByFacilityUserId::facilityUserId = nullptr;
 }
 
 void ns1__getFacilityUserByFacilityUserId::soap_serialize(
@@ -59478,14 +59718,14 @@ soap_in_ns1__getFacilityUserByFacilityUserId(
     struct soap *soap, const char *tag, ns1__getFacilityUserByFacilityUserId *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getFacilityUserByFacilityUserId *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getFacilityUserByFacilityUserId,
       sizeof(ns1__getFacilityUserByFacilityUserId), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -59532,10 +59772,10 @@ soap_in_ns1__getFacilityUserByFacilityUserId(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getFacilityUserByFacilityUserId *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -59543,7 +59783,7 @@ soap_in_ns1__getFacilityUserByFacilityUserId(
         sizeof(ns1__getFacilityUserByFacilityUserId), 0,
         soap_copy_ns1__getFacilityUserByFacilityUserId);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -59551,7 +59791,7 @@ soap_in_ns1__getFacilityUserByFacilityUserId(
 int ns1__getFacilityUserByFacilityUserId::soap_put(struct soap *soap,
                                                    const char *tag,
                                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getFacilityUserByFacilityUserId);
   if (this->soap_out(soap, tag ? tag : "ns1:getFacilityUserByFacilityUserId",
                      id, type))
@@ -59571,7 +59811,7 @@ soap_get_ns1__getFacilityUserByFacilityUserId(
     const char *type) {
   if ((p = soap_in_ns1__getFacilityUserByFacilityUserId(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -59589,10 +59829,10 @@ soap_instantiate_ns1__getFacilityUserByFacilityUserId(struct soap *soap, int n,
           "soap_instantiate_ns1__getFacilityUserByFacilityUserId(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getFacilityUserByFacilityUserId, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getFacilityUserByFacilityUserId, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getFacilityUserByFacilityUserId);
     if (size)
@@ -59687,8 +59927,8 @@ soap_in_ns1__getFacilityCyclesWithDataForInstrumentResponse(
     struct soap *soap, const char *tag,
     ns1__getFacilityCyclesWithDataForInstrumentResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getFacilityCyclesWithDataForInstrumentResponse *)
       soap_class_id_enter(
           soap, soap->id, a,
@@ -59696,7 +59936,7 @@ soap_in_ns1__getFacilityCyclesWithDataForInstrumentResponse(
           sizeof(ns1__getFacilityCyclesWithDataForInstrumentResponse),
           soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -59730,10 +59970,10 @@ soap_in_ns1__getFacilityCyclesWithDataForInstrumentResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getFacilityCyclesWithDataForInstrumentResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -59741,7 +59981,7 @@ soap_in_ns1__getFacilityCyclesWithDataForInstrumentResponse(
         sizeof(ns1__getFacilityCyclesWithDataForInstrumentResponse), 0,
         soap_copy_ns1__getFacilityCyclesWithDataForInstrumentResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -59749,7 +59989,7 @@ soap_in_ns1__getFacilityCyclesWithDataForInstrumentResponse(
 int ns1__getFacilityCyclesWithDataForInstrumentResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__getFacilityCyclesWithDataForInstrumentResponse);
   if (this->soap_out(soap,
                      tag ? tag
@@ -59772,7 +60012,7 @@ soap_get_ns1__getFacilityCyclesWithDataForInstrumentResponse(
   if ((p = soap_in_ns1__getFacilityCyclesWithDataForInstrumentResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -59787,11 +60027,11 @@ soap_instantiate_ns1__getFacilityCyclesWithDataForInstrumentResponse(
                                     "onse(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__getFacilityCyclesWithDataForInstrumentResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(ns1__getFacilityCyclesWithDataForInstrumentResponse);
@@ -59837,8 +60077,8 @@ void ns1__getFacilityCyclesWithDataForInstrument::soap_default(
     struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getFacilityCyclesWithDataForInstrument::sessionId = NULL;
-  this->ns1__getFacilityCyclesWithDataForInstrument::instrument = NULL;
+  this->ns1__getFacilityCyclesWithDataForInstrument::sessionId = nullptr;
+  this->ns1__getFacilityCyclesWithDataForInstrument::instrument = nullptr;
 }
 
 void ns1__getFacilityCyclesWithDataForInstrument::soap_serialize(
@@ -59893,15 +60133,15 @@ soap_in_ns1__getFacilityCyclesWithDataForInstrument(
     struct soap *soap, const char *tag,
     ns1__getFacilityCyclesWithDataForInstrument *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getFacilityCyclesWithDataForInstrument *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__getFacilityCyclesWithDataForInstrument,
       sizeof(ns1__getFacilityCyclesWithDataForInstrument), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -59948,10 +60188,10 @@ soap_in_ns1__getFacilityCyclesWithDataForInstrument(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getFacilityCyclesWithDataForInstrument *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -59959,7 +60199,7 @@ soap_in_ns1__getFacilityCyclesWithDataForInstrument(
         sizeof(ns1__getFacilityCyclesWithDataForInstrument), 0,
         soap_copy_ns1__getFacilityCyclesWithDataForInstrument);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -59967,7 +60207,7 @@ soap_in_ns1__getFacilityCyclesWithDataForInstrument(
 int ns1__getFacilityCyclesWithDataForInstrument::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__getFacilityCyclesWithDataForInstrument);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:getFacilityCyclesWithDataForInstrument",
@@ -59990,7 +60230,7 @@ soap_get_ns1__getFacilityCyclesWithDataForInstrument(
   if ((p = soap_in_ns1__getFacilityCyclesWithDataForInstrument(soap, tag, p,
                                                                type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -60004,11 +60244,12 @@ soap_instantiate_ns1__getFacilityCyclesWithDataForInstrument(
                                     "getFacilityCyclesWithDataForInstrument(%d,"
                                     " %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getFacilityCyclesWithDataForInstrument,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_ns1__getFacilityCyclesWithDataForInstrument, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getFacilityCyclesWithDataForInstrument);
     if (size)
@@ -60051,7 +60292,7 @@ soap_copy_ns1__getFacilityCyclesWithDataForInstrument(struct soap *soap, int st,
 void ns1__addSampleParameterResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addSampleParameterResponse::return_ = NULL;
+  this->ns1__addSampleParameterResponse::return_ = nullptr;
 }
 
 void ns1__addSampleParameterResponse::soap_serialize(struct soap *soap) const {
@@ -60097,13 +60338,13 @@ soap_in_ns1__addSampleParameterResponse(struct soap *soap, const char *tag,
                                         ns1__addSampleParameterResponse *a,
                                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addSampleParameterResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addSampleParameterResponse,
       sizeof(ns1__addSampleParameterResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addSampleParameterResponse) {
@@ -60136,10 +60377,10 @@ soap_in_ns1__addSampleParameterResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addSampleParameterResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -60147,7 +60388,7 @@ soap_in_ns1__addSampleParameterResponse(struct soap *soap, const char *tag,
         sizeof(ns1__addSampleParameterResponse), 0,
         soap_copy_ns1__addSampleParameterResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -60155,7 +60396,7 @@ soap_in_ns1__addSampleParameterResponse(struct soap *soap, const char *tag,
 int ns1__addSampleParameterResponse::soap_put(struct soap *soap,
                                               const char *tag,
                                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addSampleParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:addSampleParameterResponse", id,
                      type))
@@ -60175,7 +60416,7 @@ soap_get_ns1__addSampleParameterResponse(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_ns1__addSampleParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -60192,10 +60433,10 @@ soap_instantiate_ns1__addSampleParameterResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__addSampleParameterResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__addSampleParameterResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__addSampleParameterResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addSampleParameterResponse);
     if (size)
@@ -60233,9 +60474,9 @@ soap_copy_ns1__addSampleParameterResponse(struct soap *soap, int st, int tt,
 void ns1__addSampleParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addSampleParameter::sessionId = NULL;
-  this->ns1__addSampleParameter::sampleParameter = NULL;
-  this->ns1__addSampleParameter::investigationId = NULL;
+  this->ns1__addSampleParameter::sessionId = nullptr;
+  this->ns1__addSampleParameter::sampleParameter = nullptr;
+  this->ns1__addSampleParameter::investigationId = nullptr;
 }
 
 void ns1__addSampleParameter::soap_serialize(struct soap *soap) const {
@@ -60289,13 +60530,13 @@ SOAP_FMAC3 ns1__addSampleParameter *SOAP_FMAC4
 soap_in_ns1__addSampleParameter(struct soap *soap, const char *tag,
                                 ns1__addSampleParameter *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addSampleParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addSampleParameter,
       sizeof(ns1__addSampleParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addSampleParameter) {
@@ -60346,24 +60587,24 @@ soap_in_ns1__addSampleParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addSampleParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__addSampleParameter,
         0, sizeof(ns1__addSampleParameter), 0,
         soap_copy_ns1__addSampleParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addSampleParameter::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addSampleParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:addSampleParameter", id, type))
     return soap->error;
@@ -60380,7 +60621,7 @@ soap_get_ns1__addSampleParameter(struct soap *soap, ns1__addSampleParameter *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__addSampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -60395,9 +60636,9 @@ soap_instantiate_ns1__addSampleParameter(struct soap *soap, int n,
                       "soap_instantiate_ns1__addSampleParameter(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__addSampleParameter, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__addSampleParameter, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addSampleParameter);
     if (size)
@@ -60465,13 +60706,13 @@ soap_in_ns1__modifyDataSetResponse(struct soap *soap, const char *tag,
                                    ns1__modifyDataSetResponse *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__modifyDataSetResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifyDataSetResponse,
             sizeof(ns1__modifyDataSetResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -60481,13 +60722,13 @@ soap_in_ns1__modifyDataSetResponse(struct soap *soap, const char *tag,
       return (ns1__modifyDataSetResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__modifyDataSetResponse::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifyDataSetResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:modifyDataSetResponse", id, type))
     return soap->error;
@@ -60505,7 +60746,7 @@ soap_get_ns1__modifyDataSetResponse(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__modifyDataSetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -60520,10 +60761,11 @@ soap_instantiate_ns1__modifyDataSetResponse(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__modifyDataSetResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__modifyDataSetResponse, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__modifyDataSetResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifyDataSetResponse);
     if (size)
@@ -60560,8 +60802,8 @@ soap_copy_ns1__modifyDataSetResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__modifyDataSet::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__modifyDataSet::sessionId = NULL;
-  this->ns1__modifyDataSet::dataSet = NULL;
+  this->ns1__modifyDataSet::sessionId = nullptr;
+  this->ns1__modifyDataSet::dataSet = nullptr;
 }
 
 void ns1__modifyDataSet::soap_serialize(struct soap *soap) const {
@@ -60607,13 +60849,13 @@ SOAP_FMAC3 ns1__modifyDataSet *SOAP_FMAC4
 soap_in_ns1__modifyDataSet(struct soap *soap, const char *tag,
                            ns1__modifyDataSet *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__modifyDataSet *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifyDataSet,
       sizeof(ns1__modifyDataSet), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__modifyDataSet) {
@@ -60655,23 +60897,23 @@ soap_in_ns1__modifyDataSet(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__modifyDataSet *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__modifyDataSet, 0,
         sizeof(ns1__modifyDataSet), 0, soap_copy_ns1__modifyDataSet);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__modifyDataSet::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifyDataSet);
   if (this->soap_out(soap, tag ? tag : "ns1:modifyDataSet", id, type))
     return soap->error;
@@ -60688,7 +60930,7 @@ soap_get_ns1__modifyDataSet(struct soap *soap, ns1__modifyDataSet *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__modifyDataSet(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -60701,9 +60943,9 @@ soap_instantiate_ns1__modifyDataSet(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__modifyDataSet(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__modifyDataSet, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__modifyDataSet, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifyDataSet);
     if (size)
@@ -60791,15 +61033,15 @@ soap_in_ns1__searchDatasetByParameterComparisonResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterComparisonResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByParameterComparisonResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterComparisonResponse,
       sizeof(ns1__searchDatasetByParameterComparisonResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -60832,10 +61074,10 @@ soap_in_ns1__searchDatasetByParameterComparisonResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByParameterComparisonResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -60843,7 +61085,7 @@ soap_in_ns1__searchDatasetByParameterComparisonResponse(
         sizeof(ns1__searchDatasetByParameterComparisonResponse), 0,
         soap_copy_ns1__searchDatasetByParameterComparisonResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -60851,7 +61093,7 @@ soap_in_ns1__searchDatasetByParameterComparisonResponse(
 int ns1__searchDatasetByParameterComparisonResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterComparisonResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchDatasetByParameterComparisonResponse",
@@ -60873,7 +61115,7 @@ soap_get_ns1__searchDatasetByParameterComparisonResponse(
   if ((p = soap_in_ns1__searchDatasetByParameterComparisonResponse(soap, tag, p,
                                                                    type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -60888,11 +61130,11 @@ soap_instantiate_ns1__searchDatasetByParameterComparisonResponse(
                                     "(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat3_ns1__searchDatasetByParameterComparisonResponse,
                 n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetByParameterComparisonResponse);
     if (size)
@@ -60940,10 +61182,10 @@ void ns1__parameterComparisonCondition::soap_default(struct soap *soap) {
   this->ns1__parameterCondition::soap_default(soap);
   this->ns1__condition::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__parameterComparisonCondition::comparator = NULL;
-  this->ns1__parameterComparisonCondition::parameterSearch = NULL;
-  this->ns1__parameterComparisonCondition::value = NULL;
-  this->ns1__parameterComparisonCondition::valueRight = NULL;
+  this->ns1__parameterComparisonCondition::comparator = nullptr;
+  this->ns1__parameterComparisonCondition::parameterSearch = nullptr;
+  this->ns1__parameterComparisonCondition::value = nullptr;
+  this->ns1__parameterComparisonCondition::valueRight = nullptr;
 }
 
 void ns1__parameterComparisonCondition::soap_serialize(
@@ -61014,13 +61256,13 @@ soap_in_ns1__parameterComparisonCondition(struct soap *soap, const char *tag,
                                           ns1__parameterComparisonCondition *a,
                                           const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__parameterComparisonCondition *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__parameterComparisonCondition,
       sizeof(ns1__parameterComparisonCondition), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -61095,10 +61337,10 @@ soap_in_ns1__parameterComparisonCondition(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__parameterComparisonCondition *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -61106,12 +61348,12 @@ soap_in_ns1__parameterComparisonCondition(struct soap *soap, const char *tag,
         sizeof(ns1__parameterComparisonCondition), 0,
         soap_copy_ns1__parameterComparisonCondition);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_negate3 > 0 || soap_flag_sensitive3 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
@@ -61119,7 +61361,7 @@ soap_in_ns1__parameterComparisonCondition(struct soap *soap, const char *tag,
 int ns1__parameterComparisonCondition::soap_put(struct soap *soap,
                                                 const char *tag,
                                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__parameterComparisonCondition);
   if (this->soap_out(soap, tag ? tag : "ns1:parameterComparisonCondition", id,
                      type))
@@ -61139,7 +61381,7 @@ soap_get_ns1__parameterComparisonCondition(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__parameterComparisonCondition(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -61155,11 +61397,11 @@ soap_instantiate_ns1__parameterComparisonCondition(struct soap *soap, int n,
              fdebug,
              "soap_instantiate_ns1__parameterComparisonCondition(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__parameterComparisonCondition,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__parameterComparisonCondition, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__parameterComparisonCondition);
     if (size)
@@ -61199,7 +61441,7 @@ soap_copy_ns1__parameterComparisonCondition(struct soap *soap, int st, int tt,
 void ns1__searchDatasetByParameterComparison::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatasetByParameterComparison::sessionId = NULL;
+  this->ns1__searchDatasetByParameterComparison::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__parameterComparisonCondition(
       soap, &this->ns1__searchDatasetByParameterComparison::comparison);
 }
@@ -61256,15 +61498,15 @@ soap_in_ns1__searchDatasetByParameterComparison(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterComparison *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByParameterComparison *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterComparison,
       sizeof(ns1__searchDatasetByParameterComparison), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -61307,10 +61549,10 @@ soap_in_ns1__searchDatasetByParameterComparison(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByParameterComparison *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -61318,7 +61560,7 @@ soap_in_ns1__searchDatasetByParameterComparison(
         sizeof(ns1__searchDatasetByParameterComparison), 0,
         soap_copy_ns1__searchDatasetByParameterComparison);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -61326,7 +61568,7 @@ soap_in_ns1__searchDatasetByParameterComparison(
 int ns1__searchDatasetByParameterComparison::soap_put(struct soap *soap,
                                                       const char *tag,
                                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterComparison);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatasetByParameterComparison",
                      id, type))
@@ -61347,7 +61589,7 @@ soap_get_ns1__searchDatasetByParameterComparison(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchDatasetByParameterComparison(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -61364,10 +61606,10 @@ soap_instantiate_ns1__searchDatasetByParameterComparison(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatasetByParameterComparison, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatasetByParameterComparison, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetByParameterComparison);
     if (size)
@@ -61458,14 +61700,14 @@ soap_in_ns1__searchSampleByRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByRestrictionResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByRestrictionResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionResponse,
       sizeof(ns1__searchSampleByRestrictionResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -61498,10 +61740,10 @@ soap_in_ns1__searchSampleByRestrictionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByRestrictionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -61509,7 +61751,7 @@ soap_in_ns1__searchSampleByRestrictionResponse(
         sizeof(ns1__searchSampleByRestrictionResponse), 0,
         soap_copy_ns1__searchSampleByRestrictionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -61517,7 +61759,7 @@ soap_in_ns1__searchSampleByRestrictionResponse(
 int ns1__searchSampleByRestrictionResponse::soap_put(struct soap *soap,
                                                      const char *tag,
                                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchSampleByRestrictionResponse",
                      id, type))
@@ -61537,7 +61779,7 @@ soap_get_ns1__searchSampleByRestrictionResponse(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchSampleByRestrictionResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -61553,10 +61795,10 @@ soap_instantiate_ns1__searchSampleByRestrictionResponse(struct soap *soap,
                               "searchSampleByRestrictionResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByRestrictionResponse);
     if (size)
@@ -61596,8 +61838,8 @@ soap_copy_ns1__searchSampleByRestrictionResponse(struct soap *soap, int st,
 void ns1__searchSampleByRestriction::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchSampleByRestriction::sessionId = NULL;
-  this->ns1__searchSampleByRestriction::restriction = NULL;
+  this->ns1__searchSampleByRestriction::sessionId = nullptr;
+  this->ns1__searchSampleByRestriction::restriction = nullptr;
 }
 
 void ns1__searchSampleByRestriction::soap_serialize(struct soap *soap) const {
@@ -61650,13 +61892,13 @@ soap_in_ns1__searchSampleByRestriction(struct soap *soap, const char *tag,
                                        ns1__searchSampleByRestriction *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByRestriction *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchSampleByRestriction,
       sizeof(ns1__searchSampleByRestriction), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchSampleByRestriction) {
@@ -61700,10 +61942,10 @@ soap_in_ns1__searchSampleByRestriction(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByRestriction *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -61711,14 +61953,14 @@ soap_in_ns1__searchSampleByRestriction(struct soap *soap, const char *tag,
         sizeof(ns1__searchSampleByRestriction), 0,
         soap_copy_ns1__searchSampleByRestriction);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchSampleByRestriction::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchSampleByRestriction);
   if (this->soap_out(soap, tag ? tag : "ns1:searchSampleByRestriction", id,
                      type))
@@ -61738,7 +61980,7 @@ soap_get_ns1__searchSampleByRestriction(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchSampleByRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -61755,10 +61997,10 @@ soap_instantiate_ns1__searchSampleByRestriction(struct soap *soap, int n,
              "soap_instantiate_ns1__searchSampleByRestriction(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchSampleByRestriction, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchSampleByRestriction,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByRestriction);
     if (size)
@@ -61796,7 +62038,7 @@ soap_copy_ns1__searchSampleByRestriction(struct soap *soap, int st, int tt,
 void ns1__downloadDatafilesResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__downloadDatafilesResponse::URL = NULL;
+  this->ns1__downloadDatafilesResponse::URL = nullptr;
 }
 
 void ns1__downloadDatafilesResponse::soap_serialize(struct soap *soap) const {
@@ -61842,13 +62084,13 @@ soap_in_ns1__downloadDatafilesResponse(struct soap *soap, const char *tag,
                                        ns1__downloadDatafilesResponse *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__downloadDatafilesResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__downloadDatafilesResponse,
       sizeof(ns1__downloadDatafilesResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__downloadDatafilesResponse) {
@@ -61882,10 +62124,10 @@ soap_in_ns1__downloadDatafilesResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__downloadDatafilesResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -61893,14 +62135,14 @@ soap_in_ns1__downloadDatafilesResponse(struct soap *soap, const char *tag,
         sizeof(ns1__downloadDatafilesResponse), 0,
         soap_copy_ns1__downloadDatafilesResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__downloadDatafilesResponse::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__downloadDatafilesResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:downloadDatafilesResponse", id,
                      type))
@@ -61920,7 +62162,7 @@ soap_get_ns1__downloadDatafilesResponse(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__downloadDatafilesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -61937,10 +62179,10 @@ soap_instantiate_ns1__downloadDatafilesResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__downloadDatafilesResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__downloadDatafilesResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__downloadDatafilesResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__downloadDatafilesResponse);
     if (size)
@@ -61978,7 +62220,7 @@ soap_copy_ns1__downloadDatafilesResponse(struct soap *soap, int st, int tt,
 void ns1__downloadDatafiles::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__downloadDatafiles::sessionId = NULL;
+  this->ns1__downloadDatafiles::sessionId = nullptr;
   soap_default_std__vectorTemplateOfLONG64(
       soap, &this->ns1__downloadDatafiles::datafileIds);
 }
@@ -62028,13 +62270,13 @@ SOAP_FMAC3 ns1__downloadDatafiles *SOAP_FMAC4
 soap_in_ns1__downloadDatafiles(struct soap *soap, const char *tag,
                                ns1__downloadDatafiles *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__downloadDatafiles *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__downloadDatafiles,
       sizeof(ns1__downloadDatafiles), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__downloadDatafiles) {
@@ -62073,23 +62315,23 @@ soap_in_ns1__downloadDatafiles(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__downloadDatafiles *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__downloadDatafiles,
         0, sizeof(ns1__downloadDatafiles), 0, soap_copy_ns1__downloadDatafiles);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__downloadDatafiles::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__downloadDatafiles);
   if (this->soap_out(soap, tag ? tag : "ns1:downloadDatafiles", id, type))
     return soap->error;
@@ -62106,7 +62348,7 @@ soap_get_ns1__downloadDatafiles(struct soap *soap, ns1__downloadDatafiles *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__downloadDatafiles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -62121,9 +62363,9 @@ soap_instantiate_ns1__downloadDatafiles(struct soap *soap, int n,
                       "soap_instantiate_ns1__downloadDatafiles(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__downloadDatafiles, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__downloadDatafiles, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__downloadDatafiles);
     if (size)
@@ -62214,8 +62456,8 @@ soap_in_ns1__searchInvestigationByParameterConditionResponse(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterConditionResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByParameterConditionResponse *)
       soap_class_id_enter(
           soap, soap->id, a,
@@ -62223,7 +62465,7 @@ soap_in_ns1__searchInvestigationByParameterConditionResponse(
           sizeof(ns1__searchInvestigationByParameterConditionResponse),
           soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -62257,10 +62499,10 @@ soap_in_ns1__searchInvestigationByParameterConditionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByParameterConditionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -62268,7 +62510,7 @@ soap_in_ns1__searchInvestigationByParameterConditionResponse(
         sizeof(ns1__searchInvestigationByParameterConditionResponse), 0,
         soap_copy_ns1__searchInvestigationByParameterConditionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -62276,7 +62518,7 @@ soap_in_ns1__searchInvestigationByParameterConditionResponse(
 int ns1__searchInvestigationByParameterConditionResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterConditionResponse);
   if (this->soap_out(
           soap,
@@ -62299,7 +62541,7 @@ soap_get_ns1__searchInvestigationByParameterConditionResponse(
   if ((p = soap_in_ns1__searchInvestigationByParameterConditionResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -62314,11 +62556,11 @@ soap_instantiate_ns1__searchInvestigationByParameterConditionResponse(
                                     "ponse(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterConditionResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(ns1__searchInvestigationByParameterConditionResponse);
@@ -62364,8 +62606,9 @@ void ns1__searchInvestigationByParameterCondition::soap_default(
     struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchInvestigationByParameterCondition::sessionId = NULL;
-  this->ns1__searchInvestigationByParameterCondition::logicalCondition = NULL;
+  this->ns1__searchInvestigationByParameterCondition::sessionId = nullptr;
+  this->ns1__searchInvestigationByParameterCondition::logicalCondition =
+      nullptr;
 }
 
 void ns1__searchInvestigationByParameterCondition::soap_serialize(
@@ -62422,15 +62665,15 @@ soap_in_ns1__searchInvestigationByParameterCondition(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterCondition *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByParameterCondition *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterCondition,
       sizeof(ns1__searchInvestigationByParameterCondition), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -62477,10 +62720,10 @@ soap_in_ns1__searchInvestigationByParameterCondition(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByParameterCondition *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -62488,7 +62731,7 @@ soap_in_ns1__searchInvestigationByParameterCondition(
         sizeof(ns1__searchInvestigationByParameterCondition), 0,
         soap_copy_ns1__searchInvestigationByParameterCondition);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -62496,7 +62739,7 @@ soap_in_ns1__searchInvestigationByParameterCondition(
 int ns1__searchInvestigationByParameterCondition::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterCondition);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchInvestigationByParameterCondition",
@@ -62519,7 +62762,7 @@ soap_get_ns1__searchInvestigationByParameterCondition(
   if ((p = soap_in_ns1__searchInvestigationByParameterCondition(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -62533,11 +62776,12 @@ soap_instantiate_ns1__searchInvestigationByParameterCondition(
                                     "searchInvestigationByParameterCondition(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterCondition,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterCondition, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchInvestigationByParameterCondition);
     if (size)
@@ -62632,14 +62876,14 @@ soap_in_ns1__searchDatafileByParameterResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByParameterResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchDatafileByParameterResponse,
       sizeof(ns1__searchDatafileByParameterResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -62672,10 +62916,10 @@ soap_in_ns1__searchDatafileByParameterResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByParameterResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -62683,7 +62927,7 @@ soap_in_ns1__searchDatafileByParameterResponse(
         sizeof(ns1__searchDatafileByParameterResponse), 0,
         soap_copy_ns1__searchDatafileByParameterResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -62691,7 +62935,7 @@ soap_in_ns1__searchDatafileByParameterResponse(
 int ns1__searchDatafileByParameterResponse::soap_put(struct soap *soap,
                                                      const char *tag,
                                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatafileByParameterResponse",
                      id, type))
@@ -62711,7 +62955,7 @@ soap_get_ns1__searchDatafileByParameterResponse(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchDatafileByParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -62727,10 +62971,10 @@ soap_instantiate_ns1__searchDatafileByParameterResponse(struct soap *soap,
                               "searchDatafileByParameterResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatafileByParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatafileByParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatafileByParameterResponse);
     if (size)
@@ -62772,8 +63016,8 @@ void ns1__parameterSearch::soap_default(struct soap *soap) {
   this->ns1__parameterCondition::soap_default(soap);
   this->ns1__condition::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__parameterSearch::param = NULL;
-  this->ns1__parameterSearch::type = NULL;
+  this->ns1__parameterSearch::param = nullptr;
+  this->ns1__parameterSearch::type = nullptr;
 }
 
 void ns1__parameterSearch::soap_serialize(struct soap *soap) const {
@@ -62825,13 +63069,13 @@ SOAP_FMAC3 ns1__parameterSearch *SOAP_FMAC4
 soap_in_ns1__parameterSearch(struct soap *soap, const char *tag,
                              ns1__parameterSearch *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__parameterSearch *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__parameterSearch,
       sizeof(ns1__parameterSearch), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__parameterSearch) {
@@ -62886,28 +63130,28 @@ soap_in_ns1__parameterSearch(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__parameterSearch *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__parameterSearch, 0,
         sizeof(ns1__parameterSearch), 0, soap_copy_ns1__parameterSearch);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_negate3 > 0 || soap_flag_sensitive3 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__parameterSearch::soap_put(struct soap *soap, const char *tag,
                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__parameterSearch);
   if (this->soap_out(soap, tag ? tag : "ns1:parameterSearch", id, type))
     return soap->error;
@@ -62924,7 +63168,7 @@ soap_get_ns1__parameterSearch(struct soap *soap, ns1__parameterSearch *p,
                               const char *tag, const char *type) {
   if ((p = soap_in_ns1__parameterSearch(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -62939,9 +63183,9 @@ soap_instantiate_ns1__parameterSearch(struct soap *soap, int n,
                       "soap_instantiate_ns1__parameterSearch(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__parameterSearch, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__parameterSearch, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__parameterSearch);
     if (size)
@@ -62977,7 +63221,7 @@ soap_copy_ns1__parameterSearch(struct soap *soap, int st, int tt, void *p,
 void ns1__searchDatafileByParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatafileByParameter::sessionId = NULL;
+  this->ns1__searchDatafileByParameter::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__parameterSearch(
       soap, &this->ns1__searchDatafileByParameter::parameters);
 }
@@ -63032,13 +63276,13 @@ soap_in_ns1__searchDatafileByParameter(struct soap *soap, const char *tag,
                                        ns1__searchDatafileByParameter *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchDatafileByParameter,
       sizeof(ns1__searchDatafileByParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchDatafileByParameter) {
@@ -63079,10 +63323,10 @@ soap_in_ns1__searchDatafileByParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -63090,14 +63334,14 @@ soap_in_ns1__searchDatafileByParameter(struct soap *soap, const char *tag,
         sizeof(ns1__searchDatafileByParameter), 0,
         soap_copy_ns1__searchDatafileByParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchDatafileByParameter::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatafileByParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatafileByParameter", id,
                      type))
@@ -63117,7 +63361,7 @@ soap_get_ns1__searchDatafileByParameter(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchDatafileByParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -63134,10 +63378,10 @@ soap_instantiate_ns1__searchDatafileByParameter(struct soap *soap, int n,
              "soap_instantiate_ns1__searchDatafileByParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatafileByParameter, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatafileByParameter,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatafileByParameter);
     if (size)
@@ -63175,15 +63419,15 @@ soap_copy_ns1__searchDatafileByParameter(struct soap *soap, int st, int tt,
 void ns1__userDetails::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__userDetails::credential = NULL;
-  this->ns1__userDetails::department = NULL;
-  this->ns1__userDetails::email = NULL;
-  this->ns1__userDetails::federalId = NULL;
-  this->ns1__userDetails::firstName = NULL;
-  this->ns1__userDetails::initial = NULL;
-  this->ns1__userDetails::institution = NULL;
-  this->ns1__userDetails::lastName = NULL;
-  this->ns1__userDetails::title = NULL;
+  this->ns1__userDetails::credential = nullptr;
+  this->ns1__userDetails::department = nullptr;
+  this->ns1__userDetails::email = nullptr;
+  this->ns1__userDetails::federalId = nullptr;
+  this->ns1__userDetails::firstName = nullptr;
+  this->ns1__userDetails::initial = nullptr;
+  this->ns1__userDetails::institution = nullptr;
+  this->ns1__userDetails::lastName = nullptr;
+  this->ns1__userDetails::title = nullptr;
 }
 
 void ns1__userDetails::soap_serialize(struct soap *soap) const {
@@ -63258,13 +63502,13 @@ SOAP_FMAC3 ns1__userDetails *SOAP_FMAC4
 soap_in_ns1__userDetails(struct soap *soap, const char *tag,
                          ns1__userDetails *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__userDetails *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__userDetails,
       sizeof(ns1__userDetails), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__userDetails) {
@@ -63368,23 +63612,23 @@ soap_in_ns1__userDetails(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__userDetails *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__userDetails, 0,
         sizeof(ns1__userDetails), 0, soap_copy_ns1__userDetails);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__userDetails::soap_put(struct soap *soap, const char *tag,
                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__userDetails);
   if (this->soap_out(soap, tag ? tag : "ns1:userDetails", id, type))
     return soap->error;
@@ -63401,7 +63645,7 @@ soap_get_ns1__userDetails(struct soap *soap, ns1__userDetails *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__userDetails(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -63413,10 +63657,10 @@ soap_instantiate_ns1__userDetails(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__userDetails(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__userDetails, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__userDetails, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__userDetails);
     if (size)
@@ -63505,15 +63749,15 @@ soap_in_ns1__searchDatafileByRestrictionComparisonResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByRestrictionComparisonResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByRestrictionComparisonResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionComparisonResponse,
       sizeof(ns1__searchDatafileByRestrictionComparisonResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -63547,10 +63791,10 @@ soap_in_ns1__searchDatafileByRestrictionComparisonResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByRestrictionComparisonResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -63558,7 +63802,7 @@ soap_in_ns1__searchDatafileByRestrictionComparisonResponse(
         sizeof(ns1__searchDatafileByRestrictionComparisonResponse), 0,
         soap_copy_ns1__searchDatafileByRestrictionComparisonResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -63566,7 +63810,7 @@ soap_in_ns1__searchDatafileByRestrictionComparisonResponse(
 int ns1__searchDatafileByRestrictionComparisonResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionComparisonResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchDatafileByRestrictionComparisonResponse",
@@ -63588,7 +63832,7 @@ soap_get_ns1__searchDatafileByRestrictionComparisonResponse(
   if ((p = soap_in_ns1__searchDatafileByRestrictionComparisonResponse(soap, tag,
                                                                       p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -63603,11 +63847,11 @@ soap_instantiate_ns1__searchDatafileByRestrictionComparisonResponse(
                                     "nse(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionComparisonResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(ns1__searchDatafileByRestrictionComparisonResponse);
@@ -63653,7 +63897,7 @@ void ns1__searchDatafileByRestrictionComparison::soap_default(
     struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatafileByRestrictionComparison::sessionId = NULL;
+  this->ns1__searchDatafileByRestrictionComparison::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__restrictionComparisonCondition(
       soap, &this->ns1__searchDatafileByRestrictionComparison::restriction);
 }
@@ -63710,15 +63954,15 @@ soap_in_ns1__searchDatafileByRestrictionComparison(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByRestrictionComparison *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByRestrictionComparison *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionComparison,
       sizeof(ns1__searchDatafileByRestrictionComparison), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -63761,10 +64005,10 @@ soap_in_ns1__searchDatafileByRestrictionComparison(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByRestrictionComparison *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -63772,7 +64016,7 @@ soap_in_ns1__searchDatafileByRestrictionComparison(
         sizeof(ns1__searchDatafileByRestrictionComparison), 0,
         soap_copy_ns1__searchDatafileByRestrictionComparison);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -63780,7 +64024,7 @@ soap_in_ns1__searchDatafileByRestrictionComparison(
 int ns1__searchDatafileByRestrictionComparison::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionComparison);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchDatafileByRestrictionComparison",
@@ -63803,7 +64047,7 @@ soap_get_ns1__searchDatafileByRestrictionComparison(
   if ((p = soap_in_ns1__searchDatafileByRestrictionComparison(soap, tag, p,
                                                               type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -63818,10 +64062,10 @@ soap_instantiate_ns1__searchDatafileByRestrictionComparison(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionComparison, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionComparison,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatafileByRestrictionComparison);
     if (size)
@@ -63909,13 +64153,13 @@ soap_in_ns1__getAllKeywordsResponse(struct soap *soap, const char *tag,
                                     ns1__getAllKeywordsResponse *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getAllKeywordsResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getAllKeywordsResponse,
       sizeof(ns1__getAllKeywordsResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getAllKeywordsResponse) {
@@ -63945,10 +64189,10 @@ soap_in_ns1__getAllKeywordsResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getAllKeywordsResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -63956,14 +64200,14 @@ soap_in_ns1__getAllKeywordsResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getAllKeywordsResponse), 0,
         soap_copy_ns1__getAllKeywordsResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getAllKeywordsResponse::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getAllKeywordsResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getAllKeywordsResponse", id, type))
     return soap->error;
@@ -63981,7 +64225,7 @@ soap_get_ns1__getAllKeywordsResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__getAllKeywordsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -63997,10 +64241,10 @@ soap_instantiate_ns1__getAllKeywordsResponse(struct soap *soap, int n,
                    "soap_instantiate_ns1__getAllKeywordsResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getAllKeywordsResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getAllKeywordsResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getAllKeywordsResponse);
     if (size)
@@ -64038,8 +64282,8 @@ soap_copy_ns1__getAllKeywordsResponse(struct soap *soap, int st, int tt,
 void ns1__getAllKeywords::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getAllKeywords::sessionId = NULL;
-  this->ns1__getAllKeywords::type = NULL;
+  this->ns1__getAllKeywords::sessionId = nullptr;
+  this->ns1__getAllKeywords::type = nullptr;
 }
 
 void ns1__getAllKeywords::soap_serialize(struct soap *soap) const {
@@ -64085,13 +64329,13 @@ SOAP_FMAC3 ns1__getAllKeywords *SOAP_FMAC4
 soap_in_ns1__getAllKeywords(struct soap *soap, const char *tag,
                             ns1__getAllKeywords *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getAllKeywords *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getAllKeywords,
       sizeof(ns1__getAllKeywords), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getAllKeywords) {
@@ -64133,23 +64377,23 @@ soap_in_ns1__getAllKeywords(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getAllKeywords *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__getAllKeywords, 0,
         sizeof(ns1__getAllKeywords), 0, soap_copy_ns1__getAllKeywords);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getAllKeywords::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getAllKeywords);
   if (this->soap_out(soap, tag ? tag : "ns1:getAllKeywords", id, type))
     return soap->error;
@@ -64166,7 +64410,7 @@ soap_get_ns1__getAllKeywords(struct soap *soap, ns1__getAllKeywords *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__getAllKeywords(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -64179,9 +64423,9 @@ soap_instantiate_ns1__getAllKeywords(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__getAllKeywords(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getAllKeywords, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getAllKeywords, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getAllKeywords);
     if (size)
@@ -64251,14 +64495,14 @@ soap_in_ns1__removePublicationResponse(struct soap *soap, const char *tag,
                                        ns1__removePublicationResponse *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__removePublicationResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removePublicationResponse,
             sizeof(ns1__removePublicationResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -64268,13 +64512,13 @@ soap_in_ns1__removePublicationResponse(struct soap *soap, const char *tag,
       return (ns1__removePublicationResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__removePublicationResponse::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removePublicationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:removePublicationResponse", id,
                      type))
@@ -64294,7 +64538,7 @@ soap_get_ns1__removePublicationResponse(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__removePublicationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -64311,10 +64555,10 @@ soap_instantiate_ns1__removePublicationResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__removePublicationResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__removePublicationResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__removePublicationResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removePublicationResponse);
     if (size)
@@ -64352,8 +64596,8 @@ soap_copy_ns1__removePublicationResponse(struct soap *soap, int st, int tt,
 void ns1__removePublication::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__removePublication::sessionId = NULL;
-  this->ns1__removePublication::publicationId = NULL;
+  this->ns1__removePublication::sessionId = nullptr;
+  this->ns1__removePublication::publicationId = nullptr;
 }
 
 void ns1__removePublication::soap_serialize(struct soap *soap) const {
@@ -64400,13 +64644,13 @@ SOAP_FMAC3 ns1__removePublication *SOAP_FMAC4
 soap_in_ns1__removePublication(struct soap *soap, const char *tag,
                                ns1__removePublication *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__removePublication *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removePublication,
       sizeof(ns1__removePublication), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__removePublication) {
@@ -64448,23 +64692,23 @@ soap_in_ns1__removePublication(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__removePublication *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__removePublication,
         0, sizeof(ns1__removePublication), 0, soap_copy_ns1__removePublication);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__removePublication::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removePublication);
   if (this->soap_out(soap, tag ? tag : "ns1:removePublication", id, type))
     return soap->error;
@@ -64481,7 +64725,7 @@ soap_get_ns1__removePublication(struct soap *soap, ns1__removePublication *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__removePublication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -64496,9 +64740,9 @@ soap_instantiate_ns1__removePublication(struct soap *soap, int n,
                       "soap_instantiate_ns1__removePublication(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__removePublication, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__removePublication, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removePublication);
     if (size)
@@ -64579,13 +64823,13 @@ soap_in_ns1__createDataSetsResponse(struct soap *soap, const char *tag,
                                     ns1__createDataSetsResponse *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__createDataSetsResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__createDataSetsResponse,
       sizeof(ns1__createDataSetsResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__createDataSetsResponse) {
@@ -64615,10 +64859,10 @@ soap_in_ns1__createDataSetsResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__createDataSetsResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -64626,14 +64870,14 @@ soap_in_ns1__createDataSetsResponse(struct soap *soap, const char *tag,
         sizeof(ns1__createDataSetsResponse), 0,
         soap_copy_ns1__createDataSetsResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__createDataSetsResponse::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__createDataSetsResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:createDataSetsResponse", id, type))
     return soap->error;
@@ -64651,7 +64895,7 @@ soap_get_ns1__createDataSetsResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__createDataSetsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -64667,10 +64911,10 @@ soap_instantiate_ns1__createDataSetsResponse(struct soap *soap, int n,
                    "soap_instantiate_ns1__createDataSetsResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__createDataSetsResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__createDataSetsResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__createDataSetsResponse);
     if (size)
@@ -64709,9 +64953,9 @@ void ns1__datasetParameterPK::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityPrimaryKeyBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__datasetParameterPK::datasetId = NULL;
-  this->ns1__datasetParameterPK::name = NULL;
-  this->ns1__datasetParameterPK::units = NULL;
+  this->ns1__datasetParameterPK::datasetId = nullptr;
+  this->ns1__datasetParameterPK::name = nullptr;
+  this->ns1__datasetParameterPK::units = nullptr;
 }
 
 void ns1__datasetParameterPK::soap_serialize(struct soap *soap) const {
@@ -64764,13 +65008,13 @@ SOAP_FMAC3 ns1__datasetParameterPK *SOAP_FMAC4
 soap_in_ns1__datasetParameterPK(struct soap *soap, const char *tag,
                                 ns1__datasetParameterPK *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__datasetParameterPK *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__datasetParameterPK,
       sizeof(ns1__datasetParameterPK), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__datasetParameterPK) {
@@ -64821,24 +65065,24 @@ soap_in_ns1__datasetParameterPK(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__datasetParameterPK *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__datasetParameterPK,
         0, sizeof(ns1__datasetParameterPK), 0,
         soap_copy_ns1__datasetParameterPK);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__datasetParameterPK::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__datasetParameterPK);
   if (this->soap_out(soap, tag ? tag : "ns1:datasetParameterPK", id, type))
     return soap->error;
@@ -64855,7 +65099,7 @@ soap_get_ns1__datasetParameterPK(struct soap *soap, ns1__datasetParameterPK *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__datasetParameterPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -64870,9 +65114,9 @@ soap_instantiate_ns1__datasetParameterPK(struct soap *soap, int n,
                       "soap_instantiate_ns1__datasetParameterPK(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__datasetParameterPK, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__datasetParameterPK, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__datasetParameterPK);
     if (size)
@@ -64909,16 +65153,16 @@ void ns1__datasetParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__datasetParameter::datasetParameterPK = NULL;
-  this->ns1__datasetParameter::dateTimeValue = NULL;
-  this->ns1__datasetParameter::description = NULL;
-  this->ns1__datasetParameter::error = NULL;
-  this->ns1__datasetParameter::numericValue = NULL;
-  this->ns1__datasetParameter::parameter = NULL;
-  this->ns1__datasetParameter::rangeBottom = NULL;
-  this->ns1__datasetParameter::rangeTop = NULL;
-  this->ns1__datasetParameter::stringValue = NULL;
-  this->ns1__datasetParameter::valueType = NULL;
+  this->ns1__datasetParameter::datasetParameterPK = nullptr;
+  this->ns1__datasetParameter::dateTimeValue = nullptr;
+  this->ns1__datasetParameter::description = nullptr;
+  this->ns1__datasetParameter::error = nullptr;
+  this->ns1__datasetParameter::numericValue = nullptr;
+  this->ns1__datasetParameter::parameter = nullptr;
+  this->ns1__datasetParameter::rangeBottom = nullptr;
+  this->ns1__datasetParameter::rangeTop = nullptr;
+  this->ns1__datasetParameter::stringValue = nullptr;
+  this->ns1__datasetParameter::valueType = nullptr;
 }
 
 void ns1__datasetParameter::soap_serialize(struct soap *soap) const {
@@ -65022,13 +65266,13 @@ SOAP_FMAC3 ns1__datasetParameter *SOAP_FMAC4
 soap_in_ns1__datasetParameter(struct soap *soap, const char *tag,
                               ns1__datasetParameter *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__datasetParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__datasetParameter,
       sizeof(ns1__datasetParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__datasetParameter) {
@@ -65171,28 +65415,28 @@ soap_in_ns1__datasetParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__datasetParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__datasetParameter,
         0, sizeof(ns1__datasetParameter), 0, soap_copy_ns1__datasetParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__datasetParameter::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__datasetParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:datasetParameter", id, type))
     return soap->error;
@@ -65209,7 +65453,7 @@ soap_get_ns1__datasetParameter(struct soap *soap, ns1__datasetParameter *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns1__datasetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -65224,9 +65468,9 @@ soap_instantiate_ns1__datasetParameter(struct soap *soap, int n,
                       "soap_instantiate_ns1__datasetParameter(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__datasetParameter, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__datasetParameter, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__datasetParameter);
     if (size)
@@ -65267,14 +65511,14 @@ void ns1__dataset::soap_default(struct soap *soap) {
       soap, &this->ns1__dataset::datafileCollection);
   soap_default_std__vectorTemplateOfPointerTons1__datasetParameter(
       soap, &this->ns1__dataset::datasetParameterCollection);
-  this->ns1__dataset::datasetStatus = NULL;
-  this->ns1__dataset::datasetType = NULL;
-  this->ns1__dataset::description = NULL;
-  this->ns1__dataset::id = NULL;
-  this->ns1__dataset::investigationId = NULL;
-  this->ns1__dataset::location = NULL;
-  this->ns1__dataset::name = NULL;
-  this->ns1__dataset::sampleId = NULL;
+  this->ns1__dataset::datasetStatus = nullptr;
+  this->ns1__dataset::datasetType = nullptr;
+  this->ns1__dataset::description = nullptr;
+  this->ns1__dataset::id = nullptr;
+  this->ns1__dataset::investigationId = nullptr;
+  this->ns1__dataset::location = nullptr;
+  this->ns1__dataset::name = nullptr;
+  this->ns1__dataset::sampleId = nullptr;
 }
 
 void ns1__dataset::soap_serialize(struct soap *soap) const {
@@ -65366,13 +65610,13 @@ SOAP_FMAC3 ns1__dataset *SOAP_FMAC4
 soap_in_ns1__dataset(struct soap *soap, const char *tag, ns1__dataset *a,
                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__dataset *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__dataset, sizeof(ns1__dataset),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__dataset) {
@@ -65505,28 +65749,28 @@ soap_in_ns1__dataset(struct soap *soap, const char *tag, ns1__dataset *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__dataset *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__dataset, 0,
         sizeof(ns1__dataset), 0, soap_copy_ns1__dataset);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__dataset::soap_put(struct soap *soap, const char *tag,
                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__dataset);
   if (this->soap_out(soap, tag ? tag : "ns1:dataset", id, type))
     return soap->error;
@@ -65543,7 +65787,7 @@ soap_get_ns1__dataset(struct soap *soap, ns1__dataset *p, const char *tag,
                       const char *type) {
   if ((p = soap_in_ns1__dataset(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -65556,9 +65800,9 @@ soap_instantiate_ns1__dataset(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__dataset(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__dataset, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__dataset, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__dataset);
     if (size)
@@ -65593,10 +65837,10 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__dataset(struct soap *soap, int st,
 void ns1__createDataSets::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__createDataSets::sessionId = NULL;
+  this->ns1__createDataSets::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__dataset(
       soap, &this->ns1__createDataSets::dataSets);
-  this->ns1__createDataSets::investigationId = NULL;
+  this->ns1__createDataSets::investigationId = nullptr;
 }
 
 void ns1__createDataSets::soap_serialize(struct soap *soap) const {
@@ -65647,13 +65891,13 @@ SOAP_FMAC3 ns1__createDataSets *SOAP_FMAC4
 soap_in_ns1__createDataSets(struct soap *soap, const char *tag,
                             ns1__createDataSets *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__createDataSets *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__createDataSets,
       sizeof(ns1__createDataSets), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__createDataSets) {
@@ -65700,23 +65944,23 @@ soap_in_ns1__createDataSets(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__createDataSets *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__createDataSets, 0,
         sizeof(ns1__createDataSets), 0, soap_copy_ns1__createDataSets);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__createDataSets::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__createDataSets);
   if (this->soap_out(soap, tag ? tag : "ns1:createDataSets", id, type))
     return soap->error;
@@ -65733,7 +65977,7 @@ soap_get_ns1__createDataSets(struct soap *soap, ns1__createDataSets *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__createDataSets(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -65746,9 +65990,9 @@ soap_instantiate_ns1__createDataSets(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__createDataSets(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__createDataSets, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__createDataSets, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__createDataSets);
     if (size)
@@ -65817,14 +66061,14 @@ soap_in_ns1__deleteInvestigationResponse(struct soap *soap, const char *tag,
                                          ns1__deleteInvestigationResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__deleteInvestigationResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteInvestigationResponse,
             sizeof(ns1__deleteInvestigationResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -65834,14 +66078,14 @@ soap_in_ns1__deleteInvestigationResponse(struct soap *soap, const char *tag,
       return (ns1__deleteInvestigationResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__deleteInvestigationResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteInvestigationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteInvestigationResponse", id,
                      type))
@@ -65861,7 +66105,7 @@ soap_get_ns1__deleteInvestigationResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteInvestigationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -65878,10 +66122,10 @@ soap_instantiate_ns1__deleteInvestigationResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__deleteInvestigationResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__deleteInvestigationResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteInvestigationResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteInvestigationResponse);
     if (size)
@@ -65921,8 +66165,8 @@ soap_copy_ns1__deleteInvestigationResponse(struct soap *soap, int st, int tt,
 void ns1__deleteInvestigation::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__deleteInvestigation::sessionId = NULL;
-  this->ns1__deleteInvestigation::investigationId = NULL;
+  this->ns1__deleteInvestigation::sessionId = nullptr;
+  this->ns1__deleteInvestigation::investigationId = nullptr;
 }
 
 void ns1__deleteInvestigation::soap_serialize(struct soap *soap) const {
@@ -65971,13 +66215,13 @@ soap_in_ns1__deleteInvestigation(struct soap *soap, const char *tag,
                                  ns1__deleteInvestigation *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__deleteInvestigation *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__deleteInvestigation,
       sizeof(ns1__deleteInvestigation), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__deleteInvestigation) {
@@ -66019,10 +66263,10 @@ soap_in_ns1__deleteInvestigation(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__deleteInvestigation *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -66030,14 +66274,14 @@ soap_in_ns1__deleteInvestigation(struct soap *soap, const char *tag,
         sizeof(ns1__deleteInvestigation), 0,
         soap_copy_ns1__deleteInvestigation);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__deleteInvestigation::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__deleteInvestigation);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteInvestigation", id, type))
     return soap->error;
@@ -66055,7 +66299,7 @@ soap_get_ns1__deleteInvestigation(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__deleteInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -66069,10 +66313,11 @@ soap_instantiate_ns1__deleteInvestigation(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__deleteInvestigation(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__deleteInvestigation, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__deleteInvestigation, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteInvestigation);
     if (size)
@@ -66141,13 +66386,13 @@ soap_in_ns1__removeKeywordResponse(struct soap *soap, const char *tag,
                                    ns1__removeKeywordResponse *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__removeKeywordResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeKeywordResponse,
             sizeof(ns1__removeKeywordResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -66157,13 +66402,13 @@ soap_in_ns1__removeKeywordResponse(struct soap *soap, const char *tag,
       return (ns1__removeKeywordResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__removeKeywordResponse::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeKeywordResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:removeKeywordResponse", id, type))
     return soap->error;
@@ -66181,7 +66426,7 @@ soap_get_ns1__removeKeywordResponse(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeKeywordResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -66196,10 +66441,11 @@ soap_instantiate_ns1__removeKeywordResponse(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__removeKeywordResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__removeKeywordResponse, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__removeKeywordResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeKeywordResponse);
     if (size)
@@ -66237,8 +66483,8 @@ void ns1__keywordPK::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityPrimaryKeyBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__keywordPK::investigationId = NULL;
-  this->ns1__keywordPK::name = NULL;
+  this->ns1__keywordPK::investigationId = nullptr;
+  this->ns1__keywordPK::name = nullptr;
 }
 
 void ns1__keywordPK::soap_serialize(struct soap *soap) const {
@@ -66283,13 +66529,13 @@ SOAP_FMAC3 ns1__keywordPK *SOAP_FMAC4
 soap_in_ns1__keywordPK(struct soap *soap, const char *tag, ns1__keywordPK *a,
                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__keywordPK *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__keywordPK, sizeof(ns1__keywordPK),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__keywordPK) {
@@ -66330,23 +66576,23 @@ soap_in_ns1__keywordPK(struct soap *soap, const char *tag, ns1__keywordPK *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__keywordPK *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__keywordPK, 0,
         sizeof(ns1__keywordPK), 0, soap_copy_ns1__keywordPK);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__keywordPK::soap_put(struct soap *soap, const char *tag,
                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__keywordPK);
   if (this->soap_out(soap, tag ? tag : "ns1:keywordPK", id, type))
     return soap->error;
@@ -66363,7 +66609,7 @@ soap_get_ns1__keywordPK(struct soap *soap, ns1__keywordPK *p, const char *tag,
                         const char *type) {
   if ((p = soap_in_ns1__keywordPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -66375,10 +66621,10 @@ soap_instantiate_ns1__keywordPK(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__keywordPK(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__keywordPK, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__keywordPK, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__keywordPK);
     if (size)
@@ -66413,8 +66659,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__keywordPK(struct soap *soap, int st,
 void ns1__removeKeyword::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__removeKeyword::sessionId = NULL;
-  this->ns1__removeKeyword::keywordPK = NULL;
+  this->ns1__removeKeyword::sessionId = nullptr;
+  this->ns1__removeKeyword::keywordPK = nullptr;
 }
 
 void ns1__removeKeyword::soap_serialize(struct soap *soap) const {
@@ -66460,13 +66706,13 @@ SOAP_FMAC3 ns1__removeKeyword *SOAP_FMAC4
 soap_in_ns1__removeKeyword(struct soap *soap, const char *tag,
                            ns1__removeKeyword *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__removeKeyword *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeKeyword,
       sizeof(ns1__removeKeyword), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__removeKeyword) {
@@ -66508,23 +66754,23 @@ soap_in_ns1__removeKeyword(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__removeKeyword *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__removeKeyword, 0,
         sizeof(ns1__removeKeyword), 0, soap_copy_ns1__removeKeyword);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__removeKeyword::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeKeyword);
   if (this->soap_out(soap, tag ? tag : "ns1:removeKeyword", id, type))
     return soap->error;
@@ -66541,7 +66787,7 @@ soap_get_ns1__removeKeyword(struct soap *soap, ns1__removeKeyword *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeKeyword(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -66554,9 +66800,9 @@ soap_instantiate_ns1__removeKeyword(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__removeKeyword(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__removeKeyword, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__removeKeyword, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeKeyword);
     if (size)
@@ -66642,14 +66888,14 @@ soap_in_ns1__getParameterByRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__getParameterByRestrictionResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getParameterByRestrictionResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getParameterByRestrictionResponse,
       sizeof(ns1__getParameterByRestrictionResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -66682,10 +66928,10 @@ soap_in_ns1__getParameterByRestrictionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getParameterByRestrictionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -66693,7 +66939,7 @@ soap_in_ns1__getParameterByRestrictionResponse(
         sizeof(ns1__getParameterByRestrictionResponse), 0,
         soap_copy_ns1__getParameterByRestrictionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -66701,7 +66947,7 @@ soap_in_ns1__getParameterByRestrictionResponse(
 int ns1__getParameterByRestrictionResponse::soap_put(struct soap *soap,
                                                      const char *tag,
                                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getParameterByRestrictionResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getParameterByRestrictionResponse",
                      id, type))
@@ -66721,7 +66967,7 @@ soap_get_ns1__getParameterByRestrictionResponse(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__getParameterByRestrictionResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -66737,10 +66983,10 @@ soap_instantiate_ns1__getParameterByRestrictionResponse(struct soap *soap,
                               "getParameterByRestrictionResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getParameterByRestrictionResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getParameterByRestrictionResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getParameterByRestrictionResponse);
     if (size)
@@ -66780,8 +67026,8 @@ soap_copy_ns1__getParameterByRestrictionResponse(struct soap *soap, int st,
 void ns1__getParameterByRestriction::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getParameterByRestriction::sessionId = NULL;
-  this->ns1__getParameterByRestriction::condition = NULL;
+  this->ns1__getParameterByRestriction::sessionId = nullptr;
+  this->ns1__getParameterByRestriction::condition = nullptr;
 }
 
 void ns1__getParameterByRestriction::soap_serialize(struct soap *soap) const {
@@ -66834,13 +67080,13 @@ soap_in_ns1__getParameterByRestriction(struct soap *soap, const char *tag,
                                        ns1__getParameterByRestriction *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getParameterByRestriction *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getParameterByRestriction,
       sizeof(ns1__getParameterByRestriction), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getParameterByRestriction) {
@@ -66884,10 +67130,10 @@ soap_in_ns1__getParameterByRestriction(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getParameterByRestriction *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -66895,14 +67141,14 @@ soap_in_ns1__getParameterByRestriction(struct soap *soap, const char *tag,
         sizeof(ns1__getParameterByRestriction), 0,
         soap_copy_ns1__getParameterByRestriction);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getParameterByRestriction::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getParameterByRestriction);
   if (this->soap_out(soap, tag ? tag : "ns1:getParameterByRestriction", id,
                      type))
@@ -66922,7 +67168,7 @@ soap_get_ns1__getParameterByRestriction(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__getParameterByRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -66939,10 +67185,10 @@ soap_instantiate_ns1__getParameterByRestriction(struct soap *soap, int n,
              "soap_instantiate_ns1__getParameterByRestriction(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getParameterByRestriction, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getParameterByRestriction,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getParameterByRestriction);
     if (size)
@@ -67013,14 +67259,14 @@ soap_in_ns1__removeInvestigatorResponse(struct soap *soap, const char *tag,
                                         ns1__removeInvestigatorResponse *a,
                                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__removeInvestigatorResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeInvestigatorResponse,
             sizeof(ns1__removeInvestigatorResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -67030,14 +67276,14 @@ soap_in_ns1__removeInvestigatorResponse(struct soap *soap, const char *tag,
       return (ns1__removeInvestigatorResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__removeInvestigatorResponse::soap_put(struct soap *soap,
                                               const char *tag,
                                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeInvestigatorResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:removeInvestigatorResponse", id,
                      type))
@@ -67057,7 +67303,7 @@ soap_get_ns1__removeInvestigatorResponse(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeInvestigatorResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -67074,10 +67320,10 @@ soap_instantiate_ns1__removeInvestigatorResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__removeInvestigatorResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__removeInvestigatorResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__removeInvestigatorResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeInvestigatorResponse);
     if (size)
@@ -67116,8 +67362,8 @@ void ns1__investigatorPK::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityPrimaryKeyBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__investigatorPK::facilityUserId = NULL;
-  this->ns1__investigatorPK::investigationId = NULL;
+  this->ns1__investigatorPK::facilityUserId = nullptr;
+  this->ns1__investigatorPK::investigationId = nullptr;
 }
 
 void ns1__investigatorPK::soap_serialize(struct soap *soap) const {
@@ -67165,13 +67411,13 @@ SOAP_FMAC3 ns1__investigatorPK *SOAP_FMAC4
 soap_in_ns1__investigatorPK(struct soap *soap, const char *tag,
                             ns1__investigatorPK *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__investigatorPK *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__investigatorPK,
       sizeof(ns1__investigatorPK), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__investigatorPK) {
@@ -67213,23 +67459,23 @@ soap_in_ns1__investigatorPK(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__investigatorPK *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__investigatorPK, 0,
         sizeof(ns1__investigatorPK), 0, soap_copy_ns1__investigatorPK);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__investigatorPK::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__investigatorPK);
   if (this->soap_out(soap, tag ? tag : "ns1:investigatorPK", id, type))
     return soap->error;
@@ -67246,7 +67492,7 @@ soap_get_ns1__investigatorPK(struct soap *soap, ns1__investigatorPK *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__investigatorPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -67259,9 +67505,9 @@ soap_instantiate_ns1__investigatorPK(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__investigatorPK(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__investigatorPK, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__investigatorPK, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__investigatorPK);
     if (size)
@@ -67297,8 +67543,8 @@ soap_copy_ns1__investigatorPK(struct soap *soap, int st, int tt, void *p,
 void ns1__removeInvestigator::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__removeInvestigator::sessionId = NULL;
-  this->ns1__removeInvestigator::investigatorPK = NULL;
+  this->ns1__removeInvestigator::sessionId = nullptr;
+  this->ns1__removeInvestigator::investigatorPK = nullptr;
 }
 
 void ns1__removeInvestigator::soap_serialize(struct soap *soap) const {
@@ -67346,13 +67592,13 @@ SOAP_FMAC3 ns1__removeInvestigator *SOAP_FMAC4
 soap_in_ns1__removeInvestigator(struct soap *soap, const char *tag,
                                 ns1__removeInvestigator *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__removeInvestigator *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeInvestigator,
       sizeof(ns1__removeInvestigator), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__removeInvestigator) {
@@ -67395,24 +67641,24 @@ soap_in_ns1__removeInvestigator(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__removeInvestigator *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__removeInvestigator,
         0, sizeof(ns1__removeInvestigator), 0,
         soap_copy_ns1__removeInvestigator);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__removeInvestigator::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeInvestigator);
   if (this->soap_out(soap, tag ? tag : "ns1:removeInvestigator", id, type))
     return soap->error;
@@ -67429,7 +67675,7 @@ soap_get_ns1__removeInvestigator(struct soap *soap, ns1__removeInvestigator *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeInvestigator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -67444,9 +67690,9 @@ soap_instantiate_ns1__removeInvestigator(struct soap *soap, int n,
                       "soap_instantiate_ns1__removeInvestigator(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__removeInvestigator, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__removeInvestigator, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeInvestigator);
     if (size)
@@ -67515,14 +67761,14 @@ soap_in_ns1__removeInvestigationResponse(struct soap *soap, const char *tag,
                                          ns1__removeInvestigationResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__removeInvestigationResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeInvestigationResponse,
             sizeof(ns1__removeInvestigationResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -67532,14 +67778,14 @@ soap_in_ns1__removeInvestigationResponse(struct soap *soap, const char *tag,
       return (ns1__removeInvestigationResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__removeInvestigationResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeInvestigationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:removeInvestigationResponse", id,
                      type))
@@ -67559,7 +67805,7 @@ soap_get_ns1__removeInvestigationResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeInvestigationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -67576,10 +67822,10 @@ soap_instantiate_ns1__removeInvestigationResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__removeInvestigationResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__removeInvestigationResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__removeInvestigationResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeInvestigationResponse);
     if (size)
@@ -67619,8 +67865,8 @@ soap_copy_ns1__removeInvestigationResponse(struct soap *soap, int st, int tt,
 void ns1__removeInvestigation::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__removeInvestigation::sessionId = NULL;
-  this->ns1__removeInvestigation::investigationId = NULL;
+  this->ns1__removeInvestigation::sessionId = nullptr;
+  this->ns1__removeInvestigation::investigationId = nullptr;
 }
 
 void ns1__removeInvestigation::soap_serialize(struct soap *soap) const {
@@ -67669,13 +67915,13 @@ soap_in_ns1__removeInvestigation(struct soap *soap, const char *tag,
                                  ns1__removeInvestigation *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__removeInvestigation *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeInvestigation,
       sizeof(ns1__removeInvestigation), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__removeInvestigation) {
@@ -67717,10 +67963,10 @@ soap_in_ns1__removeInvestigation(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__removeInvestigation *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -67728,14 +67974,14 @@ soap_in_ns1__removeInvestigation(struct soap *soap, const char *tag,
         sizeof(ns1__removeInvestigation), 0,
         soap_copy_ns1__removeInvestigation);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__removeInvestigation::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeInvestigation);
   if (this->soap_out(soap, tag ? tag : "ns1:removeInvestigation", id, type))
     return soap->error;
@@ -67753,7 +67999,7 @@ soap_get_ns1__removeInvestigation(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__removeInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -67767,10 +68013,11 @@ soap_instantiate_ns1__removeInvestigation(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__removeInvestigation(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__removeInvestigation, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__removeInvestigation, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeInvestigation);
     if (size)
@@ -67807,7 +68054,7 @@ soap_copy_ns1__removeInvestigation(struct soap *soap, int st, int tt, void *p,
 void ns1__getFacilityUserByFederalIdResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getFacilityUserByFederalIdResponse::return_ = NULL;
+  this->ns1__getFacilityUserByFederalIdResponse::return_ = nullptr;
 }
 
 void ns1__getFacilityUserByFederalIdResponse::soap_serialize(
@@ -67856,15 +68103,15 @@ soap_in_ns1__getFacilityUserByFederalIdResponse(
     struct soap *soap, const char *tag,
     ns1__getFacilityUserByFederalIdResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getFacilityUserByFederalIdResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalIdResponse,
       sizeof(ns1__getFacilityUserByFederalIdResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -67900,10 +68147,10 @@ soap_in_ns1__getFacilityUserByFederalIdResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getFacilityUserByFederalIdResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -67911,7 +68158,7 @@ soap_in_ns1__getFacilityUserByFederalIdResponse(
         sizeof(ns1__getFacilityUserByFederalIdResponse), 0,
         soap_copy_ns1__getFacilityUserByFederalIdResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -67919,7 +68166,7 @@ soap_in_ns1__getFacilityUserByFederalIdResponse(
 int ns1__getFacilityUserByFederalIdResponse::soap_put(struct soap *soap,
                                                       const char *tag,
                                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalIdResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getFacilityUserByFederalIdResponse",
                      id, type))
@@ -67940,7 +68187,7 @@ soap_get_ns1__getFacilityUserByFederalIdResponse(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__getFacilityUserByFederalIdResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -67957,10 +68204,10 @@ soap_instantiate_ns1__getFacilityUserByFederalIdResponse(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalIdResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalIdResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getFacilityUserByFederalIdResponse);
     if (size)
@@ -68001,8 +68248,8 @@ soap_copy_ns1__getFacilityUserByFederalIdResponse(struct soap *soap, int st,
 void ns1__getFacilityUserByFederalId::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getFacilityUserByFederalId::sessionId = NULL;
-  this->ns1__getFacilityUserByFederalId::federalId = NULL;
+  this->ns1__getFacilityUserByFederalId::sessionId = nullptr;
+  this->ns1__getFacilityUserByFederalId::federalId = nullptr;
 }
 
 void ns1__getFacilityUserByFederalId::soap_serialize(struct soap *soap) const {
@@ -68054,13 +68301,13 @@ soap_in_ns1__getFacilityUserByFederalId(struct soap *soap, const char *tag,
                                         ns1__getFacilityUserByFederalId *a,
                                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getFacilityUserByFederalId *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalId,
       sizeof(ns1__getFacilityUserByFederalId), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalId) {
@@ -68105,10 +68352,10 @@ soap_in_ns1__getFacilityUserByFederalId(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getFacilityUserByFederalId *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -68116,7 +68363,7 @@ soap_in_ns1__getFacilityUserByFederalId(struct soap *soap, const char *tag,
         sizeof(ns1__getFacilityUserByFederalId), 0,
         soap_copy_ns1__getFacilityUserByFederalId);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -68124,7 +68371,7 @@ soap_in_ns1__getFacilityUserByFederalId(struct soap *soap, const char *tag,
 int ns1__getFacilityUserByFederalId::soap_put(struct soap *soap,
                                               const char *tag,
                                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalId);
   if (this->soap_out(soap, tag ? tag : "ns1:getFacilityUserByFederalId", id,
                      type))
@@ -68144,7 +68391,7 @@ soap_get_ns1__getFacilityUserByFederalId(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_ns1__getFacilityUserByFederalId(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -68161,10 +68408,10 @@ soap_instantiate_ns1__getFacilityUserByFederalId(struct soap *soap, int n,
              "soap_instantiate_ns1__getFacilityUserByFederalId(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalId, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalId,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getFacilityUserByFederalId);
     if (size)
@@ -68202,7 +68449,7 @@ soap_copy_ns1__getFacilityUserByFederalId(struct soap *soap, int st, int tt,
 void ns1__downloadDatasetResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__downloadDatasetResponse::URL = NULL;
+  this->ns1__downloadDatasetResponse::URL = nullptr;
 }
 
 void ns1__downloadDatasetResponse::soap_serialize(struct soap *soap) const {
@@ -68247,13 +68494,13 @@ soap_in_ns1__downloadDatasetResponse(struct soap *soap, const char *tag,
                                      ns1__downloadDatasetResponse *a,
                                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__downloadDatasetResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__downloadDatasetResponse,
       sizeof(ns1__downloadDatasetResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__downloadDatasetResponse) {
@@ -68287,10 +68534,10 @@ soap_in_ns1__downloadDatasetResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__downloadDatasetResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -68298,14 +68545,14 @@ soap_in_ns1__downloadDatasetResponse(struct soap *soap, const char *tag,
         sizeof(ns1__downloadDatasetResponse), 0,
         soap_copy_ns1__downloadDatasetResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__downloadDatasetResponse::soap_put(struct soap *soap, const char *tag,
                                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__downloadDatasetResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:downloadDatasetResponse", id, type))
     return soap->error;
@@ -68323,7 +68570,7 @@ soap_get_ns1__downloadDatasetResponse(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in_ns1__downloadDatasetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -68340,10 +68587,10 @@ soap_instantiate_ns1__downloadDatasetResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__downloadDatasetResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__downloadDatasetResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__downloadDatasetResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__downloadDatasetResponse);
     if (size)
@@ -68381,8 +68628,8 @@ soap_copy_ns1__downloadDatasetResponse(struct soap *soap, int st, int tt,
 void ns1__downloadDataset::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__downloadDataset::sessionId = NULL;
-  this->ns1__downloadDataset::datasetId = NULL;
+  this->ns1__downloadDataset::sessionId = nullptr;
+  this->ns1__downloadDataset::datasetId = nullptr;
 }
 
 void ns1__downloadDataset::soap_serialize(struct soap *soap) const {
@@ -68427,13 +68674,13 @@ SOAP_FMAC3 ns1__downloadDataset *SOAP_FMAC4
 soap_in_ns1__downloadDataset(struct soap *soap, const char *tag,
                              ns1__downloadDataset *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__downloadDataset *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__downloadDataset,
       sizeof(ns1__downloadDataset), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__downloadDataset) {
@@ -68475,23 +68722,23 @@ soap_in_ns1__downloadDataset(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__downloadDataset *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__downloadDataset, 0,
         sizeof(ns1__downloadDataset), 0, soap_copy_ns1__downloadDataset);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__downloadDataset::soap_put(struct soap *soap, const char *tag,
                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__downloadDataset);
   if (this->soap_out(soap, tag ? tag : "ns1:downloadDataset", id, type))
     return soap->error;
@@ -68508,7 +68755,7 @@ soap_get_ns1__downloadDataset(struct soap *soap, ns1__downloadDataset *p,
                               const char *tag, const char *type) {
   if ((p = soap_in_ns1__downloadDataset(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -68523,9 +68770,9 @@ soap_instantiate_ns1__downloadDataset(struct soap *soap, int n,
                       "soap_instantiate_ns1__downloadDataset(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__downloadDataset, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__downloadDataset, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__downloadDataset);
     if (size)
@@ -68562,10 +68809,10 @@ void ns1__instrument::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__instrument::description = NULL;
-  this->ns1__instrument::name = NULL;
-  this->ns1__instrument::shortName = NULL;
-  this->ns1__instrument::type = NULL;
+  this->ns1__instrument::description = nullptr;
+  this->ns1__instrument::name = nullptr;
+  this->ns1__instrument::shortName = nullptr;
+  this->ns1__instrument::type = nullptr;
 }
 
 void ns1__instrument::soap_serialize(struct soap *soap) const {
@@ -68631,13 +68878,13 @@ SOAP_FMAC3 ns1__instrument *SOAP_FMAC4
 soap_in_ns1__instrument(struct soap *soap, const char *tag, ns1__instrument *a,
                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__instrument *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__instrument,
       sizeof(ns1__instrument), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__instrument) {
@@ -68728,28 +68975,28 @@ soap_in_ns1__instrument(struct soap *soap, const char *tag, ns1__instrument *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__instrument *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__instrument, 0,
         sizeof(ns1__instrument), 0, soap_copy_ns1__instrument);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__instrument::soap_put(struct soap *soap, const char *tag,
                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__instrument);
   if (this->soap_out(soap, tag ? tag : "ns1:instrument", id, type))
     return soap->error;
@@ -68766,7 +69013,7 @@ soap_get_ns1__instrument(struct soap *soap, ns1__instrument *p, const char *tag,
                          const char *type) {
   if ((p = soap_in_ns1__instrument(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -68778,10 +69025,10 @@ soap_instantiate_ns1__instrument(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__instrument(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__instrument, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__instrument, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__instrument);
     if (size)
@@ -68866,13 +69113,13 @@ soap_in_ns1__getInstrumentsWithDataResponse(
     struct soap *soap, const char *tag, ns1__getInstrumentsWithDataResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getInstrumentsWithDataResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getInstrumentsWithDataResponse,
       sizeof(ns1__getInstrumentsWithDataResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -68904,10 +69151,10 @@ soap_in_ns1__getInstrumentsWithDataResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getInstrumentsWithDataResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -68915,7 +69162,7 @@ soap_in_ns1__getInstrumentsWithDataResponse(
         sizeof(ns1__getInstrumentsWithDataResponse), 0,
         soap_copy_ns1__getInstrumentsWithDataResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -68923,7 +69170,7 @@ soap_in_ns1__getInstrumentsWithDataResponse(
 int ns1__getInstrumentsWithDataResponse::soap_put(struct soap *soap,
                                                   const char *tag,
                                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getInstrumentsWithDataResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getInstrumentsWithDataResponse", id,
                      type))
@@ -68943,7 +69190,7 @@ soap_get_ns1__getInstrumentsWithDataResponse(
     const char *type) {
   if ((p = soap_in_ns1__getInstrumentsWithDataResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -68960,11 +69207,11 @@ soap_instantiate_ns1__getInstrumentsWithDataResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__getInstrumentsWithDataResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getInstrumentsWithDataResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getInstrumentsWithDataResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getInstrumentsWithDataResponse);
     if (size)
@@ -69004,7 +69251,7 @@ soap_copy_ns1__getInstrumentsWithDataResponse(struct soap *soap, int st, int tt,
 void ns1__getInstrumentsWithData::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getInstrumentsWithData::sessionId = NULL;
+  this->ns1__getInstrumentsWithData::sessionId = nullptr;
 }
 
 void ns1__getInstrumentsWithData::soap_serialize(struct soap *soap) const {
@@ -69049,13 +69296,13 @@ soap_in_ns1__getInstrumentsWithData(struct soap *soap, const char *tag,
                                     ns1__getInstrumentsWithData *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getInstrumentsWithData *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getInstrumentsWithData,
       sizeof(ns1__getInstrumentsWithData), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getInstrumentsWithData) {
@@ -69089,10 +69336,10 @@ soap_in_ns1__getInstrumentsWithData(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getInstrumentsWithData *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -69100,14 +69347,14 @@ soap_in_ns1__getInstrumentsWithData(struct soap *soap, const char *tag,
         sizeof(ns1__getInstrumentsWithData), 0,
         soap_copy_ns1__getInstrumentsWithData);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getInstrumentsWithData::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getInstrumentsWithData);
   if (this->soap_out(soap, tag ? tag : "ns1:getInstrumentsWithData", id, type))
     return soap->error;
@@ -69125,7 +69372,7 @@ soap_get_ns1__getInstrumentsWithData(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__getInstrumentsWithData(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -69141,10 +69388,10 @@ soap_instantiate_ns1__getInstrumentsWithData(struct soap *soap, int n,
                    "soap_instantiate_ns1__getInstrumentsWithData(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getInstrumentsWithData, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getInstrumentsWithData, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getInstrumentsWithData);
     if (size)
@@ -69220,13 +69467,13 @@ SOAP_FMAC3 ns1__logoutResponse *SOAP_FMAC4
 soap_in_ns1__logoutResponse(struct soap *soap, const char *tag,
                             ns1__logoutResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__logoutResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__logoutResponse,
       sizeof(ns1__logoutResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__logoutResponse) {
@@ -69258,27 +69505,27 @@ soap_in_ns1__logoutResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__logoutResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__logoutResponse, 0,
         sizeof(ns1__logoutResponse), 0, soap_copy_ns1__logoutResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_return_1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__logoutResponse::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__logoutResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:logoutResponse", id, type))
     return soap->error;
@@ -69295,7 +69542,7 @@ soap_get_ns1__logoutResponse(struct soap *soap, ns1__logoutResponse *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__logoutResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -69308,9 +69555,9 @@ soap_instantiate_ns1__logoutResponse(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__logoutResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__logoutResponse, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__logoutResponse, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__logoutResponse);
     if (size)
@@ -69346,7 +69593,7 @@ soap_copy_ns1__logoutResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__logout::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__logout::sessionId = NULL;
+  this->ns1__logout::sessionId = nullptr;
 }
 
 void ns1__logout::soap_serialize(struct soap *soap) const {
@@ -69385,13 +69632,13 @@ SOAP_FMAC3 ns1__logout *SOAP_FMAC4
 soap_in_ns1__logout(struct soap *soap, const char *tag, ns1__logout *a,
                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__logout *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__logout, sizeof(ns1__logout),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__logout) {
@@ -69425,24 +69672,24 @@ soap_in_ns1__logout(struct soap *soap, const char *tag, ns1__logout *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__logout *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__logout, 0,
         sizeof(ns1__logout), 0, soap_copy_ns1__logout);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__logout::soap_put(struct soap *soap, const char *tag,
                           const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat3_ns1__logout);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat3_ns1__logout);
   if (this->soap_out(soap, tag ? tag : "ns1:logout", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -69458,7 +69705,7 @@ soap_get_ns1__logout(struct soap *soap, ns1__logout *p, const char *tag,
                      const char *type) {
   if ((p = soap_in_ns1__logout(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -69471,9 +69718,9 @@ soap_instantiate_ns1__logout(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__logout(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__logout, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__logout, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__logout);
     if (size)
@@ -69556,13 +69803,13 @@ soap_in_ns1__addDataFileParametersResponse(
     struct soap *soap, const char *tag, ns1__addDataFileParametersResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addDataFileParametersResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addDataFileParametersResponse,
       sizeof(ns1__addDataFileParametersResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -69594,10 +69841,10 @@ soap_in_ns1__addDataFileParametersResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addDataFileParametersResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -69605,7 +69852,7 @@ soap_in_ns1__addDataFileParametersResponse(
         sizeof(ns1__addDataFileParametersResponse), 0,
         soap_copy_ns1__addDataFileParametersResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -69613,7 +69860,7 @@ soap_in_ns1__addDataFileParametersResponse(
 int ns1__addDataFileParametersResponse::soap_put(struct soap *soap,
                                                  const char *tag,
                                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addDataFileParametersResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:addDataFileParametersResponse", id,
                      type))
@@ -69633,7 +69880,7 @@ soap_get_ns1__addDataFileParametersResponse(
     const char *type) {
   if ((p = soap_in_ns1__addDataFileParametersResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -69650,11 +69897,11 @@ soap_instantiate_ns1__addDataFileParametersResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__addDataFileParametersResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__addDataFileParametersResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__addDataFileParametersResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addDataFileParametersResponse);
     if (size)
@@ -69694,10 +69941,10 @@ soap_copy_ns1__addDataFileParametersResponse(struct soap *soap, int st, int tt,
 void ns1__addDataFileParameters::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__addDataFileParameters::sessionId = NULL;
+  this->ns1__addDataFileParameters::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__datafileParameter(
       soap, &this->ns1__addDataFileParameters::dataFileParameters);
-  this->ns1__addDataFileParameters::datafileId = NULL;
+  this->ns1__addDataFileParameters::datafileId = nullptr;
 }
 
 void ns1__addDataFileParameters::soap_serialize(struct soap *soap) const {
@@ -69754,13 +70001,13 @@ soap_in_ns1__addDataFileParameters(struct soap *soap, const char *tag,
                                    ns1__addDataFileParameters *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__addDataFileParameters *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__addDataFileParameters,
       sizeof(ns1__addDataFileParameters), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__addDataFileParameters) {
@@ -69808,10 +70055,10 @@ soap_in_ns1__addDataFileParameters(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__addDataFileParameters *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -69819,14 +70066,14 @@ soap_in_ns1__addDataFileParameters(struct soap *soap, const char *tag,
         sizeof(ns1__addDataFileParameters), 0,
         soap_copy_ns1__addDataFileParameters);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__addDataFileParameters::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__addDataFileParameters);
   if (this->soap_out(soap, tag ? tag : "ns1:addDataFileParameters", id, type))
     return soap->error;
@@ -69844,7 +70091,7 @@ soap_get_ns1__addDataFileParameters(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__addDataFileParameters(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -69859,10 +70106,11 @@ soap_instantiate_ns1__addDataFileParameters(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__addDataFileParameters(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__addDataFileParameters, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__addDataFileParameters, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__addDataFileParameters);
     if (size)
@@ -69900,10 +70148,10 @@ void ns1__facilityCycle::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__facilityCycle::description = NULL;
-  this->ns1__facilityCycle::finishDate = NULL;
-  this->ns1__facilityCycle::name = NULL;
-  this->ns1__facilityCycle::startDate = NULL;
+  this->ns1__facilityCycle::description = nullptr;
+  this->ns1__facilityCycle::finishDate = nullptr;
+  this->ns1__facilityCycle::name = nullptr;
+  this->ns1__facilityCycle::startDate = nullptr;
 }
 
 void ns1__facilityCycle::soap_serialize(struct soap *soap) const {
@@ -69969,13 +70217,13 @@ SOAP_FMAC3 ns1__facilityCycle *SOAP_FMAC4
 soap_in_ns1__facilityCycle(struct soap *soap, const char *tag,
                            ns1__facilityCycle *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__facilityCycle *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__facilityCycle,
       sizeof(ns1__facilityCycle), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__facilityCycle) {
@@ -70065,28 +70313,28 @@ soap_in_ns1__facilityCycle(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__facilityCycle *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__facilityCycle, 0,
         sizeof(ns1__facilityCycle), 0, soap_copy_ns1__facilityCycle);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__facilityCycle::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__facilityCycle);
   if (this->soap_out(soap, tag ? tag : "ns1:facilityCycle", id, type))
     return soap->error;
@@ -70103,7 +70351,7 @@ soap_get_ns1__facilityCycle(struct soap *soap, ns1__facilityCycle *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__facilityCycle(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -70116,9 +70364,9 @@ soap_instantiate_ns1__facilityCycle(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__facilityCycle(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__facilityCycle, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__facilityCycle, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__facilityCycle);
     if (size)
@@ -70201,13 +70449,13 @@ soap_in_ns1__listFacilityCyclesResponse(struct soap *soap, const char *tag,
                                         ns1__listFacilityCyclesResponse *a,
                                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listFacilityCyclesResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listFacilityCyclesResponse,
       sizeof(ns1__listFacilityCyclesResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listFacilityCyclesResponse) {
@@ -70237,10 +70485,10 @@ soap_in_ns1__listFacilityCyclesResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listFacilityCyclesResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -70248,7 +70496,7 @@ soap_in_ns1__listFacilityCyclesResponse(struct soap *soap, const char *tag,
         sizeof(ns1__listFacilityCyclesResponse), 0,
         soap_copy_ns1__listFacilityCyclesResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -70256,7 +70504,7 @@ soap_in_ns1__listFacilityCyclesResponse(struct soap *soap, const char *tag,
 int ns1__listFacilityCyclesResponse::soap_put(struct soap *soap,
                                               const char *tag,
                                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listFacilityCyclesResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:listFacilityCyclesResponse", id,
                      type))
@@ -70276,7 +70524,7 @@ soap_get_ns1__listFacilityCyclesResponse(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_ns1__listFacilityCyclesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -70293,10 +70541,10 @@ soap_instantiate_ns1__listFacilityCyclesResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__listFacilityCyclesResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__listFacilityCyclesResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__listFacilityCyclesResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listFacilityCyclesResponse);
     if (size)
@@ -70334,7 +70582,7 @@ soap_copy_ns1__listFacilityCyclesResponse(struct soap *soap, int st, int tt,
 void ns1__listFacilityCycles::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__listFacilityCycles::sessionId = NULL;
+  this->ns1__listFacilityCycles::sessionId = nullptr;
 }
 
 void ns1__listFacilityCycles::soap_serialize(struct soap *soap) const {
@@ -70376,13 +70624,13 @@ SOAP_FMAC3 ns1__listFacilityCycles *SOAP_FMAC4
 soap_in_ns1__listFacilityCycles(struct soap *soap, const char *tag,
                                 ns1__listFacilityCycles *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listFacilityCycles *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listFacilityCycles,
       sizeof(ns1__listFacilityCycles), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listFacilityCycles) {
@@ -70416,24 +70664,24 @@ soap_in_ns1__listFacilityCycles(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listFacilityCycles *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__listFacilityCycles,
         0, sizeof(ns1__listFacilityCycles), 0,
         soap_copy_ns1__listFacilityCycles);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__listFacilityCycles::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listFacilityCycles);
   if (this->soap_out(soap, tag ? tag : "ns1:listFacilityCycles", id, type))
     return soap->error;
@@ -70450,7 +70698,7 @@ soap_get_ns1__listFacilityCycles(struct soap *soap, ns1__listFacilityCycles *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__listFacilityCycles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -70465,9 +70713,9 @@ soap_instantiate_ns1__listFacilityCycles(struct soap *soap, int n,
                       "soap_instantiate_ns1__listFacilityCycles(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__listFacilityCycles, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__listFacilityCycles, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listFacilityCycles);
     if (size)
@@ -70536,14 +70784,14 @@ soap_in_ns1__removeAuthorisationResponse(struct soap *soap, const char *tag,
                                          ns1__removeAuthorisationResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__removeAuthorisationResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeAuthorisationResponse,
             sizeof(ns1__removeAuthorisationResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -70553,14 +70801,14 @@ soap_in_ns1__removeAuthorisationResponse(struct soap *soap, const char *tag,
       return (ns1__removeAuthorisationResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__removeAuthorisationResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeAuthorisationResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:removeAuthorisationResponse", id,
                      type))
@@ -70580,7 +70828,7 @@ soap_get_ns1__removeAuthorisationResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeAuthorisationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -70597,10 +70845,10 @@ soap_instantiate_ns1__removeAuthorisationResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__removeAuthorisationResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__removeAuthorisationResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__removeAuthorisationResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeAuthorisationResponse);
     if (size)
@@ -70640,8 +70888,8 @@ soap_copy_ns1__removeAuthorisationResponse(struct soap *soap, int st, int tt,
 void ns1__removeAuthorisation::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__removeAuthorisation::sessionId = NULL;
-  this->ns1__removeAuthorisation::authorisationId = NULL;
+  this->ns1__removeAuthorisation::sessionId = nullptr;
+  this->ns1__removeAuthorisation::authorisationId = nullptr;
 }
 
 void ns1__removeAuthorisation::soap_serialize(struct soap *soap) const {
@@ -70690,13 +70938,13 @@ soap_in_ns1__removeAuthorisation(struct soap *soap, const char *tag,
                                  ns1__removeAuthorisation *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__removeAuthorisation *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeAuthorisation,
       sizeof(ns1__removeAuthorisation), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__removeAuthorisation) {
@@ -70738,10 +70986,10 @@ soap_in_ns1__removeAuthorisation(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__removeAuthorisation *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -70749,14 +70997,14 @@ soap_in_ns1__removeAuthorisation(struct soap *soap, const char *tag,
         sizeof(ns1__removeAuthorisation), 0,
         soap_copy_ns1__removeAuthorisation);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__removeAuthorisation::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeAuthorisation);
   if (this->soap_out(soap, tag ? tag : "ns1:removeAuthorisation", id, type))
     return soap->error;
@@ -70774,7 +71022,7 @@ soap_get_ns1__removeAuthorisation(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__removeAuthorisation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -70788,10 +71036,11 @@ soap_instantiate_ns1__removeAuthorisation(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__removeAuthorisation(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__removeAuthorisation, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__removeAuthorisation, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeAuthorisation);
     if (size)
@@ -70860,14 +71109,14 @@ soap_in_ns1__removeDataFileResponse(struct soap *soap, const char *tag,
                                     ns1__removeDataFileResponse *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__removeDataFileResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeDataFileResponse,
             sizeof(ns1__removeDataFileResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -70877,13 +71126,13 @@ soap_in_ns1__removeDataFileResponse(struct soap *soap, const char *tag,
       return (ns1__removeDataFileResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__removeDataFileResponse::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeDataFileResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:removeDataFileResponse", id, type))
     return soap->error;
@@ -70901,7 +71150,7 @@ soap_get_ns1__removeDataFileResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeDataFileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -70917,10 +71166,10 @@ soap_instantiate_ns1__removeDataFileResponse(struct soap *soap, int n,
                    "soap_instantiate_ns1__removeDataFileResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__removeDataFileResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__removeDataFileResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeDataFileResponse);
     if (size)
@@ -70958,8 +71207,8 @@ soap_copy_ns1__removeDataFileResponse(struct soap *soap, int st, int tt,
 void ns1__removeDataFile::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__removeDataFile::sessionId = NULL;
-  this->ns1__removeDataFile::datafileId = NULL;
+  this->ns1__removeDataFile::sessionId = nullptr;
+  this->ns1__removeDataFile::datafileId = nullptr;
 }
 
 void ns1__removeDataFile::soap_serialize(struct soap *soap) const {
@@ -71004,13 +71253,13 @@ SOAP_FMAC3 ns1__removeDataFile *SOAP_FMAC4
 soap_in_ns1__removeDataFile(struct soap *soap, const char *tag,
                             ns1__removeDataFile *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__removeDataFile *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeDataFile,
       sizeof(ns1__removeDataFile), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__removeDataFile) {
@@ -71052,23 +71301,23 @@ soap_in_ns1__removeDataFile(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__removeDataFile *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__removeDataFile, 0,
         sizeof(ns1__removeDataFile), 0, soap_copy_ns1__removeDataFile);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__removeDataFile::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeDataFile);
   if (this->soap_out(soap, tag ? tag : "ns1:removeDataFile", id, type))
     return soap->error;
@@ -71085,7 +71334,7 @@ soap_get_ns1__removeDataFile(struct soap *soap, ns1__removeDataFile *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeDataFile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -71098,9 +71347,9 @@ soap_instantiate_ns1__removeDataFile(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__removeDataFile(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__removeDataFile, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__removeDataFile, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeDataFile);
     if (size)
@@ -71137,8 +71386,8 @@ void ns1__parameterPK::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityPrimaryKeyBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__parameterPK::name = NULL;
-  this->ns1__parameterPK::units = NULL;
+  this->ns1__parameterPK::name = nullptr;
+  this->ns1__parameterPK::units = nullptr;
 }
 
 void ns1__parameterPK::soap_serialize(struct soap *soap) const {
@@ -71183,13 +71432,13 @@ SOAP_FMAC3 ns1__parameterPK *SOAP_FMAC4
 soap_in_ns1__parameterPK(struct soap *soap, const char *tag,
                          ns1__parameterPK *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__parameterPK *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__parameterPK,
       sizeof(ns1__parameterPK), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__parameterPK) {
@@ -71230,23 +71479,23 @@ soap_in_ns1__parameterPK(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__parameterPK *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__parameterPK, 0,
         sizeof(ns1__parameterPK), 0, soap_copy_ns1__parameterPK);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__parameterPK::soap_put(struct soap *soap, const char *tag,
                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__parameterPK);
   if (this->soap_out(soap, tag ? tag : "ns1:parameterPK", id, type))
     return soap->error;
@@ -71263,7 +71512,7 @@ soap_get_ns1__parameterPK(struct soap *soap, ns1__parameterPK *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__parameterPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -71275,10 +71524,10 @@ soap_instantiate_ns1__parameterPK(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__parameterPK(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__parameterPK, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__parameterPK, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__parameterPK);
     if (size)
@@ -71317,13 +71566,13 @@ void ns1__parameter::soap_default(struct soap *soap) {
   this->xsd__anyType::soap_default(soap);
   soap_default_bool(soap, &this->ns1__parameter::datafileParameter);
   soap_default_bool(soap, &this->ns1__parameter::datasetParameter);
-  this->ns1__parameter::description = NULL;
-  this->ns1__parameter::nonNumericValueFormat = NULL;
-  this->ns1__parameter::parameterPK = NULL;
+  this->ns1__parameter::description = nullptr;
+  this->ns1__parameter::nonNumericValueFormat = nullptr;
+  this->ns1__parameter::parameterPK = nullptr;
   soap_default_bool(soap, &this->ns1__parameter::sampleParameter);
-  this->ns1__parameter::searchable = NULL;
-  this->ns1__parameter::unitsLongVersion = NULL;
-  this->ns1__parameter::valueType = NULL;
+  this->ns1__parameter::searchable = nullptr;
+  this->ns1__parameter::unitsLongVersion = nullptr;
+  this->ns1__parameter::valueType = nullptr;
   soap_default_bool(soap, &this->ns1__parameter::verified);
 }
 
@@ -71413,13 +71662,13 @@ SOAP_FMAC3 ns1__parameter *SOAP_FMAC4
 soap_in_ns1__parameter(struct soap *soap, const char *tag, ns1__parameter *a,
                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__parameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__parameter, sizeof(ns1__parameter),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__parameter) {
@@ -71559,30 +71808,30 @@ soap_in_ns1__parameter(struct soap *soap, const char *tag, ns1__parameter *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__parameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__parameter, 0,
         sizeof(ns1__parameter), 0, soap_copy_ns1__parameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0 ||
        soap_flag_datafileParameter1 > 0 || soap_flag_datasetParameter1 > 0 ||
        soap_flag_sampleParameter1 > 0 || soap_flag_verified1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__parameter::soap_put(struct soap *soap, const char *tag,
                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__parameter);
   if (this->soap_out(soap, tag ? tag : "ns1:parameter", id, type))
     return soap->error;
@@ -71599,7 +71848,7 @@ soap_get_ns1__parameter(struct soap *soap, ns1__parameter *p, const char *tag,
                         const char *type) {
   if ((p = soap_in_ns1__parameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -71611,10 +71860,10 @@ soap_instantiate_ns1__parameter(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__parameter(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__parameter, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__parameter, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__parameter);
     if (size)
@@ -71698,14 +71947,14 @@ soap_in_ns1__getParameterByNameUnitsResponse(
     struct soap *soap, const char *tag, ns1__getParameterByNameUnitsResponse *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getParameterByNameUnitsResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getParameterByNameUnitsResponse,
       sizeof(ns1__getParameterByNameUnitsResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -71738,10 +71987,10 @@ soap_in_ns1__getParameterByNameUnitsResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getParameterByNameUnitsResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -71749,7 +71998,7 @@ soap_in_ns1__getParameterByNameUnitsResponse(
         sizeof(ns1__getParameterByNameUnitsResponse), 0,
         soap_copy_ns1__getParameterByNameUnitsResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -71757,7 +72006,7 @@ soap_in_ns1__getParameterByNameUnitsResponse(
 int ns1__getParameterByNameUnitsResponse::soap_put(struct soap *soap,
                                                    const char *tag,
                                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getParameterByNameUnitsResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getParameterByNameUnitsResponse",
                      id, type))
@@ -71777,7 +72026,7 @@ soap_get_ns1__getParameterByNameUnitsResponse(
     const char *type) {
   if ((p = soap_in_ns1__getParameterByNameUnitsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -71795,10 +72044,10 @@ soap_instantiate_ns1__getParameterByNameUnitsResponse(struct soap *soap, int n,
           "soap_instantiate_ns1__getParameterByNameUnitsResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__getParameterByNameUnitsResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__getParameterByNameUnitsResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getParameterByNameUnitsResponse);
     if (size)
@@ -71838,9 +72087,9 @@ soap_copy_ns1__getParameterByNameUnitsResponse(struct soap *soap, int st,
 void ns1__getParameterByNameUnits::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getParameterByNameUnits::sesssionId = NULL;
-  this->ns1__getParameterByNameUnits::name = NULL;
-  this->ns1__getParameterByNameUnits::units = NULL;
+  this->ns1__getParameterByNameUnits::sesssionId = nullptr;
+  this->ns1__getParameterByNameUnits::name = nullptr;
+  this->ns1__getParameterByNameUnits::units = nullptr;
 }
 
 void ns1__getParameterByNameUnits::soap_serialize(struct soap *soap) const {
@@ -71896,13 +72145,13 @@ soap_in_ns1__getParameterByNameUnits(struct soap *soap, const char *tag,
                                      ns1__getParameterByNameUnits *a,
                                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getParameterByNameUnits *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__getParameterByNameUnits,
       sizeof(ns1__getParameterByNameUnits), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__getParameterByNameUnits) {
@@ -71954,10 +72203,10 @@ soap_in_ns1__getParameterByNameUnits(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getParameterByNameUnits *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -71965,14 +72214,14 @@ soap_in_ns1__getParameterByNameUnits(struct soap *soap, const char *tag,
         sizeof(ns1__getParameterByNameUnits), 0,
         soap_copy_ns1__getParameterByNameUnits);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getParameterByNameUnits::soap_put(struct soap *soap, const char *tag,
                                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__getParameterByNameUnits);
   if (this->soap_out(soap, tag ? tag : "ns1:getParameterByNameUnits", id, type))
     return soap->error;
@@ -71990,7 +72239,7 @@ soap_get_ns1__getParameterByNameUnits(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in_ns1__getParameterByNameUnits(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -72007,10 +72256,10 @@ soap_instantiate_ns1__getParameterByNameUnits(struct soap *soap, int n,
              "soap_instantiate_ns1__getParameterByNameUnits(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__getParameterByNameUnits, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__getParameterByNameUnits, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getParameterByNameUnits);
     if (size)
@@ -72101,15 +72350,15 @@ soap_in_ns1__searchInvestigationByParameterLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterLogicalResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByParameterLogicalResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterLogicalResponse,
       sizeof(ns1__searchInvestigationByParameterLogicalResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -72143,10 +72392,10 @@ soap_in_ns1__searchInvestigationByParameterLogicalResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByParameterLogicalResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -72154,7 +72403,7 @@ soap_in_ns1__searchInvestigationByParameterLogicalResponse(
         sizeof(ns1__searchInvestigationByParameterLogicalResponse), 0,
         soap_copy_ns1__searchInvestigationByParameterLogicalResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -72162,7 +72411,7 @@ soap_in_ns1__searchInvestigationByParameterLogicalResponse(
 int ns1__searchInvestigationByParameterLogicalResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterLogicalResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchInvestigationByParameterLogicalResponse",
@@ -72184,7 +72433,7 @@ soap_get_ns1__searchInvestigationByParameterLogicalResponse(
   if ((p = soap_in_ns1__searchInvestigationByParameterLogicalResponse(soap, tag,
                                                                       p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -72199,11 +72448,11 @@ soap_instantiate_ns1__searchInvestigationByParameterLogicalResponse(
                                     "nse(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterLogicalResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(ns1__searchInvestigationByParameterLogicalResponse);
@@ -72252,7 +72501,7 @@ void ns1__parameterLogicalCondition::soap_default(struct soap *soap) {
   this->xsd__anyType::soap_default(soap);
   soap_default_std__vectorTemplateOfPointerTons1__parameterCondition(
       soap, &this->ns1__parameterLogicalCondition::listComparable);
-  this->ns1__parameterLogicalCondition::operator_ = NULL;
+  this->ns1__parameterLogicalCondition::operator_ = nullptr;
 }
 
 void ns1__parameterLogicalCondition::soap_serialize(struct soap *soap) const {
@@ -72311,13 +72560,13 @@ soap_in_ns1__parameterLogicalCondition(struct soap *soap, const char *tag,
                                        ns1__parameterLogicalCondition *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__parameterLogicalCondition *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__parameterLogicalCondition,
       sizeof(ns1__parameterLogicalCondition), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__parameterLogicalCondition) {
@@ -72371,10 +72620,10 @@ soap_in_ns1__parameterLogicalCondition(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__parameterLogicalCondition *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -72382,19 +72631,19 @@ soap_in_ns1__parameterLogicalCondition(struct soap *soap, const char *tag,
         sizeof(ns1__parameterLogicalCondition), 0,
         soap_copy_ns1__parameterLogicalCondition);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_negate3 > 0 || soap_flag_sensitive3 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__parameterLogicalCondition::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__parameterLogicalCondition);
   if (this->soap_out(soap, tag ? tag : "ns1:parameterLogicalCondition", id,
                      type))
@@ -72414,7 +72663,7 @@ soap_get_ns1__parameterLogicalCondition(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__parameterLogicalCondition(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -72431,10 +72680,10 @@ soap_instantiate_ns1__parameterLogicalCondition(struct soap *soap, int n,
              "soap_instantiate_ns1__parameterLogicalCondition(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__parameterLogicalCondition, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__parameterLogicalCondition,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__parameterLogicalCondition);
     if (size)
@@ -72473,8 +72722,8 @@ void ns1__searchInvestigationByParameterLogical::soap_default(
     struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchInvestigationByParameterLogical::sessionId = NULL;
-  this->ns1__searchInvestigationByParameterLogical::logicalCondition = NULL;
+  this->ns1__searchInvestigationByParameterLogical::sessionId = nullptr;
+  this->ns1__searchInvestigationByParameterLogical::logicalCondition = nullptr;
 }
 
 void ns1__searchInvestigationByParameterLogical::soap_serialize(
@@ -72531,15 +72780,15 @@ soap_in_ns1__searchInvestigationByParameterLogical(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterLogical *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchInvestigationByParameterLogical *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterLogical,
       sizeof(ns1__searchInvestigationByParameterLogical), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -72586,10 +72835,10 @@ soap_in_ns1__searchInvestigationByParameterLogical(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchInvestigationByParameterLogical *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -72597,7 +72846,7 @@ soap_in_ns1__searchInvestigationByParameterLogical(
         sizeof(ns1__searchInvestigationByParameterLogical), 0,
         soap_copy_ns1__searchInvestigationByParameterLogical);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -72605,7 +72854,7 @@ soap_in_ns1__searchInvestigationByParameterLogical(
 int ns1__searchInvestigationByParameterLogical::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterLogical);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchInvestigationByParameterLogical",
@@ -72628,7 +72877,7 @@ soap_get_ns1__searchInvestigationByParameterLogical(
   if ((p = soap_in_ns1__searchInvestigationByParameterLogical(soap, tag, p,
                                                               type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -72643,10 +72892,10 @@ soap_instantiate_ns1__searchInvestigationByParameterLogical(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterLogical, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterLogical,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchInvestigationByParameterLogical);
     if (size)
@@ -72721,13 +72970,13 @@ soap_in_ns1__modifySampleResponse(struct soap *soap, const char *tag,
                                   ns1__modifySampleResponse *a,
                                   const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__modifySampleResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifySampleResponse,
             sizeof(ns1__modifySampleResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -72737,13 +72986,13 @@ soap_in_ns1__modifySampleResponse(struct soap *soap, const char *tag,
       return (ns1__modifySampleResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__modifySampleResponse::soap_put(struct soap *soap, const char *tag,
                                         const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifySampleResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:modifySampleResponse", id, type))
     return soap->error;
@@ -72761,7 +73010,7 @@ soap_get_ns1__modifySampleResponse(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in_ns1__modifySampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -72776,10 +73025,11 @@ soap_instantiate_ns1__modifySampleResponse(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate_ns1__modifySampleResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__modifySampleResponse, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__modifySampleResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifySampleResponse);
     if (size)
@@ -72816,8 +73066,8 @@ soap_copy_ns1__modifySampleResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__modifySample::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__modifySample::sessionId = NULL;
-  this->ns1__modifySample::sample = NULL;
+  this->ns1__modifySample::sessionId = nullptr;
+  this->ns1__modifySample::sample = nullptr;
 }
 
 void ns1__modifySample::soap_serialize(struct soap *soap) const {
@@ -72862,13 +73112,13 @@ SOAP_FMAC3 ns1__modifySample *SOAP_FMAC4
 soap_in_ns1__modifySample(struct soap *soap, const char *tag,
                           ns1__modifySample *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__modifySample *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__modifySample,
       sizeof(ns1__modifySample), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__modifySample) {
@@ -72910,23 +73160,23 @@ soap_in_ns1__modifySample(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__modifySample *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__modifySample, 0,
         sizeof(ns1__modifySample), 0, soap_copy_ns1__modifySample);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__modifySample::soap_put(struct soap *soap, const char *tag,
                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__modifySample);
   if (this->soap_out(soap, tag ? tag : "ns1:modifySample", id, type))
     return soap->error;
@@ -72943,7 +73193,7 @@ soap_get_ns1__modifySample(struct soap *soap, ns1__modifySample *p,
                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__modifySample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -72956,9 +73206,9 @@ soap_instantiate_ns1__modifySample(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__modifySample(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__modifySample, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__modifySample, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__modifySample);
     if (size)
@@ -72994,7 +73244,7 @@ soap_copy_ns1__modifySample(struct soap *soap, int st, int tt, void *p,
 void ns1__createDataFileResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__createDataFileResponse::return_ = NULL;
+  this->ns1__createDataFileResponse::return_ = nullptr;
 }
 
 void ns1__createDataFileResponse::soap_serialize(struct soap *soap) const {
@@ -73038,13 +73288,13 @@ soap_in_ns1__createDataFileResponse(struct soap *soap, const char *tag,
                                     ns1__createDataFileResponse *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__createDataFileResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__createDataFileResponse,
       sizeof(ns1__createDataFileResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__createDataFileResponse) {
@@ -73077,10 +73327,10 @@ soap_in_ns1__createDataFileResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__createDataFileResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -73088,14 +73338,14 @@ soap_in_ns1__createDataFileResponse(struct soap *soap, const char *tag,
         sizeof(ns1__createDataFileResponse), 0,
         soap_copy_ns1__createDataFileResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__createDataFileResponse::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__createDataFileResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:createDataFileResponse", id, type))
     return soap->error;
@@ -73113,7 +73363,7 @@ soap_get_ns1__createDataFileResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__createDataFileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -73129,10 +73379,10 @@ soap_instantiate_ns1__createDataFileResponse(struct soap *soap, int n,
                    "soap_instantiate_ns1__createDataFileResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__createDataFileResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__createDataFileResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__createDataFileResponse);
     if (size)
@@ -73171,8 +73421,8 @@ void ns1__relatedDatafilesPK::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityPrimaryKeyBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__relatedDatafilesPK::destDatafileId = NULL;
-  this->ns1__relatedDatafilesPK::sourceDatafileId = NULL;
+  this->ns1__relatedDatafilesPK::destDatafileId = nullptr;
+  this->ns1__relatedDatafilesPK::sourceDatafileId = nullptr;
 }
 
 void ns1__relatedDatafilesPK::soap_serialize(struct soap *soap) const {
@@ -73222,13 +73472,13 @@ SOAP_FMAC3 ns1__relatedDatafilesPK *SOAP_FMAC4
 soap_in_ns1__relatedDatafilesPK(struct soap *soap, const char *tag,
                                 ns1__relatedDatafilesPK *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__relatedDatafilesPK *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__relatedDatafilesPK,
       sizeof(ns1__relatedDatafilesPK), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__relatedDatafilesPK) {
@@ -73269,24 +73519,24 @@ soap_in_ns1__relatedDatafilesPK(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__relatedDatafilesPK *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__relatedDatafilesPK,
         0, sizeof(ns1__relatedDatafilesPK), 0,
         soap_copy_ns1__relatedDatafilesPK);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__relatedDatafilesPK::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__relatedDatafilesPK);
   if (this->soap_out(soap, tag ? tag : "ns1:relatedDatafilesPK", id, type))
     return soap->error;
@@ -73303,7 +73553,7 @@ soap_get_ns1__relatedDatafilesPK(struct soap *soap, ns1__relatedDatafilesPK *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__relatedDatafilesPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -73318,9 +73568,9 @@ soap_instantiate_ns1__relatedDatafilesPK(struct soap *soap, int n,
                       "soap_instantiate_ns1__relatedDatafilesPK(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__relatedDatafilesPK, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__relatedDatafilesPK, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__relatedDatafilesPK);
     if (size)
@@ -73357,8 +73607,8 @@ void ns1__relatedDatafiles::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__relatedDatafiles::relatedDatafilesPK = NULL;
-  this->ns1__relatedDatafiles::relation = NULL;
+  this->ns1__relatedDatafiles::relatedDatafilesPK = nullptr;
+  this->ns1__relatedDatafiles::relation = nullptr;
 }
 
 void ns1__relatedDatafiles::soap_serialize(struct soap *soap) const {
@@ -73419,13 +73669,13 @@ SOAP_FMAC3 ns1__relatedDatafiles *SOAP_FMAC4
 soap_in_ns1__relatedDatafiles(struct soap *soap, const char *tag,
                               ns1__relatedDatafiles *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__relatedDatafiles *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__relatedDatafiles,
       sizeof(ns1__relatedDatafiles), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__relatedDatafiles) {
@@ -73500,28 +73750,28 @@ soap_in_ns1__relatedDatafiles(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__relatedDatafiles *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__relatedDatafiles,
         0, sizeof(ns1__relatedDatafiles), 0, soap_copy_ns1__relatedDatafiles);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__relatedDatafiles::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__relatedDatafiles);
   if (this->soap_out(soap, tag ? tag : "ns1:relatedDatafiles", id, type))
     return soap->error;
@@ -73538,7 +73788,7 @@ soap_get_ns1__relatedDatafiles(struct soap *soap, ns1__relatedDatafiles *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns1__relatedDatafiles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -73553,9 +73803,9 @@ soap_instantiate_ns1__relatedDatafiles(struct soap *soap, int n,
                       "soap_instantiate_ns1__relatedDatafiles(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__relatedDatafiles, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__relatedDatafiles, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__relatedDatafiles);
     if (size)
@@ -73592,9 +73842,9 @@ void ns1__datafileParameterPK::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityPrimaryKeyBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__datafileParameterPK::datafileId = NULL;
-  this->ns1__datafileParameterPK::name = NULL;
-  this->ns1__datafileParameterPK::units = NULL;
+  this->ns1__datafileParameterPK::datafileId = nullptr;
+  this->ns1__datafileParameterPK::name = nullptr;
+  this->ns1__datafileParameterPK::units = nullptr;
 }
 
 void ns1__datafileParameterPK::soap_serialize(struct soap *soap) const {
@@ -73648,13 +73898,13 @@ soap_in_ns1__datafileParameterPK(struct soap *soap, const char *tag,
                                  ns1__datafileParameterPK *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__datafileParameterPK *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__datafileParameterPK,
       sizeof(ns1__datafileParameterPK), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__datafileParameterPK) {
@@ -73705,10 +73955,10 @@ soap_in_ns1__datafileParameterPK(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__datafileParameterPK *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -73716,14 +73966,14 @@ soap_in_ns1__datafileParameterPK(struct soap *soap, const char *tag,
         sizeof(ns1__datafileParameterPK), 0,
         soap_copy_ns1__datafileParameterPK);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__datafileParameterPK::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__datafileParameterPK);
   if (this->soap_out(soap, tag ? tag : "ns1:datafileParameterPK", id, type))
     return soap->error;
@@ -73741,7 +73991,7 @@ soap_get_ns1__datafileParameterPK(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__datafileParameterPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -73755,10 +74005,11 @@ soap_instantiate_ns1__datafileParameterPK(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__datafileParameterPK(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__datafileParameterPK, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__datafileParameterPK, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__datafileParameterPK);
     if (size)
@@ -73796,15 +74047,15 @@ void ns1__datafileParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__datafileParameter::datafileParameterPK = NULL;
-  this->ns1__datafileParameter::dateTimeValue = NULL;
-  this->ns1__datafileParameter::description = NULL;
-  this->ns1__datafileParameter::error = NULL;
-  this->ns1__datafileParameter::numericValue = NULL;
-  this->ns1__datafileParameter::rangeBottom = NULL;
-  this->ns1__datafileParameter::rangeTop = NULL;
-  this->ns1__datafileParameter::stringValue = NULL;
-  this->ns1__datafileParameter::valueType = NULL;
+  this->ns1__datafileParameter::datafileParameterPK = nullptr;
+  this->ns1__datafileParameter::dateTimeValue = nullptr;
+  this->ns1__datafileParameter::description = nullptr;
+  this->ns1__datafileParameter::error = nullptr;
+  this->ns1__datafileParameter::numericValue = nullptr;
+  this->ns1__datafileParameter::rangeBottom = nullptr;
+  this->ns1__datafileParameter::rangeTop = nullptr;
+  this->ns1__datafileParameter::stringValue = nullptr;
+  this->ns1__datafileParameter::valueType = nullptr;
 }
 
 void ns1__datafileParameter::soap_serialize(struct soap *soap) const {
@@ -73903,13 +74154,13 @@ SOAP_FMAC3 ns1__datafileParameter *SOAP_FMAC4
 soap_in_ns1__datafileParameter(struct soap *soap, const char *tag,
                                ns1__datafileParameter *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__datafileParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__datafileParameter,
       sizeof(ns1__datafileParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__datafileParameter) {
@@ -74044,28 +74295,28 @@ soap_in_ns1__datafileParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__datafileParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__datafileParameter,
         0, sizeof(ns1__datafileParameter), 0, soap_copy_ns1__datafileParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__datafileParameter::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__datafileParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:datafileParameter", id, type))
     return soap->error;
@@ -74082,7 +74333,7 @@ soap_get_ns1__datafileParameter(struct soap *soap, ns1__datafileParameter *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__datafileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -74097,9 +74348,9 @@ soap_instantiate_ns1__datafileParameter(struct soap *soap, int n,
                       "soap_instantiate_ns1__datafileParameter(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__datafileParameter, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__datafileParameter, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__datafileParameter);
     if (size)
@@ -74136,8 +74387,8 @@ void ns1__datafileFormatPK::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityPrimaryKeyBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__datafileFormatPK::name = NULL;
-  this->ns1__datafileFormatPK::version = NULL;
+  this->ns1__datafileFormatPK::name = nullptr;
+  this->ns1__datafileFormatPK::version = nullptr;
 }
 
 void ns1__datafileFormatPK::soap_serialize(struct soap *soap) const {
@@ -74184,13 +74435,13 @@ SOAP_FMAC3 ns1__datafileFormatPK *SOAP_FMAC4
 soap_in_ns1__datafileFormatPK(struct soap *soap, const char *tag,
                               ns1__datafileFormatPK *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__datafileFormatPK *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__datafileFormatPK,
       sizeof(ns1__datafileFormatPK), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__datafileFormatPK) {
@@ -74233,23 +74484,23 @@ soap_in_ns1__datafileFormatPK(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__datafileFormatPK *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__datafileFormatPK,
         0, sizeof(ns1__datafileFormatPK), 0, soap_copy_ns1__datafileFormatPK);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__datafileFormatPK::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__datafileFormatPK);
   if (this->soap_out(soap, tag ? tag : "ns1:datafileFormatPK", id, type))
     return soap->error;
@@ -74266,7 +74517,7 @@ soap_get_ns1__datafileFormatPK(struct soap *soap, ns1__datafileFormatPK *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns1__datafileFormatPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -74281,9 +74532,9 @@ soap_instantiate_ns1__datafileFormatPK(struct soap *soap, int n,
                       "soap_instantiate_ns1__datafileFormatPK(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__datafileFormatPK, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__datafileFormatPK, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__datafileFormatPK);
     if (size)
@@ -74320,9 +74571,9 @@ void ns1__datafileFormat::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__datafileFormat::datafileFormatPK = NULL;
-  this->ns1__datafileFormat::description = NULL;
-  this->ns1__datafileFormat::formatType = NULL;
+  this->ns1__datafileFormat::datafileFormatPK = nullptr;
+  this->ns1__datafileFormat::description = nullptr;
+  this->ns1__datafileFormat::formatType = nullptr;
 }
 
 void ns1__datafileFormat::soap_serialize(struct soap *soap) const {
@@ -74387,13 +74638,13 @@ SOAP_FMAC3 ns1__datafileFormat *SOAP_FMAC4
 soap_in_ns1__datafileFormat(struct soap *soap, const char *tag,
                             ns1__datafileFormat *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__datafileFormat *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__datafileFormat,
       sizeof(ns1__datafileFormat), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__datafileFormat) {
@@ -74477,28 +74728,28 @@ soap_in_ns1__datafileFormat(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__datafileFormat *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__datafileFormat, 0,
         sizeof(ns1__datafileFormat), 0, soap_copy_ns1__datafileFormat);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__datafileFormat::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__datafileFormat);
   if (this->soap_out(soap, tag ? tag : "ns1:datafileFormat", id, type))
     return soap->error;
@@ -74515,7 +74766,7 @@ soap_get_ns1__datafileFormat(struct soap *soap, ns1__datafileFormat *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__datafileFormat(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -74528,9 +74779,9 @@ soap_instantiate_ns1__datafileFormat(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__datafileFormat(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__datafileFormat, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__datafileFormat, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__datafileFormat);
     if (size)
@@ -74567,27 +74818,27 @@ void ns1__datafile::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__datafile::checksum = NULL;
-  this->ns1__datafile::command = NULL;
-  this->ns1__datafile::datafileCreateTime = NULL;
-  this->ns1__datafile::datafileFormat = NULL;
-  this->ns1__datafile::datafileInclude = NULL;
-  this->ns1__datafile::datafileModifyTime = NULL;
+  this->ns1__datafile::checksum = nullptr;
+  this->ns1__datafile::command = nullptr;
+  this->ns1__datafile::datafileCreateTime = nullptr;
+  this->ns1__datafile::datafileFormat = nullptr;
+  this->ns1__datafile::datafileInclude = nullptr;
+  this->ns1__datafile::datafileModifyTime = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__datafileParameter(
       soap, &this->ns1__datafile::datafileParameterCollection);
-  this->ns1__datafile::datafileVersion = NULL;
-  this->ns1__datafile::datafileVersionComment = NULL;
-  this->ns1__datafile::datasetId = NULL;
-  this->ns1__datafile::description = NULL;
-  this->ns1__datafile::fileSize = NULL;
-  this->ns1__datafile::id = NULL;
-  this->ns1__datafile::location = NULL;
-  this->ns1__datafile::name = NULL;
+  this->ns1__datafile::datafileVersion = nullptr;
+  this->ns1__datafile::datafileVersionComment = nullptr;
+  this->ns1__datafile::datasetId = nullptr;
+  this->ns1__datafile::description = nullptr;
+  this->ns1__datafile::fileSize = nullptr;
+  this->ns1__datafile::id = nullptr;
+  this->ns1__datafile::location = nullptr;
+  this->ns1__datafile::name = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__relatedDatafiles(
       soap, &this->ns1__datafile::relatedDatafilesCollection1);
   soap_default_std__vectorTemplateOfPointerTons1__relatedDatafiles(
       soap, &this->ns1__datafile::relatedDatafilesCollection);
-  this->ns1__datafile::signature = NULL;
+  this->ns1__datafile::signature = nullptr;
 }
 
 void ns1__datafile::soap_serialize(struct soap *soap) const {
@@ -74719,13 +74970,13 @@ SOAP_FMAC3 ns1__datafile *SOAP_FMAC4
 soap_in_ns1__datafile(struct soap *soap, const char *tag, ns1__datafile *a,
                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__datafile *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__datafile, sizeof(ns1__datafile),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__datafile) {
@@ -74924,28 +75175,28 @@ soap_in_ns1__datafile(struct soap *soap, const char *tag, ns1__datafile *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__datafile *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__datafile, 0,
         sizeof(ns1__datafile), 0, soap_copy_ns1__datafile);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__datafile::soap_put(struct soap *soap, const char *tag,
                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__datafile);
   if (this->soap_out(soap, tag ? tag : "ns1:datafile", id, type))
     return soap->error;
@@ -74962,7 +75213,7 @@ soap_get_ns1__datafile(struct soap *soap, ns1__datafile *p, const char *tag,
                        const char *type) {
   if ((p = soap_in_ns1__datafile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -74975,9 +75226,9 @@ soap_instantiate_ns1__datafile(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__datafile(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__datafile, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__datafile, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__datafile);
     if (size)
@@ -75012,9 +75263,9 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__datafile(struct soap *soap, int st,
 void ns1__createDataFile::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__createDataFile::sessionId = NULL;
-  this->ns1__createDataFile::dataFile = NULL;
-  this->ns1__createDataFile::datasetId = NULL;
+  this->ns1__createDataFile::sessionId = nullptr;
+  this->ns1__createDataFile::dataFile = nullptr;
+  this->ns1__createDataFile::datasetId = nullptr;
 }
 
 void ns1__createDataFile::soap_serialize(struct soap *soap) const {
@@ -75064,13 +75315,13 @@ SOAP_FMAC3 ns1__createDataFile *SOAP_FMAC4
 soap_in_ns1__createDataFile(struct soap *soap, const char *tag,
                             ns1__createDataFile *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__createDataFile *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__createDataFile,
       sizeof(ns1__createDataFile), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__createDataFile) {
@@ -75120,23 +75371,23 @@ soap_in_ns1__createDataFile(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__createDataFile *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__createDataFile, 0,
         sizeof(ns1__createDataFile), 0, soap_copy_ns1__createDataFile);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__createDataFile::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__createDataFile);
   if (this->soap_out(soap, tag ? tag : "ns1:createDataFile", id, type))
     return soap->error;
@@ -75153,7 +75404,7 @@ soap_get_ns1__createDataFile(struct soap *soap, ns1__createDataFile *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__createDataFile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -75166,9 +75417,9 @@ soap_instantiate_ns1__createDataFile(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__createDataFile(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__createDataFile, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__createDataFile, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__createDataFile);
     if (size)
@@ -75204,9 +75455,9 @@ soap_copy_ns1__createDataFile(struct soap *soap, int st, int tt, void *p,
 void ns1__InsufficientPrivilegesException::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__InsufficientPrivilegesException::message = NULL;
-  this->ns1__InsufficientPrivilegesException::stackTraceAsString = NULL;
-  this->ns1__InsufficientPrivilegesException::uniqueId = NULL;
+  this->ns1__InsufficientPrivilegesException::message = nullptr;
+  this->ns1__InsufficientPrivilegesException::stackTraceAsString = nullptr;
+  this->ns1__InsufficientPrivilegesException::uniqueId = nullptr;
 }
 
 void ns1__InsufficientPrivilegesException::soap_serialize(
@@ -75266,14 +75517,14 @@ soap_in_ns1__InsufficientPrivilegesException(
     struct soap *soap, const char *tag, ns1__InsufficientPrivilegesException *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__InsufficientPrivilegesException *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__InsufficientPrivilegesException,
       sizeof(ns1__InsufficientPrivilegesException), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -75330,10 +75581,10 @@ soap_in_ns1__InsufficientPrivilegesException(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__InsufficientPrivilegesException *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -75341,7 +75592,7 @@ soap_in_ns1__InsufficientPrivilegesException(
         sizeof(ns1__InsufficientPrivilegesException), 0,
         soap_copy_ns1__InsufficientPrivilegesException);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -75349,7 +75600,7 @@ soap_in_ns1__InsufficientPrivilegesException(
 int ns1__InsufficientPrivilegesException::soap_put(struct soap *soap,
                                                    const char *tag,
                                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__InsufficientPrivilegesException);
   if (this->soap_out(soap, tag ? tag : "ns1:InsufficientPrivilegesException",
                      id, type))
@@ -75369,7 +75620,7 @@ soap_get_ns1__InsufficientPrivilegesException(
     const char *type) {
   if ((p = soap_in_ns1__InsufficientPrivilegesException(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -75387,10 +75638,10 @@ soap_instantiate_ns1__InsufficientPrivilegesException(struct soap *soap, int n,
           "soap_instantiate_ns1__InsufficientPrivilegesException(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__InsufficientPrivilegesException, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__InsufficientPrivilegesException, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__InsufficientPrivilegesException);
     if (size)
@@ -75462,13 +75713,13 @@ soap_in_ns1__removeSampleResponse(struct soap *soap, const char *tag,
                                   ns1__removeSampleResponse *a,
                                   const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__removeSampleResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeSampleResponse,
             sizeof(ns1__removeSampleResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -75478,13 +75729,13 @@ soap_in_ns1__removeSampleResponse(struct soap *soap, const char *tag,
       return (ns1__removeSampleResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__removeSampleResponse::soap_put(struct soap *soap, const char *tag,
                                         const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeSampleResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:removeSampleResponse", id, type))
     return soap->error;
@@ -75502,7 +75753,7 @@ soap_get_ns1__removeSampleResponse(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeSampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -75517,10 +75768,11 @@ soap_instantiate_ns1__removeSampleResponse(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate_ns1__removeSampleResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__removeSampleResponse, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__removeSampleResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeSampleResponse);
     if (size)
@@ -75557,8 +75809,8 @@ soap_copy_ns1__removeSampleResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__removeSample::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__removeSample::sessionId = NULL;
-  this->ns1__removeSample::sampleId = NULL;
+  this->ns1__removeSample::sessionId = nullptr;
+  this->ns1__removeSample::sampleId = nullptr;
 }
 
 void ns1__removeSample::soap_serialize(struct soap *soap) const {
@@ -75603,13 +75855,13 @@ SOAP_FMAC3 ns1__removeSample *SOAP_FMAC4
 soap_in_ns1__removeSample(struct soap *soap, const char *tag,
                           ns1__removeSample *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__removeSample *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__removeSample,
       sizeof(ns1__removeSample), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__removeSample) {
@@ -75651,23 +75903,23 @@ soap_in_ns1__removeSample(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__removeSample *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__removeSample, 0,
         sizeof(ns1__removeSample), 0, soap_copy_ns1__removeSample);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__removeSample::soap_put(struct soap *soap, const char *tag,
                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__removeSample);
   if (this->soap_out(soap, tag ? tag : "ns1:removeSample", id, type))
     return soap->error;
@@ -75684,7 +75936,7 @@ soap_get_ns1__removeSample(struct soap *soap, ns1__removeSample *p,
                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__removeSample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -75697,9 +75949,9 @@ soap_instantiate_ns1__removeSample(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__removeSample(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__removeSample, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__removeSample, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__removeSample);
     if (size)
@@ -75781,13 +76033,13 @@ soap_in_ns1__listInstrumentsResponse(struct soap *soap, const char *tag,
                                      ns1__listInstrumentsResponse *a,
                                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listInstrumentsResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listInstrumentsResponse,
       sizeof(ns1__listInstrumentsResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listInstrumentsResponse) {
@@ -75817,10 +76069,10 @@ soap_in_ns1__listInstrumentsResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listInstrumentsResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -75828,14 +76080,14 @@ soap_in_ns1__listInstrumentsResponse(struct soap *soap, const char *tag,
         sizeof(ns1__listInstrumentsResponse), 0,
         soap_copy_ns1__listInstrumentsResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__listInstrumentsResponse::soap_put(struct soap *soap, const char *tag,
                                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listInstrumentsResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:listInstrumentsResponse", id, type))
     return soap->error;
@@ -75853,7 +76105,7 @@ soap_get_ns1__listInstrumentsResponse(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in_ns1__listInstrumentsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -75870,10 +76122,10 @@ soap_instantiate_ns1__listInstrumentsResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__listInstrumentsResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__listInstrumentsResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__listInstrumentsResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listInstrumentsResponse);
     if (size)
@@ -75911,7 +76163,7 @@ soap_copy_ns1__listInstrumentsResponse(struct soap *soap, int st, int tt,
 void ns1__listInstruments::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__listInstruments::sessionId = NULL;
+  this->ns1__listInstruments::sessionId = nullptr;
 }
 
 void ns1__listInstruments::soap_serialize(struct soap *soap) const {
@@ -75952,13 +76204,13 @@ SOAP_FMAC3 ns1__listInstruments *SOAP_FMAC4
 soap_in_ns1__listInstruments(struct soap *soap, const char *tag,
                              ns1__listInstruments *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listInstruments *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listInstruments,
       sizeof(ns1__listInstruments), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listInstruments) {
@@ -75992,23 +76244,23 @@ soap_in_ns1__listInstruments(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listInstruments *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__listInstruments, 0,
         sizeof(ns1__listInstruments), 0, soap_copy_ns1__listInstruments);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__listInstruments::soap_put(struct soap *soap, const char *tag,
                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listInstruments);
   if (this->soap_out(soap, tag ? tag : "ns1:listInstruments", id, type))
     return soap->error;
@@ -76025,7 +76277,7 @@ soap_get_ns1__listInstruments(struct soap *soap, ns1__listInstruments *p,
                               const char *tag, const char *type) {
   if ((p = soap_in_ns1__listInstruments(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -76040,9 +76292,9 @@ soap_instantiate_ns1__listInstruments(struct soap *soap, int n,
                       "soap_instantiate_ns1__listInstruments(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__listInstruments, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__listInstruments, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listInstruments);
     if (size)
@@ -76129,15 +76381,15 @@ soap_in_ns1__searchDatafileByRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByRestrictionResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByRestrictionResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionResponse,
       sizeof(ns1__searchDatafileByRestrictionResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -76170,10 +76422,10 @@ soap_in_ns1__searchDatafileByRestrictionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByRestrictionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -76181,7 +76433,7 @@ soap_in_ns1__searchDatafileByRestrictionResponse(
         sizeof(ns1__searchDatafileByRestrictionResponse), 0,
         soap_copy_ns1__searchDatafileByRestrictionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -76189,7 +76441,7 @@ soap_in_ns1__searchDatafileByRestrictionResponse(
 int ns1__searchDatafileByRestrictionResponse::soap_put(struct soap *soap,
                                                        const char *tag,
                                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchDatafileByRestrictionResponse", id,
@@ -76212,7 +76464,7 @@ soap_get_ns1__searchDatafileByRestrictionResponse(
   if ((p = soap_in_ns1__searchDatafileByRestrictionResponse(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -76229,10 +76481,10 @@ soap_instantiate_ns1__searchDatafileByRestrictionResponse(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionResponse, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionResponse,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatafileByRestrictionResponse);
     if (size)
@@ -76274,8 +76526,8 @@ soap_copy_ns1__searchDatafileByRestrictionResponse(struct soap *soap, int st,
 void ns1__searchDatafileByRestriction::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatafileByRestriction::sessionId = NULL;
-  this->ns1__searchDatafileByRestriction::restriction = NULL;
+  this->ns1__searchDatafileByRestriction::sessionId = nullptr;
+  this->ns1__searchDatafileByRestriction::restriction = nullptr;
 }
 
 void ns1__searchDatafileByRestriction::soap_serialize(struct soap *soap) const {
@@ -76327,13 +76579,13 @@ soap_in_ns1__searchDatafileByRestriction(struct soap *soap, const char *tag,
                                          ns1__searchDatafileByRestriction *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatafileByRestriction *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchDatafileByRestriction,
       sizeof(ns1__searchDatafileByRestriction), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchDatafileByRestriction) {
@@ -76377,10 +76629,10 @@ soap_in_ns1__searchDatafileByRestriction(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatafileByRestriction *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -76388,7 +76640,7 @@ soap_in_ns1__searchDatafileByRestriction(struct soap *soap, const char *tag,
         sizeof(ns1__searchDatafileByRestriction), 0,
         soap_copy_ns1__searchDatafileByRestriction);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -76396,7 +76648,7 @@ soap_in_ns1__searchDatafileByRestriction(struct soap *soap, const char *tag,
 int ns1__searchDatafileByRestriction::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatafileByRestriction);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatafileByRestriction", id,
                      type))
@@ -76416,7 +76668,7 @@ soap_get_ns1__searchDatafileByRestriction(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchDatafileByRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -76433,10 +76685,10 @@ soap_instantiate_ns1__searchDatafileByRestriction(struct soap *soap, int n,
              "soap_instantiate_ns1__searchDatafileByRestriction(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatafileByRestriction, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatafileByRestriction,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatafileByRestriction);
     if (size)
@@ -76528,15 +76780,15 @@ soap_in_ns1__searchSampleByRestrictionComparisonResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByRestrictionComparisonResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByRestrictionComparisonResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionComparisonResponse,
       sizeof(ns1__searchSampleByRestrictionComparisonResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -76569,10 +76821,10 @@ soap_in_ns1__searchSampleByRestrictionComparisonResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByRestrictionComparisonResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -76580,7 +76832,7 @@ soap_in_ns1__searchSampleByRestrictionComparisonResponse(
         sizeof(ns1__searchSampleByRestrictionComparisonResponse), 0,
         soap_copy_ns1__searchSampleByRestrictionComparisonResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -76588,7 +76840,7 @@ soap_in_ns1__searchSampleByRestrictionComparisonResponse(
 int ns1__searchSampleByRestrictionComparisonResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionComparisonResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchSampleByRestrictionComparisonResponse",
@@ -76610,7 +76862,7 @@ soap_get_ns1__searchSampleByRestrictionComparisonResponse(
   if ((p = soap_in_ns1__searchSampleByRestrictionComparisonResponse(soap, tag,
                                                                     p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -76625,11 +76877,11 @@ soap_instantiate_ns1__searchSampleByRestrictionComparisonResponse(
                                     "e(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionComparisonResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(ns1__searchSampleByRestrictionComparisonResponse);
@@ -76678,10 +76930,10 @@ void ns1__restrictionComparisonCondition::soap_default(struct soap *soap) {
   this->ns1__restrictionCondition::soap_default(soap);
   this->ns1__condition::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__restrictionComparisonCondition::comparisonOperator = NULL;
-  this->ns1__restrictionComparisonCondition::restrictionAttribute = NULL;
-  this->ns1__restrictionComparisonCondition::value = NULL;
-  this->ns1__restrictionComparisonCondition::valueRight = NULL;
+  this->ns1__restrictionComparisonCondition::comparisonOperator = nullptr;
+  this->ns1__restrictionComparisonCondition::restrictionAttribute = nullptr;
+  this->ns1__restrictionComparisonCondition::value = nullptr;
+  this->ns1__restrictionComparisonCondition::valueRight = nullptr;
 }
 
 void ns1__restrictionComparisonCondition::soap_serialize(
@@ -76785,13 +77037,13 @@ soap_in_ns1__restrictionComparisonCondition(
     struct soap *soap, const char *tag, ns1__restrictionComparisonCondition *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__restrictionComparisonCondition *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__restrictionComparisonCondition,
       sizeof(ns1__restrictionComparisonCondition), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -76943,10 +77195,10 @@ soap_in_ns1__restrictionComparisonCondition(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__restrictionComparisonCondition *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -76954,14 +77206,14 @@ soap_in_ns1__restrictionComparisonCondition(
         sizeof(ns1__restrictionComparisonCondition), 0,
         soap_copy_ns1__restrictionComparisonCondition);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_negate3 > 0 || soap_flag_sensitive3 > 0 ||
        soap_flag_maxResults2 > 0 || soap_flag_orderByAsc2 > 0 ||
        soap_flag_returnLongId2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
@@ -76969,7 +77221,7 @@ soap_in_ns1__restrictionComparisonCondition(
 int ns1__restrictionComparisonCondition::soap_put(struct soap *soap,
                                                   const char *tag,
                                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__restrictionComparisonCondition);
   if (this->soap_out(soap, tag ? tag : "ns1:restrictionComparisonCondition", id,
                      type))
@@ -76989,7 +77241,7 @@ soap_get_ns1__restrictionComparisonCondition(
     const char *type) {
   if ((p = soap_in_ns1__restrictionComparisonCondition(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -77006,11 +77258,11 @@ soap_instantiate_ns1__restrictionComparisonCondition(struct soap *soap, int n,
           fdebug,
           "soap_instantiate_ns1__restrictionComparisonCondition(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__restrictionComparisonCondition,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__restrictionComparisonCondition, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__restrictionComparisonCondition);
     if (size)
@@ -77050,7 +77302,7 @@ soap_copy_ns1__restrictionComparisonCondition(struct soap *soap, int st, int tt,
 void ns1__searchSampleByRestrictionComparison::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchSampleByRestrictionComparison::sessionId = NULL;
+  this->ns1__searchSampleByRestrictionComparison::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__restrictionComparisonCondition(
       soap, &this->ns1__searchSampleByRestrictionComparison::restriction);
 }
@@ -77108,15 +77360,15 @@ soap_in_ns1__searchSampleByRestrictionComparison(
     struct soap *soap, const char *tag,
     ns1__searchSampleByRestrictionComparison *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSampleByRestrictionComparison *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionComparison,
       sizeof(ns1__searchSampleByRestrictionComparison), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -77159,10 +77411,10 @@ soap_in_ns1__searchSampleByRestrictionComparison(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSampleByRestrictionComparison *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -77170,7 +77422,7 @@ soap_in_ns1__searchSampleByRestrictionComparison(
         sizeof(ns1__searchSampleByRestrictionComparison), 0,
         soap_copy_ns1__searchSampleByRestrictionComparison);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -77178,7 +77430,7 @@ soap_in_ns1__searchSampleByRestrictionComparison(
 int ns1__searchSampleByRestrictionComparison::soap_put(struct soap *soap,
                                                        const char *tag,
                                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionComparison);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchSampleByRestrictionComparison", id,
@@ -77201,7 +77453,7 @@ soap_get_ns1__searchSampleByRestrictionComparison(
   if ((p = soap_in_ns1__searchSampleByRestrictionComparison(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -77218,10 +77470,10 @@ soap_instantiate_ns1__searchSampleByRestrictionComparison(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionComparison, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionComparison,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSampleByRestrictionComparison);
     if (size)
@@ -77296,14 +77548,14 @@ soap_in_ns1__entityPrimaryKeyBaseBean(struct soap *soap, const char *tag,
                                       ns1__entityPrimaryKeyBaseBean *a,
                                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__entityPrimaryKeyBaseBean *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_ns1__entityPrimaryKeyBaseBean,
             sizeof(ns1__entityPrimaryKeyBaseBean), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -77313,13 +77565,13 @@ soap_in_ns1__entityPrimaryKeyBaseBean(struct soap *soap, const char *tag,
       return (ns1__entityPrimaryKeyBaseBean *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__entityPrimaryKeyBaseBean::soap_put(struct soap *soap, const char *tag,
                                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__entityPrimaryKeyBaseBean);
   if (this->soap_out(soap, tag ? tag : "ns1:entityPrimaryKeyBaseBean", id,
                      type))
@@ -77339,7 +77591,7 @@ soap_get_ns1__entityPrimaryKeyBaseBean(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_ns1__entityPrimaryKeyBaseBean(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -77356,10 +77608,10 @@ soap_instantiate_ns1__entityPrimaryKeyBaseBean(struct soap *soap, int n,
              "soap_instantiate_ns1__entityPrimaryKeyBaseBean(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__entityPrimaryKeyBaseBean, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__entityPrimaryKeyBaseBean, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (type && !soap_match_tag(soap, type, "ns1:sampleParameterPK")) {
     cp->type = SOAP_TYPE_ICat3_ns1__sampleParameterPK;
     if (n < 0) {
@@ -77578,9 +77830,9 @@ void ns1__sampleParameterPK::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityPrimaryKeyBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__sampleParameterPK::name = NULL;
-  this->ns1__sampleParameterPK::sampleId = NULL;
-  this->ns1__sampleParameterPK::units = NULL;
+  this->ns1__sampleParameterPK::name = nullptr;
+  this->ns1__sampleParameterPK::sampleId = nullptr;
+  this->ns1__sampleParameterPK::units = nullptr;
 }
 
 void ns1__sampleParameterPK::soap_serialize(struct soap *soap) const {
@@ -77632,13 +77884,13 @@ SOAP_FMAC3 ns1__sampleParameterPK *SOAP_FMAC4
 soap_in_ns1__sampleParameterPK(struct soap *soap, const char *tag,
                                ns1__sampleParameterPK *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__sampleParameterPK *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__sampleParameterPK,
       sizeof(ns1__sampleParameterPK), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__sampleParameterPK) {
@@ -77689,23 +77941,23 @@ soap_in_ns1__sampleParameterPK(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__sampleParameterPK *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__sampleParameterPK,
         0, sizeof(ns1__sampleParameterPK), 0, soap_copy_ns1__sampleParameterPK);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__sampleParameterPK::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__sampleParameterPK);
   if (this->soap_out(soap, tag ? tag : "ns1:sampleParameterPK", id, type))
     return soap->error;
@@ -77722,7 +77974,7 @@ soap_get_ns1__sampleParameterPK(struct soap *soap, ns1__sampleParameterPK *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__sampleParameterPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -77737,9 +77989,9 @@ soap_instantiate_ns1__sampleParameterPK(struct soap *soap, int n,
                       "soap_instantiate_ns1__sampleParameterPK(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__sampleParameterPK, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__sampleParameterPK, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__sampleParameterPK);
     if (size)
@@ -77776,15 +78028,15 @@ void ns1__sampleParameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__sampleParameter::dateTimeValue = NULL;
-  this->ns1__sampleParameter::description = NULL;
-  this->ns1__sampleParameter::error = NULL;
-  this->ns1__sampleParameter::numericValue = NULL;
-  this->ns1__sampleParameter::rangeBottom = NULL;
-  this->ns1__sampleParameter::rangeTop = NULL;
-  this->ns1__sampleParameter::sampleParameterPK = NULL;
-  this->ns1__sampleParameter::stringValue = NULL;
-  this->ns1__sampleParameter::valueType = NULL;
+  this->ns1__sampleParameter::dateTimeValue = nullptr;
+  this->ns1__sampleParameter::description = nullptr;
+  this->ns1__sampleParameter::error = nullptr;
+  this->ns1__sampleParameter::numericValue = nullptr;
+  this->ns1__sampleParameter::rangeBottom = nullptr;
+  this->ns1__sampleParameter::rangeTop = nullptr;
+  this->ns1__sampleParameter::sampleParameterPK = nullptr;
+  this->ns1__sampleParameter::stringValue = nullptr;
+  this->ns1__sampleParameter::valueType = nullptr;
 }
 
 void ns1__sampleParameter::soap_serialize(struct soap *soap) const {
@@ -77878,13 +78130,13 @@ SOAP_FMAC3 ns1__sampleParameter *SOAP_FMAC4
 soap_in_ns1__sampleParameter(struct soap *soap, const char *tag,
                              ns1__sampleParameter *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__sampleParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__sampleParameter,
       sizeof(ns1__sampleParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__sampleParameter) {
@@ -78019,28 +78271,28 @@ soap_in_ns1__sampleParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__sampleParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__sampleParameter, 0,
         sizeof(ns1__sampleParameter), 0, soap_copy_ns1__sampleParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__sampleParameter::soap_put(struct soap *soap, const char *tag,
                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__sampleParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:sampleParameter", id, type))
     return soap->error;
@@ -78057,7 +78309,7 @@ soap_get_ns1__sampleParameter(struct soap *soap, ns1__sampleParameter *p,
                               const char *tag, const char *type) {
   if ((p = soap_in_ns1__sampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -78072,9 +78324,9 @@ soap_instantiate_ns1__sampleParameter(struct soap *soap, int n,
                       "soap_instantiate_ns1__sampleParameter(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__sampleParameter, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__sampleParameter, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__sampleParameter);
     if (size)
@@ -78111,12 +78363,12 @@ void ns1__sample::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__sample::chemicalFormula = NULL;
-  this->ns1__sample::id = NULL;
-  this->ns1__sample::instance = NULL;
-  this->ns1__sample::name = NULL;
-  this->ns1__sample::proposalSampleId = NULL;
-  this->ns1__sample::safetyInformation = NULL;
+  this->ns1__sample::chemicalFormula = nullptr;
+  this->ns1__sample::id = nullptr;
+  this->ns1__sample::instance = nullptr;
+  this->ns1__sample::name = nullptr;
+  this->ns1__sample::proposalSampleId = nullptr;
+  this->ns1__sample::safetyInformation = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__sampleParameter(
       soap, &this->ns1__sample::sampleParameterCollection);
 }
@@ -78197,13 +78449,13 @@ SOAP_FMAC3 ns1__sample *SOAP_FMAC4
 soap_in_ns1__sample(struct soap *soap, const char *tag, ns1__sample *a,
                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__sample *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__sample, sizeof(ns1__sample),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__sample) {
@@ -78315,29 +78567,29 @@ soap_in_ns1__sample(struct soap *soap, const char *tag, ns1__sample *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__sample *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__sample, 0,
         sizeof(ns1__sample), 0, soap_copy_ns1__sample);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__sample::soap_put(struct soap *soap, const char *tag,
                           const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat3_ns1__sample);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat3_ns1__sample);
   if (this->soap_out(soap, tag ? tag : "ns1:sample", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -78353,7 +78605,7 @@ soap_get_ns1__sample(struct soap *soap, ns1__sample *p, const char *tag,
                      const char *type) {
   if ((p = soap_in_ns1__sample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -78366,9 +78618,9 @@ soap_instantiate_ns1__sample(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__sample(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__sample, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__sample, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__sample);
     if (size)
@@ -78453,14 +78705,14 @@ soap_in_ns1__searchSamplesBySampleNameResponse(
     struct soap *soap, const char *tag,
     ns1__searchSamplesBySampleNameResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSamplesBySampleNameResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchSamplesBySampleNameResponse,
       sizeof(ns1__searchSamplesBySampleNameResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -78493,10 +78745,10 @@ soap_in_ns1__searchSamplesBySampleNameResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSamplesBySampleNameResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -78504,7 +78756,7 @@ soap_in_ns1__searchSamplesBySampleNameResponse(
         sizeof(ns1__searchSamplesBySampleNameResponse), 0,
         soap_copy_ns1__searchSamplesBySampleNameResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -78512,7 +78764,7 @@ soap_in_ns1__searchSamplesBySampleNameResponse(
 int ns1__searchSamplesBySampleNameResponse::soap_put(struct soap *soap,
                                                      const char *tag,
                                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchSamplesBySampleNameResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchSamplesBySampleNameResponse",
                      id, type))
@@ -78532,7 +78784,7 @@ soap_get_ns1__searchSamplesBySampleNameResponse(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchSamplesBySampleNameResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -78548,10 +78800,10 @@ soap_instantiate_ns1__searchSamplesBySampleNameResponse(struct soap *soap,
                               "searchSamplesBySampleNameResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchSamplesBySampleNameResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchSamplesBySampleNameResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSamplesBySampleNameResponse);
     if (size)
@@ -78591,8 +78843,8 @@ soap_copy_ns1__searchSamplesBySampleNameResponse(struct soap *soap, int st,
 void ns1__searchSamplesBySampleName::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchSamplesBySampleName::sessionId = NULL;
-  this->ns1__searchSamplesBySampleName::sampleName = NULL;
+  this->ns1__searchSamplesBySampleName::sessionId = nullptr;
+  this->ns1__searchSamplesBySampleName::sampleName = nullptr;
 }
 
 void ns1__searchSamplesBySampleName::soap_serialize(struct soap *soap) const {
@@ -78645,13 +78897,13 @@ soap_in_ns1__searchSamplesBySampleName(struct soap *soap, const char *tag,
                                        ns1__searchSamplesBySampleName *a,
                                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchSamplesBySampleName *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchSamplesBySampleName,
       sizeof(ns1__searchSamplesBySampleName), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__searchSamplesBySampleName) {
@@ -78696,10 +78948,10 @@ soap_in_ns1__searchSamplesBySampleName(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchSamplesBySampleName *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -78707,14 +78959,14 @@ soap_in_ns1__searchSamplesBySampleName(struct soap *soap, const char *tag,
         sizeof(ns1__searchSamplesBySampleName), 0,
         soap_copy_ns1__searchSamplesBySampleName);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchSamplesBySampleName::soap_put(struct soap *soap, const char *tag,
                                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchSamplesBySampleName);
   if (this->soap_out(soap, tag ? tag : "ns1:searchSamplesBySampleName", id,
                      type))
@@ -78734,7 +78986,7 @@ soap_get_ns1__searchSamplesBySampleName(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchSamplesBySampleName(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -78751,10 +79003,10 @@ soap_instantiate_ns1__searchSamplesBySampleName(struct soap *soap, int n,
              "soap_instantiate_ns1__searchSamplesBySampleName(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__searchSamplesBySampleName, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__searchSamplesBySampleName,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchSamplesBySampleName);
     if (size)
@@ -78803,7 +79055,7 @@ void ns1__icatRole::soap_default(struct soap *soap) {
   soap_default_bool(soap, &this->ns1__icatRole::actionRootRemove);
   soap_default_bool(soap, &this->ns1__icatRole::actionSelect);
   soap_default_bool(soap, &this->ns1__icatRole::actionUpdate);
-  this->ns1__icatRole::role = NULL;
+  this->ns1__icatRole::role = nullptr;
 }
 
 void ns1__icatRole::soap_serialize(struct soap *soap) const {
@@ -78886,13 +79138,13 @@ SOAP_FMAC3 ns1__icatRole *SOAP_FMAC4
 soap_in_ns1__icatRole(struct soap *soap, const char *tag, ns1__icatRole *a,
                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__icatRole *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__icatRole, sizeof(ns1__icatRole),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__icatRole) {
@@ -79031,16 +79283,16 @@ soap_in_ns1__icatRole(struct soap *soap, const char *tag, ns1__icatRole *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__icatRole *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__icatRole, 0,
         sizeof(ns1__icatRole), 0, soap_copy_ns1__icatRole);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0 ||
@@ -79050,14 +79302,14 @@ soap_in_ns1__icatRole(struct soap *soap, const char *tag, ns1__icatRole *a,
        soap_flag_actionRootInsert1 > 0 || soap_flag_actionRootRemove1 > 0 ||
        soap_flag_actionSelect1 > 0 || soap_flag_actionUpdate1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__icatRole::soap_put(struct soap *soap, const char *tag,
                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__icatRole);
   if (this->soap_out(soap, tag ? tag : "ns1:icatRole", id, type))
     return soap->error;
@@ -79074,7 +79326,7 @@ soap_get_ns1__icatRole(struct soap *soap, ns1__icatRole *p, const char *tag,
                        const char *type) {
   if ((p = soap_in_ns1__icatRole(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -79087,9 +79339,9 @@ soap_instantiate_ns1__icatRole(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__icatRole(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__icatRole, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__icatRole, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__icatRole);
     if (size)
@@ -79125,9 +79377,9 @@ void ns1__entityBaseBean::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
   soap_default_bool(soap, &this->ns1__entityBaseBean::facilityAcquiredData);
-  this->ns1__entityBaseBean::icatRole = NULL;
+  this->ns1__entityBaseBean::icatRole = nullptr;
   soap_default_bool(soap, &this->ns1__entityBaseBean::selected);
-  this->ns1__entityBaseBean::uniqueId = NULL;
+  this->ns1__entityBaseBean::uniqueId = nullptr;
 }
 
 void ns1__entityBaseBean::soap_serialize(struct soap *soap) const {
@@ -79179,13 +79431,13 @@ SOAP_FMAC3 ns1__entityBaseBean *SOAP_FMAC4
 soap_in_ns1__entityBaseBean(struct soap *soap, const char *tag,
                             ns1__entityBaseBean *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__entityBaseBean *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__entityBaseBean,
       sizeof(ns1__entityBaseBean), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__entityBaseBean) {
@@ -79242,28 +79494,28 @@ soap_in_ns1__entityBaseBean(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__entityBaseBean *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__entityBaseBean, 0,
         sizeof(ns1__entityBaseBean), 0, soap_copy_ns1__entityBaseBean);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData1 > 0 || soap_flag_selected1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__entityBaseBean::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__entityBaseBean);
   if (this->soap_out(soap, tag ? tag : "ns1:entityBaseBean", id, type))
     return soap->error;
@@ -79280,7 +79532,7 @@ soap_get_ns1__entityBaseBean(struct soap *soap, ns1__entityBaseBean *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__entityBaseBean(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -79293,9 +79545,9 @@ soap_instantiate_ns1__entityBaseBean(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__entityBaseBean(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__entityBaseBean, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__entityBaseBean, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (type && !soap_match_tag(soap, type, "ns1:facilityUser")) {
     cp->type = SOAP_TYPE_ICat3_ns1__facilityUser;
     if (n < 0) {
@@ -79712,13 +79964,13 @@ void ns1__facilityUser::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__facilityUser::facilityUserId = NULL;
-  this->ns1__facilityUser::federalId = NULL;
-  this->ns1__facilityUser::firstName = NULL;
-  this->ns1__facilityUser::initials = NULL;
-  this->ns1__facilityUser::lastName = NULL;
-  this->ns1__facilityUser::middleName = NULL;
-  this->ns1__facilityUser::title = NULL;
+  this->ns1__facilityUser::facilityUserId = nullptr;
+  this->ns1__facilityUser::federalId = nullptr;
+  this->ns1__facilityUser::firstName = nullptr;
+  this->ns1__facilityUser::initials = nullptr;
+  this->ns1__facilityUser::lastName = nullptr;
+  this->ns1__facilityUser::middleName = nullptr;
+  this->ns1__facilityUser::title = nullptr;
 }
 
 void ns1__facilityUser::soap_serialize(struct soap *soap) const {
@@ -79800,13 +80052,13 @@ SOAP_FMAC3 ns1__facilityUser *SOAP_FMAC4
 soap_in_ns1__facilityUser(struct soap *soap, const char *tag,
                           ns1__facilityUser *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__facilityUser *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__facilityUser,
       sizeof(ns1__facilityUser), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__facilityUser) {
@@ -79925,28 +80177,28 @@ soap_in_ns1__facilityUser(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__facilityUser *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__facilityUser, 0,
         sizeof(ns1__facilityUser), 0, soap_copy_ns1__facilityUser);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_facilityAcquiredData2 > 0 || soap_flag_selected2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__facilityUser::soap_put(struct soap *soap, const char *tag,
                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__facilityUser);
   if (this->soap_out(soap, tag ? tag : "ns1:facilityUser", id, type))
     return soap->error;
@@ -79963,7 +80215,7 @@ soap_get_ns1__facilityUser(struct soap *soap, ns1__facilityUser *p,
                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__facilityUser(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -79976,9 +80228,9 @@ soap_instantiate_ns1__facilityUser(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__facilityUser(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__facilityUser, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__facilityUser, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__facilityUser);
     if (size)
@@ -80065,15 +80317,15 @@ soap_in_ns1__searchFacilityUserByRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchFacilityUserByRestrictionResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchFacilityUserByRestrictionResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchFacilityUserByRestrictionResponse,
       sizeof(ns1__searchFacilityUserByRestrictionResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -80106,10 +80358,10 @@ soap_in_ns1__searchFacilityUserByRestrictionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchFacilityUserByRestrictionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -80117,7 +80369,7 @@ soap_in_ns1__searchFacilityUserByRestrictionResponse(
         sizeof(ns1__searchFacilityUserByRestrictionResponse), 0,
         soap_copy_ns1__searchFacilityUserByRestrictionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -80125,7 +80377,7 @@ soap_in_ns1__searchFacilityUserByRestrictionResponse(
 int ns1__searchFacilityUserByRestrictionResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag,
+      soap_embed(soap, (void *)this, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_ns1__searchFacilityUserByRestrictionResponse);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchFacilityUserByRestrictionResponse",
@@ -80148,7 +80400,7 @@ soap_get_ns1__searchFacilityUserByRestrictionResponse(
   if ((p = soap_in_ns1__searchFacilityUserByRestrictionResponse(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -80162,11 +80414,12 @@ soap_instantiate_ns1__searchFacilityUserByRestrictionResponse(
                                     "searchFacilityUserByRestrictionResponse(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchFacilityUserByRestrictionResponse,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_ns1__searchFacilityUserByRestrictionResponse, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchFacilityUserByRestrictionResponse);
     if (size)
@@ -80211,8 +80464,8 @@ soap_copy_ns1__searchFacilityUserByRestrictionResponse(struct soap *soap,
 void ns1__searchFacilityUserByRestriction::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchFacilityUserByRestriction::sessionId = NULL;
-  this->ns1__searchFacilityUserByRestriction::restriction = NULL;
+  this->ns1__searchFacilityUserByRestriction::sessionId = nullptr;
+  this->ns1__searchFacilityUserByRestriction::restriction = nullptr;
 }
 
 void ns1__searchFacilityUserByRestriction::soap_serialize(
@@ -80266,14 +80519,14 @@ soap_in_ns1__searchFacilityUserByRestriction(
     struct soap *soap, const char *tag, ns1__searchFacilityUserByRestriction *a,
     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchFacilityUserByRestriction *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchFacilityUserByRestriction,
       sizeof(ns1__searchFacilityUserByRestriction), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -80319,10 +80572,10 @@ soap_in_ns1__searchFacilityUserByRestriction(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchFacilityUserByRestriction *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -80330,7 +80583,7 @@ soap_in_ns1__searchFacilityUserByRestriction(
         sizeof(ns1__searchFacilityUserByRestriction), 0,
         soap_copy_ns1__searchFacilityUserByRestriction);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -80338,7 +80591,7 @@ soap_in_ns1__searchFacilityUserByRestriction(
 int ns1__searchFacilityUserByRestriction::soap_put(struct soap *soap,
                                                    const char *tag,
                                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchFacilityUserByRestriction);
   if (this->soap_out(soap, tag ? tag : "ns1:searchFacilityUserByRestriction",
                      id, type))
@@ -80358,7 +80611,7 @@ soap_get_ns1__searchFacilityUserByRestriction(
     const char *type) {
   if ((p = soap_in_ns1__searchFacilityUserByRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -80376,10 +80629,10 @@ soap_instantiate_ns1__searchFacilityUserByRestriction(struct soap *soap, int n,
           "soap_instantiate_ns1__searchFacilityUserByRestriction(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchFacilityUserByRestriction, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchFacilityUserByRestriction, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchFacilityUserByRestriction);
     if (size)
@@ -80465,13 +80718,13 @@ soap_in_ns1__listDatasetTypesResponse(struct soap *soap, const char *tag,
                                       ns1__listDatasetTypesResponse *a,
                                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listDatasetTypesResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listDatasetTypesResponse,
       sizeof(ns1__listDatasetTypesResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listDatasetTypesResponse) {
@@ -80501,10 +80754,10 @@ soap_in_ns1__listDatasetTypesResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listDatasetTypesResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -80512,14 +80765,14 @@ soap_in_ns1__listDatasetTypesResponse(struct soap *soap, const char *tag,
         sizeof(ns1__listDatasetTypesResponse), 0,
         soap_copy_ns1__listDatasetTypesResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__listDatasetTypesResponse::soap_put(struct soap *soap, const char *tag,
                                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listDatasetTypesResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:listDatasetTypesResponse", id,
                      type))
@@ -80539,7 +80792,7 @@ soap_get_ns1__listDatasetTypesResponse(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_ns1__listDatasetTypesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -80556,10 +80809,10 @@ soap_instantiate_ns1__listDatasetTypesResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__listDatasetTypesResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__listDatasetTypesResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__listDatasetTypesResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listDatasetTypesResponse);
     if (size)
@@ -80597,7 +80850,7 @@ soap_copy_ns1__listDatasetTypesResponse(struct soap *soap, int st, int tt,
 void ns1__listDatasetTypes::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__listDatasetTypes::sessionId = NULL;
+  this->ns1__listDatasetTypes::sessionId = nullptr;
 }
 
 void ns1__listDatasetTypes::soap_serialize(struct soap *soap) const {
@@ -80639,13 +80892,13 @@ SOAP_FMAC3 ns1__listDatasetTypes *SOAP_FMAC4
 soap_in_ns1__listDatasetTypes(struct soap *soap, const char *tag,
                               ns1__listDatasetTypes *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__listDatasetTypes *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__listDatasetTypes,
       sizeof(ns1__listDatasetTypes), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__listDatasetTypes) {
@@ -80679,23 +80932,23 @@ soap_in_ns1__listDatasetTypes(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__listDatasetTypes *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__listDatasetTypes,
         0, sizeof(ns1__listDatasetTypes), 0, soap_copy_ns1__listDatasetTypes);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__listDatasetTypes::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__listDatasetTypes);
   if (this->soap_out(soap, tag ? tag : "ns1:listDatasetTypes", id, type))
     return soap->error;
@@ -80712,7 +80965,7 @@ soap_get_ns1__listDatasetTypes(struct soap *soap, ns1__listDatasetTypes *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns1__listDatasetTypes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -80727,9 +80980,9 @@ soap_instantiate_ns1__listDatasetTypes(struct soap *soap, int n,
                       "soap_instantiate_ns1__listDatasetTypes(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__listDatasetTypes, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__listDatasetTypes, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__listDatasetTypes);
     if (size)
@@ -80817,15 +81070,15 @@ soap_in_ns1__searchDatasetByParameterRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterRestrictionResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByParameterRestrictionResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterRestrictionResponse,
       sizeof(ns1__searchDatasetByParameterRestrictionResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -80858,10 +81111,10 @@ soap_in_ns1__searchDatasetByParameterRestrictionResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByParameterRestrictionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -80869,7 +81122,7 @@ soap_in_ns1__searchDatasetByParameterRestrictionResponse(
         sizeof(ns1__searchDatasetByParameterRestrictionResponse), 0,
         soap_copy_ns1__searchDatasetByParameterRestrictionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -80877,7 +81130,7 @@ soap_in_ns1__searchDatasetByParameterRestrictionResponse(
 int ns1__searchDatasetByParameterRestrictionResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterRestrictionResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchDatasetByParameterRestrictionResponse",
@@ -80899,7 +81152,7 @@ soap_get_ns1__searchDatasetByParameterRestrictionResponse(
   if ((p = soap_in_ns1__searchDatasetByParameterRestrictionResponse(soap, tag,
                                                                     p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -80914,11 +81167,11 @@ soap_instantiate_ns1__searchDatasetByParameterRestrictionResponse(
                                     "e(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterRestrictionResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(ns1__searchDatasetByParameterRestrictionResponse);
@@ -81007,13 +81260,13 @@ SOAP_FMAC3 ns1__parameterCondition *SOAP_FMAC4
 soap_in_ns1__parameterCondition(struct soap *soap, const char *tag,
                                 ns1__parameterCondition *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__parameterCondition *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__parameterCondition,
       sizeof(ns1__parameterCondition), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__parameterCondition) {
@@ -81052,29 +81305,29 @@ soap_in_ns1__parameterCondition(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__parameterCondition *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__parameterCondition,
         0, sizeof(ns1__parameterCondition), 0,
         soap_copy_ns1__parameterCondition);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_negate2 > 0 || soap_flag_sensitive2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__parameterCondition::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__parameterCondition);
   if (this->soap_out(soap, tag ? tag : "ns1:parameterCondition", id, type))
     return soap->error;
@@ -81091,7 +81344,7 @@ soap_get_ns1__parameterCondition(struct soap *soap, ns1__parameterCondition *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__parameterCondition(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -81106,9 +81359,9 @@ soap_instantiate_ns1__parameterCondition(struct soap *soap, int n,
                       "soap_instantiate_ns1__parameterCondition(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__parameterCondition, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__parameterCondition, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (type && !soap_match_tag(soap, type, "ns1:parameterLogicalCondition")) {
     cp->type = SOAP_TYPE_ICat3_ns1__parameterLogicalCondition;
     if (n < 0) {
@@ -81204,9 +81457,9 @@ soap_copy_ns1__parameterCondition(struct soap *soap, int st, int tt, void *p,
 void ns1__searchDatasetByParameterRestriction::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatasetByParameterRestriction::sessionId = NULL;
-  this->ns1__searchDatasetByParameterRestriction::parameterCondition = NULL;
-  this->ns1__searchDatasetByParameterRestriction::restrictions = NULL;
+  this->ns1__searchDatasetByParameterRestriction::sessionId = nullptr;
+  this->ns1__searchDatasetByParameterRestriction::parameterCondition = nullptr;
+  this->ns1__searchDatasetByParameterRestriction::restrictions = nullptr;
 }
 
 void ns1__searchDatasetByParameterRestriction::soap_serialize(
@@ -81270,15 +81523,15 @@ soap_in_ns1__searchDatasetByParameterRestriction(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterRestriction *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByParameterRestriction *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterRestriction,
       sizeof(ns1__searchDatasetByParameterRestriction), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -81334,10 +81587,10 @@ soap_in_ns1__searchDatasetByParameterRestriction(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByParameterRestriction *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -81345,7 +81598,7 @@ soap_in_ns1__searchDatasetByParameterRestriction(
         sizeof(ns1__searchDatasetByParameterRestriction), 0,
         soap_copy_ns1__searchDatasetByParameterRestriction);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -81353,7 +81606,7 @@ soap_in_ns1__searchDatasetByParameterRestriction(
 int ns1__searchDatasetByParameterRestriction::soap_put(struct soap *soap,
                                                        const char *tag,
                                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterRestriction);
   if (this->soap_out(soap,
                      tag ? tag : "ns1:searchDatasetByParameterRestriction", id,
@@ -81376,7 +81629,7 @@ soap_get_ns1__searchDatasetByParameterRestriction(
   if ((p = soap_in_ns1__searchDatasetByParameterRestriction(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -81393,10 +81646,10 @@ soap_instantiate_ns1__searchDatasetByParameterRestriction(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatasetByParameterRestriction, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatasetByParameterRestriction,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetByParameterRestriction);
     if (size)
@@ -81489,15 +81742,15 @@ soap_in_ns1__searchDatasetByRestrictionLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByRestrictionLogicalResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByRestrictionLogicalResponse *)soap_class_id_enter(
       soap, soap->id, a,
       SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionLogicalResponse,
       sizeof(ns1__searchDatasetByRestrictionLogicalResponse), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -81530,10 +81783,10 @@ soap_in_ns1__searchDatasetByRestrictionLogicalResponse(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByRestrictionLogicalResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -81541,7 +81794,7 @@ soap_in_ns1__searchDatasetByRestrictionLogicalResponse(
         sizeof(ns1__searchDatasetByRestrictionLogicalResponse), 0,
         soap_copy_ns1__searchDatasetByRestrictionLogicalResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -81549,7 +81802,7 @@ soap_in_ns1__searchDatasetByRestrictionLogicalResponse(
 int ns1__searchDatasetByRestrictionLogicalResponse::soap_put(
     struct soap *soap, const char *tag, const char *type) const {
   int id = soap_embed(
-      soap, (void *)this, NULL, 0, tag,
+      soap, (void *)this, nullptr, 0, tag,
       SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionLogicalResponse);
   if (this->soap_out(
           soap, tag ? tag : "ns1:searchDatasetByRestrictionLogicalResponse", id,
@@ -81571,7 +81824,7 @@ soap_get_ns1__searchDatasetByRestrictionLogicalResponse(
   if ((p = soap_in_ns1__searchDatasetByRestrictionLogicalResponse(soap, tag, p,
                                                                   type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -81586,11 +81839,11 @@ soap_instantiate_ns1__searchDatasetByRestrictionLogicalResponse(
                                     "%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionLogicalResponse,
                 n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetByRestrictionLogicalResponse);
     if (size)
@@ -81677,13 +81930,13 @@ SOAP_FMAC3 ns1__condition *SOAP_FMAC4
 soap_in_ns1__condition(struct soap *soap, const char *tag, ns1__condition *a,
                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__condition *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__condition, sizeof(ns1__condition),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__condition) {
@@ -81722,28 +81975,28 @@ soap_in_ns1__condition(struct soap *soap, const char *tag, ns1__condition *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__condition *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat3_ns1__condition, 0,
         sizeof(ns1__condition), 0, soap_copy_ns1__condition);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_negate1 > 0 || soap_flag_sensitive1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__condition::soap_put(struct soap *soap, const char *tag,
                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__condition);
   if (this->soap_out(soap, tag ? tag : "ns1:condition", id, type))
     return soap->error;
@@ -81760,7 +82013,7 @@ soap_get_ns1__condition(struct soap *soap, ns1__condition *p, const char *tag,
                         const char *type) {
   if ((p = soap_in_ns1__condition(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -81772,10 +82025,10 @@ soap_instantiate_ns1__condition(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__condition(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__condition, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__condition, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (type && !soap_match_tag(soap, type, "ns1:restrictionCondition")) {
     cp->type = SOAP_TYPE_ICat3_ns1__restrictionCondition;
     if (n < 0) {
@@ -81952,15 +82205,15 @@ void ns1__restrictionCondition::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__condition::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__restrictionCondition::datafileInclude = NULL;
-  this->ns1__restrictionCondition::datasetInclude = NULL;
-  this->ns1__restrictionCondition::firstResult = NULL;
-  this->ns1__restrictionCondition::investigationInclude = NULL;
+  this->ns1__restrictionCondition::datafileInclude = nullptr;
+  this->ns1__restrictionCondition::datasetInclude = nullptr;
+  this->ns1__restrictionCondition::firstResult = nullptr;
+  this->ns1__restrictionCondition::investigationInclude = nullptr;
   soap_default_int(soap, &this->ns1__restrictionCondition::maxResults);
   soap_default_bool(soap, &this->ns1__restrictionCondition::orderByAsc);
-  this->ns1__restrictionCondition::orderByAttribute = NULL;
+  this->ns1__restrictionCondition::orderByAttribute = nullptr;
   soap_default_bool(soap, &this->ns1__restrictionCondition::returnLongId);
-  this->ns1__restrictionCondition::sampleInclude = NULL;
+  this->ns1__restrictionCondition::sampleInclude = nullptr;
 }
 
 void ns1__restrictionCondition::soap_serialize(struct soap *soap) const {
@@ -82050,13 +82303,13 @@ soap_in_ns1__restrictionCondition(struct soap *soap, const char *tag,
                                   ns1__restrictionCondition *a,
                                   const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__restrictionCondition *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__restrictionCondition,
       sizeof(ns1__restrictionCondition), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__restrictionCondition) {
@@ -82172,10 +82425,10 @@ soap_in_ns1__restrictionCondition(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__restrictionCondition *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -82183,21 +82436,21 @@ soap_in_ns1__restrictionCondition(struct soap *soap, const char *tag,
         sizeof(ns1__restrictionCondition), 0,
         soap_copy_ns1__restrictionCondition);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_negate2 > 0 || soap_flag_sensitive2 > 0 ||
        soap_flag_maxResults1 > 0 || soap_flag_orderByAsc1 > 0 ||
        soap_flag_returnLongId1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__restrictionCondition::soap_put(struct soap *soap, const char *tag,
                                         const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__restrictionCondition);
   if (this->soap_out(soap, tag ? tag : "ns1:restrictionCondition", id, type))
     return soap->error;
@@ -82215,7 +82468,7 @@ soap_get_ns1__restrictionCondition(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in_ns1__restrictionCondition(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -82230,10 +82483,11 @@ soap_instantiate_ns1__restrictionCondition(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate_ns1__restrictionCondition(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__restrictionCondition, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__restrictionCondition, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (type && !soap_match_tag(soap, type, "ns1:restrictionLogicalCondition")) {
     cp->type = SOAP_TYPE_ICat3_ns1__restrictionLogicalCondition;
     if (n < 0) {
@@ -82313,7 +82567,7 @@ void ns1__restrictionLogicalCondition::soap_default(struct soap *soap) {
   this->ns1__restrictionCondition::soap_default(soap);
   this->ns1__condition::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__restrictionLogicalCondition::operator_ = NULL;
+  this->ns1__restrictionLogicalCondition::operator_ = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__restrictionCondition(
       soap, &this->ns1__restrictionLogicalCondition::restConditions);
 }
@@ -82405,13 +82659,13 @@ soap_in_ns1__restrictionLogicalCondition(struct soap *soap, const char *tag,
                                          ns1__restrictionLogicalCondition *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__restrictionLogicalCondition *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__restrictionLogicalCondition,
       sizeof(ns1__restrictionLogicalCondition), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat3_ns1__restrictionLogicalCondition) {
@@ -82542,10 +82796,10 @@ soap_in_ns1__restrictionLogicalCondition(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__restrictionLogicalCondition *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -82553,14 +82807,14 @@ soap_in_ns1__restrictionLogicalCondition(struct soap *soap, const char *tag,
         sizeof(ns1__restrictionLogicalCondition), 0,
         soap_copy_ns1__restrictionLogicalCondition);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_negate3 > 0 || soap_flag_sensitive3 > 0 ||
        soap_flag_maxResults2 > 0 || soap_flag_orderByAsc2 > 0 ||
        soap_flag_returnLongId2 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
@@ -82568,7 +82822,7 @@ soap_in_ns1__restrictionLogicalCondition(struct soap *soap, const char *tag,
 int ns1__restrictionLogicalCondition::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__restrictionLogicalCondition);
   if (this->soap_out(soap, tag ? tag : "ns1:restrictionLogicalCondition", id,
                      type))
@@ -82588,7 +82842,7 @@ soap_get_ns1__restrictionLogicalCondition(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__restrictionLogicalCondition(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -82605,10 +82859,10 @@ soap_instantiate_ns1__restrictionLogicalCondition(struct soap *soap, int n,
              "soap_instantiate_ns1__restrictionLogicalCondition(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_ns1__restrictionLogicalCondition, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_ns1__restrictionLogicalCondition,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__restrictionLogicalCondition);
     if (size)
@@ -82648,8 +82902,8 @@ soap_copy_ns1__restrictionLogicalCondition(struct soap *soap, int st, int tt,
 void ns1__searchDatasetByRestrictionLogical::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchDatasetByRestrictionLogical::sessionId = NULL;
-  this->ns1__searchDatasetByRestrictionLogical::restriction = NULL;
+  this->ns1__searchDatasetByRestrictionLogical::sessionId = nullptr;
+  this->ns1__searchDatasetByRestrictionLogical::restriction = nullptr;
 }
 
 void ns1__searchDatasetByRestrictionLogical::soap_serialize(
@@ -82704,14 +82958,14 @@ soap_in_ns1__searchDatasetByRestrictionLogical(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByRestrictionLogical *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchDatasetByRestrictionLogical *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionLogical,
       sizeof(ns1__searchDatasetByRestrictionLogical), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type !=
@@ -82757,10 +83011,10 @@ soap_in_ns1__searchDatasetByRestrictionLogical(
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchDatasetByRestrictionLogical *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -82768,7 +83022,7 @@ soap_in_ns1__searchDatasetByRestrictionLogical(
         sizeof(ns1__searchDatasetByRestrictionLogical), 0,
         soap_copy_ns1__searchDatasetByRestrictionLogical);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -82776,7 +83030,7 @@ soap_in_ns1__searchDatasetByRestrictionLogical(
 int ns1__searchDatasetByRestrictionLogical::soap_put(struct soap *soap,
                                                      const char *tag,
                                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionLogical);
   if (this->soap_out(soap, tag ? tag : "ns1:searchDatasetByRestrictionLogical",
                      id, type))
@@ -82796,7 +83050,7 @@ soap_get_ns1__searchDatasetByRestrictionLogical(
     const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchDatasetByRestrictionLogical(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -82812,10 +83066,10 @@ soap_instantiate_ns1__searchDatasetByRestrictionLogical(struct soap *soap,
                               "searchDatasetByRestrictionLogical(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionLogical, n,
+      soap, nullptr, SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionLogical, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchDatasetByRestrictionLogical);
     if (size)
@@ -82880,8 +83134,8 @@ SOAP_FMAC3 std::string *SOAP_FMAC4
 soap_in_std__string(struct soap *soap, const char *tag, std::string *s,
                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!s)
     s = soap_new_std__string(soap, -1);
   if (soap->null)
@@ -82894,7 +83148,7 @@ soap_in_std__string(struct soap *soap, const char *tag, std::string *s,
         soap->type, soap->arrayType);
     if (s) {
       if (!(t = soap_string_in(soap, 1, 0, -1)))
-        return NULL;
+        return nullptr;
       s->assign(t);
     }
   } else
@@ -82905,7 +83159,7 @@ soap_in_std__string(struct soap *soap, const char *tag, std::string *s,
         0, SOAP_TYPE_ICat3_std__string, 0, sizeof(std::string), 0,
         soap_copy_std__string);
   if (soap->body && soap_element_end_in(soap, tag))
-    return NULL;
+    return nullptr;
   return s;
 }
 
@@ -82913,7 +83167,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_std__string(struct soap *soap, const std::string *a, const char *tag,
                      const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat3_std__string);
+      soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat3_std__string);
   if (soap_out_std__string(soap, tag ? tag : "string", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -82924,7 +83178,7 @@ soap_get_std__string(struct soap *soap, std::string *p, const char *tag,
                      const char *type) {
   if ((p = soap_in_std__string(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -82937,9 +83191,9 @@ soap_instantiate_std__string(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_std__string(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_std__string, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_std__string, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::string);
     if (size)
@@ -83003,13 +83257,13 @@ SOAP_FMAC3 xsd__string *SOAP_FMAC4
 soap_in_xsd__string(struct soap *soap, const char *tag, xsd__string *a,
                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__string *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_xsd__string, sizeof(xsd__string),
             soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -83019,14 +83273,14 @@ soap_in_xsd__string(struct soap *soap, const char *tag, xsd__string *a,
       return (xsd__string *)a->soap_in(soap, tag, type);
   }
   if (!soap_in_std__string(soap, tag, &(a->xsd__string::__item), "xsd:string"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__string::soap_put(struct soap *soap, const char *tag,
                           const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat3_xsd__string);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat3_xsd__string);
   if (this->soap_out(soap, tag ? tag : "xsd:string", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -83042,7 +83296,7 @@ soap_get_xsd__string(struct soap *soap, xsd__string *p, const char *tag,
                      const char *type) {
   if ((p = soap_in_xsd__string(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -83055,9 +83309,9 @@ soap_instantiate_xsd__string(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__string(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_xsd__string, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_xsd__string, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(xsd__string);
     if (size)
@@ -83122,13 +83376,13 @@ SOAP_FMAC3 xsd__long *SOAP_FMAC4
 soap_in_xsd__long(struct soap *soap, const char *tag, xsd__long *a,
                   const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__long *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_xsd__long, sizeof(xsd__long),
             soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -83138,14 +83392,14 @@ soap_in_xsd__long(struct soap *soap, const char *tag, xsd__long *a,
       return (xsd__long *)a->soap_in(soap, tag, type);
   }
   if (!soap_in_LONG64(soap, tag, &(a->xsd__long::__item), "xsd:long"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__long::soap_put(struct soap *soap, const char *tag,
                         const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat3_xsd__long);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat3_xsd__long);
   if (this->soap_out(soap, tag ? tag : "xsd:long", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -83161,7 +83415,7 @@ soap_get_xsd__long(struct soap *soap, xsd__long *p, const char *tag,
                    const char *type) {
   if ((p = soap_in_xsd__long(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -83173,9 +83427,9 @@ soap_instantiate_xsd__long(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__long(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_xsd__long, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_xsd__long, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(xsd__long);
     if (size)
@@ -83240,13 +83494,13 @@ SOAP_FMAC3 xsd__int *SOAP_FMAC4 soap_in_xsd__int(struct soap *soap,
                                                  const char *tag, xsd__int *a,
                                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__int *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_xsd__int, sizeof(xsd__int),
             soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -83256,14 +83510,14 @@ SOAP_FMAC3 xsd__int *SOAP_FMAC4 soap_in_xsd__int(struct soap *soap,
       return (xsd__int *)a->soap_in(soap, tag, type);
   }
   if (!soap_in_int(soap, tag, &(a->xsd__int::__item), "xsd:int"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__int::soap_put(struct soap *soap, const char *tag,
                        const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat3_xsd__int);
+      soap_embed(soap, (void *)this, nullptr, 0, tag, SOAP_TYPE_ICat3_xsd__int);
   if (this->soap_out(soap, tag ? tag : "xsd:int", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -83278,7 +83532,7 @@ SOAP_FMAC3 xsd__int *SOAP_FMAC4 soap_get_xsd__int(struct soap *soap,
                                                   const char *type) {
   if ((p = soap_in_xsd__int(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -83290,9 +83544,9 @@ soap_instantiate_xsd__int(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__int(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_xsd__int, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_xsd__int, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(xsd__int);
     if (size)
@@ -83357,13 +83611,13 @@ SOAP_FMAC3 xsd__float *SOAP_FMAC4
 soap_in_xsd__float(struct soap *soap, const char *tag, xsd__float *a,
                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__float *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_xsd__float, sizeof(xsd__float),
             soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -83373,14 +83627,14 @@ soap_in_xsd__float(struct soap *soap, const char *tag, xsd__float *a,
       return (xsd__float *)a->soap_in(soap, tag, type);
   }
   if (!soap_in_float(soap, tag, &(a->xsd__float::__item), "xsd:float"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__float::soap_put(struct soap *soap, const char *tag,
                          const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat3_xsd__float);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat3_xsd__float);
   if (this->soap_out(soap, tag ? tag : "xsd:float", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -83396,7 +83650,7 @@ soap_get_xsd__float(struct soap *soap, xsd__float *p, const char *tag,
                     const char *type) {
   if ((p = soap_in_xsd__float(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -83408,9 +83662,9 @@ soap_instantiate_xsd__float(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__float(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_xsd__float, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_xsd__float, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(xsd__float);
     if (size)
@@ -83477,13 +83731,13 @@ SOAP_FMAC3 xsd__double *SOAP_FMAC4
 soap_in_xsd__double(struct soap *soap, const char *tag, xsd__double *a,
                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__double *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_xsd__double, sizeof(xsd__double),
             soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -83493,14 +83747,14 @@ soap_in_xsd__double(struct soap *soap, const char *tag, xsd__double *a,
       return (xsd__double *)a->soap_in(soap, tag, type);
   }
   if (!soap_in_double(soap, tag, &(a->xsd__double::__item), "xsd:double"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__double::soap_put(struct soap *soap, const char *tag,
                           const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat3_xsd__double);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat3_xsd__double);
   if (this->soap_out(soap, tag ? tag : "xsd:double", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -83516,7 +83770,7 @@ soap_get_xsd__double(struct soap *soap, xsd__double *p, const char *tag,
                      const char *type) {
   if ((p = soap_in_xsd__double(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -83529,9 +83783,9 @@ soap_instantiate_xsd__double(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__double(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_xsd__double, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_xsd__double, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(xsd__double);
     if (size)
@@ -83598,13 +83852,13 @@ SOAP_FMAC3 xsd__dateTime *SOAP_FMAC4
 soap_in_xsd__dateTime(struct soap *soap, const char *tag, xsd__dateTime *a,
                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__dateTime *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_xsd__dateTime,
             sizeof(xsd__dateTime), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -83614,13 +83868,13 @@ soap_in_xsd__dateTime(struct soap *soap, const char *tag, xsd__dateTime *a,
       return (xsd__dateTime *)a->soap_in(soap, tag, type);
   }
   if (!soap_in_time(soap, tag, &(a->xsd__dateTime::__item), "xsd:dateTime"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__dateTime::soap_put(struct soap *soap, const char *tag,
                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_xsd__dateTime);
   if (this->soap_out(soap, tag ? tag : "xsd:dateTime", id, type))
     return soap->error;
@@ -83637,7 +83891,7 @@ soap_get_xsd__dateTime(struct soap *soap, xsd__dateTime *p, const char *tag,
                        const char *type) {
   if ((p = soap_in_xsd__dateTime(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -83650,9 +83904,9 @@ soap_instantiate_xsd__dateTime(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__dateTime(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_xsd__dateTime, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_xsd__dateTime, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(xsd__dateTime);
     if (size)
@@ -83718,13 +83972,13 @@ SOAP_FMAC3 xsd__boolean *SOAP_FMAC4
 soap_in_xsd__boolean(struct soap *soap, const char *tag, xsd__boolean *a,
                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__boolean *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_xsd__boolean,
             sizeof(xsd__boolean), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -83734,13 +83988,13 @@ soap_in_xsd__boolean(struct soap *soap, const char *tag, xsd__boolean *a,
       return (xsd__boolean *)a->soap_in(soap, tag, type);
   }
   if (!soap_in_bool(soap, tag, &(a->xsd__boolean::__item), "xsd:boolean"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__boolean::soap_put(struct soap *soap, const char *tag,
                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_xsd__boolean);
   if (this->soap_out(soap, tag ? tag : "xsd:boolean", id, type))
     return soap->error;
@@ -83757,7 +84011,7 @@ soap_get_xsd__boolean(struct soap *soap, xsd__boolean *p, const char *tag,
                       const char *type) {
   if ((p = soap_in_xsd__boolean(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -83770,9 +84024,9 @@ soap_instantiate_xsd__boolean(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__boolean(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_xsd__boolean, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_xsd__boolean, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(xsd__boolean);
     if (size)
@@ -83806,7 +84060,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_xsd__boolean(struct soap *soap, int st,
 
 void xsd__anyType::soap_default(struct soap *soap) {
   this->soap = soap;
-  this->xsd__anyType::__item = NULL;
+  this->xsd__anyType::__item = nullptr;
   /* transient soap skipped */
 }
 
@@ -83825,7 +84079,7 @@ int xsd__anyType::soap_out(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_xsd__anyType(struct soap *soap, const char *tag, int id,
                       const xsd__anyType *a, const char *type) {
-  return soap_outliteral(soap, tag, &(a->xsd__anyType::__item), NULL);
+  return soap_outliteral(soap, tag, &(a->xsd__anyType::__item), nullptr);
 }
 
 void *xsd__anyType::soap_in(struct soap *soap, const char *tag,
@@ -83837,13 +84091,13 @@ SOAP_FMAC3 xsd__anyType *SOAP_FMAC4
 soap_in_xsd__anyType(struct soap *soap, const char *tag, xsd__anyType *a,
                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__anyType *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat3_xsd__anyType,
             sizeof(xsd__anyType), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -83853,13 +84107,13 @@ soap_in_xsd__anyType(struct soap *soap, const char *tag, xsd__anyType *a,
       return (xsd__anyType *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__anyType::soap_put(struct soap *soap, const char *tag,
                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_xsd__anyType);
   if (this->soap_out(soap, tag ? tag : "xsd:anyType", id, type))
     return soap->error;
@@ -83876,7 +84130,7 @@ soap_get_xsd__anyType(struct soap *soap, xsd__anyType *p, const char *tag,
                       const char *type) {
   if ((p = soap_in_xsd__anyType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -83889,9 +84143,9 @@ soap_instantiate_xsd__anyType(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__anyType(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_xsd__anyType, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_xsd__anyType, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (type && !soap_match_tag(soap, type, "xsd:boolean")) {
     cp->type = SOAP_TYPE_ICat3_xsd__boolean;
     if (n < 0) {
@@ -91808,7 +92062,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchFacilityUserByRestriction(
     struct soap *soap, struct __ns1__searchFacilityUserByRestriction *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchFacilityUserByRestriction_ = NULL;
+  a->ns1__searchFacilityUserByRestriction_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -91844,10 +92098,10 @@ soap_in___ns1__searchFacilityUserByRestriction(
   short soap_flag;
   a = (struct __ns1__searchFacilityUserByRestriction *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchFacilityUserByRestriction,
-      sizeof(struct __ns1__searchFacilityUserByRestriction), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchFacilityUserByRestriction), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchFacilityUserByRestriction(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -91868,7 +92122,7 @@ soap_in___ns1__searchFacilityUserByRestriction(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -91890,7 +92144,7 @@ soap_get___ns1__searchFacilityUserByRestriction(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchFacilityUserByRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -91906,10 +92160,10 @@ soap_instantiate___ns1__searchFacilityUserByRestriction(struct soap *soap,
                               "searchFacilityUserByRestriction(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchFacilityUserByRestriction, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchFacilityUserByRestriction, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchFacilityUserByRestriction);
     if (size)
@@ -91948,7 +92202,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchSampleByParameterLogical(
     struct soap *soap, struct __ns1__searchSampleByParameterLogical *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchSampleByParameterLogical_ = NULL;
+  a->ns1__searchSampleByParameterLogical_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchSampleByParameterLogical(
@@ -91983,10 +92237,10 @@ soap_in___ns1__searchSampleByParameterLogical(
   short soap_flag;
   a = (struct __ns1__searchSampleByParameterLogical *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchSampleByParameterLogical,
-      sizeof(struct __ns1__searchSampleByParameterLogical), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchSampleByParameterLogical), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchSampleByParameterLogical(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -92007,7 +92261,7 @@ soap_in___ns1__searchSampleByParameterLogical(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -92028,7 +92282,7 @@ soap_get___ns1__searchSampleByParameterLogical(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchSampleByParameterLogical(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -92044,10 +92298,10 @@ soap_instantiate___ns1__searchSampleByParameterLogical(struct soap *soap, int n,
                               "searchSampleByParameterLogical(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchSampleByParameterLogical, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchSampleByParameterLogical, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchSampleByParameterLogical);
     if (size)
@@ -92086,7 +92340,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchDatasetByParameterLogical(
     struct soap *soap, struct __ns1__searchDatasetByParameterLogical *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatasetByParameterLogical_ = NULL;
+  a->ns1__searchDatasetByParameterLogical_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -92122,10 +92376,10 @@ soap_in___ns1__searchDatasetByParameterLogical(
   short soap_flag;
   a = (struct __ns1__searchDatasetByParameterLogical *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatasetByParameterLogical,
-      sizeof(struct __ns1__searchDatasetByParameterLogical), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchDatasetByParameterLogical), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatasetByParameterLogical(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -92146,7 +92400,7 @@ soap_in___ns1__searchDatasetByParameterLogical(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -92168,7 +92422,7 @@ soap_get___ns1__searchDatasetByParameterLogical(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchDatasetByParameterLogical(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -92184,10 +92438,10 @@ soap_instantiate___ns1__searchDatasetByParameterLogical(struct soap *soap,
                               "searchDatasetByParameterLogical(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatasetByParameterLogical, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchDatasetByParameterLogical, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchDatasetByParameterLogical);
     if (size)
@@ -92226,7 +92480,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchDatafileByParameterLogical(
     struct soap *soap, struct __ns1__searchDatafileByParameterLogical *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatafileByParameterLogical_ = NULL;
+  a->ns1__searchDatafileByParameterLogical_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -92263,10 +92517,10 @@ soap_in___ns1__searchDatafileByParameterLogical(
   short soap_flag;
   a = (struct __ns1__searchDatafileByParameterLogical *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatafileByParameterLogical,
-      sizeof(struct __ns1__searchDatafileByParameterLogical), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchDatafileByParameterLogical), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatafileByParameterLogical(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -92287,7 +92541,7 @@ soap_in___ns1__searchDatafileByParameterLogical(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -92309,7 +92563,7 @@ soap_get___ns1__searchDatafileByParameterLogical(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchDatafileByParameterLogical(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -92326,10 +92580,10 @@ soap_instantiate___ns1__searchDatafileByParameterLogical(struct soap *soap,
                               "searchDatafileByParameterLogical(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatafileByParameterLogical, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchDatafileByParameterLogical, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchDatafileByParameterLogical);
     if (size)
@@ -92370,7 +92624,7 @@ soap_default___ns1__searchInvestigationByParameterLogical(
     struct soap *soap, struct __ns1__searchInvestigationByParameterLogical *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchInvestigationByParameterLogical_ = NULL;
+  a->ns1__searchInvestigationByParameterLogical_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -92408,10 +92662,10 @@ soap_in___ns1__searchInvestigationByParameterLogical(
   short soap_flag;
   a = (struct __ns1__searchInvestigationByParameterLogical *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchInvestigationByParameterLogical,
-      sizeof(struct __ns1__searchInvestigationByParameterLogical), 0, NULL,
-      NULL, NULL);
+      sizeof(struct __ns1__searchInvestigationByParameterLogical), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchInvestigationByParameterLogical(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -92432,7 +92686,7 @@ soap_in___ns1__searchInvestigationByParameterLogical(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -92456,7 +92710,7 @@ soap_get___ns1__searchInvestigationByParameterLogical(
   if ((p = soap_in___ns1__searchInvestigationByParameterLogical(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -92470,11 +92724,12 @@ soap_instantiate___ns1__searchInvestigationByParameterLogical(
                                     "searchInvestigationByParameterLogical(%d, "
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchInvestigationByParameterLogical,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3___ns1__searchInvestigationByParameterLogical, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__searchInvestigationByParameterLogical);
@@ -92517,7 +92772,7 @@ soap_default___ns1__searchDatafileByRestrictionLogical(
     struct soap *soap, struct __ns1__searchDatafileByRestrictionLogical *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatafileByRestrictionLogical_ = NULL;
+  a->ns1__searchDatafileByRestrictionLogical_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -92555,10 +92810,10 @@ soap_in___ns1__searchDatafileByRestrictionLogical(
   short soap_flag;
   a = (struct __ns1__searchDatafileByRestrictionLogical *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatafileByRestrictionLogical,
-      sizeof(struct __ns1__searchDatafileByRestrictionLogical), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchDatafileByRestrictionLogical), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatafileByRestrictionLogical(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -92579,7 +92834,7 @@ soap_in___ns1__searchDatafileByRestrictionLogical(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -92603,7 +92858,7 @@ soap_get___ns1__searchDatafileByRestrictionLogical(
   if ((p = soap_in___ns1__searchDatafileByRestrictionLogical(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -92618,10 +92873,10 @@ soap_instantiate___ns1__searchDatafileByRestrictionLogical(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatafileByRestrictionLogical, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchDatafileByRestrictionLogical,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__searchDatafileByRestrictionLogical);
@@ -92664,7 +92919,7 @@ soap_default___ns1__searchInvestigationByRestrictionLogical(
     struct __ns1__searchInvestigationByRestrictionLogical *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchInvestigationByRestrictionLogical_ = NULL;
+  a->ns1__searchInvestigationByRestrictionLogical_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -92705,10 +92960,10 @@ soap_in___ns1__searchInvestigationByRestrictionLogical(
   a = (struct __ns1__searchInvestigationByRestrictionLogical *)soap_id_enter(
       soap, "", a,
       SOAP_TYPE_ICat3___ns1__searchInvestigationByRestrictionLogical,
-      sizeof(struct __ns1__searchInvestigationByRestrictionLogical), 0, NULL,
-      NULL, NULL);
+      sizeof(struct __ns1__searchInvestigationByRestrictionLogical), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchInvestigationByRestrictionLogical(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -92729,7 +92984,7 @@ soap_in___ns1__searchInvestigationByRestrictionLogical(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -92754,7 +93009,7 @@ soap_get___ns1__searchInvestigationByRestrictionLogical(
   if ((p = soap_in___ns1__searchInvestigationByRestrictionLogical(soap, tag, p,
                                                                   type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -92769,11 +93024,11 @@ soap_instantiate___ns1__searchInvestigationByRestrictionLogical(
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat3___ns1__searchInvestigationByRestrictionLogical,
                 n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__searchInvestigationByRestrictionLogical);
@@ -92816,7 +93071,7 @@ soap_default___ns1__searchDatasetByRestrictionLogical(
     struct soap *soap, struct __ns1__searchDatasetByRestrictionLogical *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatasetByRestrictionLogical_ = NULL;
+  a->ns1__searchDatasetByRestrictionLogical_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -92854,10 +93109,10 @@ soap_in___ns1__searchDatasetByRestrictionLogical(
   short soap_flag;
   a = (struct __ns1__searchDatasetByRestrictionLogical *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatasetByRestrictionLogical,
-      sizeof(struct __ns1__searchDatasetByRestrictionLogical), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchDatasetByRestrictionLogical), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatasetByRestrictionLogical(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -92878,7 +93133,7 @@ soap_in___ns1__searchDatasetByRestrictionLogical(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -92901,7 +93156,7 @@ soap_get___ns1__searchDatasetByRestrictionLogical(
   if ((p = soap_in___ns1__searchDatasetByRestrictionLogical(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -92918,10 +93173,10 @@ soap_instantiate___ns1__searchDatasetByRestrictionLogical(struct soap *soap,
                               "searchDatasetByRestrictionLogical(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatasetByRestrictionLogical, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchDatasetByRestrictionLogical,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchDatasetByRestrictionLogical);
     if (size)
@@ -92961,7 +93216,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchSampleByRestrictionLogical(
     struct soap *soap, struct __ns1__searchSampleByRestrictionLogical *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchSampleByRestrictionLogical_ = NULL;
+  a->ns1__searchSampleByRestrictionLogical_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -92998,10 +93253,10 @@ soap_in___ns1__searchSampleByRestrictionLogical(
   short soap_flag;
   a = (struct __ns1__searchSampleByRestrictionLogical *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchSampleByRestrictionLogical,
-      sizeof(struct __ns1__searchSampleByRestrictionLogical), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchSampleByRestrictionLogical), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchSampleByRestrictionLogical(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -93022,7 +93277,7 @@ soap_in___ns1__searchSampleByRestrictionLogical(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -93044,7 +93299,7 @@ soap_get___ns1__searchSampleByRestrictionLogical(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchSampleByRestrictionLogical(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -93061,10 +93316,10 @@ soap_instantiate___ns1__searchSampleByRestrictionLogical(struct soap *soap,
                               "searchSampleByRestrictionLogical(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchSampleByRestrictionLogical, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchSampleByRestrictionLogical, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchSampleByRestrictionLogical);
     if (size)
@@ -93105,7 +93360,7 @@ soap_default___ns1__searchSampleByRestrictionComparison(
     struct soap *soap, struct __ns1__searchSampleByRestrictionComparison *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchSampleByRestrictionComparison_ = NULL;
+  a->ns1__searchSampleByRestrictionComparison_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -93143,10 +93398,10 @@ soap_in___ns1__searchSampleByRestrictionComparison(
   short soap_flag;
   a = (struct __ns1__searchSampleByRestrictionComparison *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchSampleByRestrictionComparison,
-      sizeof(struct __ns1__searchSampleByRestrictionComparison), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchSampleByRestrictionComparison), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchSampleByRestrictionComparison(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -93167,7 +93422,7 @@ soap_in___ns1__searchSampleByRestrictionComparison(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -93191,7 +93446,7 @@ soap_get___ns1__searchSampleByRestrictionComparison(
   if ((p = soap_in___ns1__searchSampleByRestrictionComparison(soap, tag, p,
                                                               type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -93206,10 +93461,10 @@ soap_instantiate___ns1__searchSampleByRestrictionComparison(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchSampleByRestrictionComparison, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchSampleByRestrictionComparison,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__searchSampleByRestrictionComparison);
@@ -93251,7 +93506,7 @@ soap_default___ns1__searchDatafileByRestrictionComparison(
     struct soap *soap, struct __ns1__searchDatafileByRestrictionComparison *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatafileByRestrictionComparison_ = NULL;
+  a->ns1__searchDatafileByRestrictionComparison_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -93289,10 +93544,10 @@ soap_in___ns1__searchDatafileByRestrictionComparison(
   short soap_flag;
   a = (struct __ns1__searchDatafileByRestrictionComparison *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatafileByRestrictionComparison,
-      sizeof(struct __ns1__searchDatafileByRestrictionComparison), 0, NULL,
-      NULL, NULL);
+      sizeof(struct __ns1__searchDatafileByRestrictionComparison), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatafileByRestrictionComparison(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -93313,7 +93568,7 @@ soap_in___ns1__searchDatafileByRestrictionComparison(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -93337,7 +93592,7 @@ soap_get___ns1__searchDatafileByRestrictionComparison(
   if ((p = soap_in___ns1__searchDatafileByRestrictionComparison(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -93351,11 +93606,12 @@ soap_instantiate___ns1__searchDatafileByRestrictionComparison(
                                     "searchDatafileByRestrictionComparison(%d, "
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatafileByRestrictionComparison,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3___ns1__searchDatafileByRestrictionComparison, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__searchDatafileByRestrictionComparison);
@@ -93398,7 +93654,7 @@ soap_default___ns1__searchDatasetByRestrictionComparison(
     struct soap *soap, struct __ns1__searchDatasetByRestrictionComparison *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatasetByRestrictionComparison_ = NULL;
+  a->ns1__searchDatasetByRestrictionComparison_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -93436,10 +93692,10 @@ soap_in___ns1__searchDatasetByRestrictionComparison(
   short soap_flag;
   a = (struct __ns1__searchDatasetByRestrictionComparison *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatasetByRestrictionComparison,
-      sizeof(struct __ns1__searchDatasetByRestrictionComparison), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchDatasetByRestrictionComparison), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatasetByRestrictionComparison(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -93460,7 +93716,7 @@ soap_in___ns1__searchDatasetByRestrictionComparison(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -93484,7 +93740,7 @@ soap_get___ns1__searchDatasetByRestrictionComparison(
   if ((p = soap_in___ns1__searchDatasetByRestrictionComparison(soap, tag, p,
                                                                type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -93498,11 +93754,12 @@ soap_instantiate___ns1__searchDatasetByRestrictionComparison(
                                     "searchDatasetByRestrictionComparison(%d, "
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatasetByRestrictionComparison,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3___ns1__searchDatasetByRestrictionComparison, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__searchDatasetByRestrictionComparison);
@@ -93545,7 +93802,7 @@ soap_default___ns1__searchInvestigationByRestrictionComparasion(
     struct __ns1__searchInvestigationByRestrictionComparasion *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchInvestigationByRestrictionComparasion_ = NULL;
+  a->ns1__searchInvestigationByRestrictionComparasion_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -93588,9 +93845,9 @@ soap_in___ns1__searchInvestigationByRestrictionComparasion(
           soap, "", a,
           SOAP_TYPE_ICat3___ns1__searchInvestigationByRestrictionComparasion,
           sizeof(struct __ns1__searchInvestigationByRestrictionComparasion), 0,
-          NULL, NULL, NULL);
+          nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchInvestigationByRestrictionComparasion(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -93611,7 +93868,7 @@ soap_in___ns1__searchInvestigationByRestrictionComparasion(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -93637,7 +93894,7 @@ soap_get___ns1__searchInvestigationByRestrictionComparasion(
   if ((p = soap_in___ns1__searchInvestigationByRestrictionComparasion(soap, tag,
                                                                       p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -93652,11 +93909,11 @@ soap_instantiate___ns1__searchInvestigationByRestrictionComparasion(
                                     "n(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3___ns1__searchInvestigationByRestrictionComparasion, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(
         struct __ns1__searchInvestigationByRestrictionComparasion);
@@ -93697,7 +93954,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchSampleByRestriction(
     struct soap *soap, struct __ns1__searchSampleByRestriction *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchSampleByRestriction_ = NULL;
+  a->ns1__searchSampleByRestriction_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchSampleByRestriction(
@@ -93732,9 +93989,10 @@ soap_in___ns1__searchSampleByRestriction(
   short soap_flag;
   a = (struct __ns1__searchSampleByRestriction *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchSampleByRestriction,
-      sizeof(struct __ns1__searchSampleByRestriction), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchSampleByRestriction), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchSampleByRestriction(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -93755,7 +94013,7 @@ soap_in___ns1__searchSampleByRestriction(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -93776,7 +94034,7 @@ soap_get___ns1__searchSampleByRestriction(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchSampleByRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -93793,10 +94051,10 @@ soap_instantiate___ns1__searchSampleByRestriction(struct soap *soap, int n,
              "soap_instantiate___ns1__searchSampleByRestriction(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__searchSampleByRestriction, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__searchSampleByRestriction,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchSampleByRestriction);
     if (size)
@@ -93834,7 +94092,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchDatafileByRestriction(
     struct soap *soap, struct __ns1__searchDatafileByRestriction *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatafileByRestriction_ = NULL;
+  a->ns1__searchDatafileByRestriction_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchDatafileByRestriction(
@@ -93869,9 +94127,10 @@ soap_in___ns1__searchDatafileByRestriction(
   short soap_flag;
   a = (struct __ns1__searchDatafileByRestriction *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatafileByRestriction,
-      sizeof(struct __ns1__searchDatafileByRestriction), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchDatafileByRestriction), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatafileByRestriction(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -93892,7 +94151,7 @@ soap_in___ns1__searchDatafileByRestriction(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -93913,7 +94172,7 @@ soap_get___ns1__searchDatafileByRestriction(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchDatafileByRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -93930,11 +94189,11 @@ soap_instantiate___ns1__searchDatafileByRestriction(struct soap *soap, int n,
           fdebug,
           "soap_instantiate___ns1__searchDatafileByRestriction(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatafileByRestriction,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchDatafileByRestriction, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchDatafileByRestriction);
     if (size)
@@ -93973,7 +94232,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchDatasetByRestriction(
     struct soap *soap, struct __ns1__searchDatasetByRestriction *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatasetByRestriction_ = NULL;
+  a->ns1__searchDatasetByRestriction_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchDatasetByRestriction(
@@ -94008,9 +94267,10 @@ soap_in___ns1__searchDatasetByRestriction(
   short soap_flag;
   a = (struct __ns1__searchDatasetByRestriction *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatasetByRestriction,
-      sizeof(struct __ns1__searchDatasetByRestriction), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchDatasetByRestriction), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatasetByRestriction(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -94031,7 +94291,7 @@ soap_in___ns1__searchDatasetByRestriction(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -94052,7 +94312,7 @@ soap_get___ns1__searchDatasetByRestriction(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchDatasetByRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -94068,11 +94328,11 @@ soap_instantiate___ns1__searchDatasetByRestriction(struct soap *soap, int n,
              fdebug,
              "soap_instantiate___ns1__searchDatasetByRestriction(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatasetByRestriction,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchDatasetByRestriction, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchDatasetByRestriction);
     if (size)
@@ -94111,7 +94371,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchInvestigationByRestriction(
     struct soap *soap, struct __ns1__searchInvestigationByRestriction *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchInvestigationByRestriction_ = NULL;
+  a->ns1__searchInvestigationByRestriction_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -94148,10 +94408,10 @@ soap_in___ns1__searchInvestigationByRestriction(
   short soap_flag;
   a = (struct __ns1__searchInvestigationByRestriction *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchInvestigationByRestriction,
-      sizeof(struct __ns1__searchInvestigationByRestriction), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchInvestigationByRestriction), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchInvestigationByRestriction(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -94172,7 +94432,7 @@ soap_in___ns1__searchInvestigationByRestriction(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -94194,7 +94454,7 @@ soap_get___ns1__searchInvestigationByRestriction(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchInvestigationByRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -94211,10 +94471,10 @@ soap_instantiate___ns1__searchInvestigationByRestriction(struct soap *soap,
                               "searchInvestigationByRestriction(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchInvestigationByRestriction, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchInvestigationByRestriction, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchInvestigationByRestriction);
     if (size)
@@ -94256,7 +94516,7 @@ soap_default___ns1__searchInvestigationByParameterRestriction(
     struct __ns1__searchInvestigationByParameterRestriction *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchInvestigationByParameterRestriction_ = NULL;
+  a->ns1__searchInvestigationByParameterRestriction_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -94297,10 +94557,10 @@ soap_in___ns1__searchInvestigationByParameterRestriction(
   a = (struct __ns1__searchInvestigationByParameterRestriction *)soap_id_enter(
       soap, "", a,
       SOAP_TYPE_ICat3___ns1__searchInvestigationByParameterRestriction,
-      sizeof(struct __ns1__searchInvestigationByParameterRestriction), 0, NULL,
-      NULL, NULL);
+      sizeof(struct __ns1__searchInvestigationByParameterRestriction), 0,
+      nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchInvestigationByParameterRestriction(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -94321,7 +94581,7 @@ soap_in___ns1__searchInvestigationByParameterRestriction(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -94347,7 +94607,7 @@ soap_get___ns1__searchInvestigationByParameterRestriction(
   if ((p = soap_in___ns1__searchInvestigationByParameterRestriction(soap, tag,
                                                                     p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -94362,11 +94622,11 @@ soap_instantiate___ns1__searchInvestigationByParameterRestriction(
                                     "%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3___ns1__searchInvestigationByParameterRestriction, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(
         struct __ns1__searchInvestigationByParameterRestriction);
@@ -94410,7 +94670,7 @@ soap_default___ns1__searchDatafileByParameterRestriction(
     struct soap *soap, struct __ns1__searchDatafileByParameterRestriction *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatafileByParameterRestriction_ = NULL;
+  a->ns1__searchDatafileByParameterRestriction_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -94448,10 +94708,10 @@ soap_in___ns1__searchDatafileByParameterRestriction(
   short soap_flag;
   a = (struct __ns1__searchDatafileByParameterRestriction *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatafileByParameterRestriction,
-      sizeof(struct __ns1__searchDatafileByParameterRestriction), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchDatafileByParameterRestriction), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatafileByParameterRestriction(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -94472,7 +94732,7 @@ soap_in___ns1__searchDatafileByParameterRestriction(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -94496,7 +94756,7 @@ soap_get___ns1__searchDatafileByParameterRestriction(
   if ((p = soap_in___ns1__searchDatafileByParameterRestriction(soap, tag, p,
                                                                type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -94510,11 +94770,12 @@ soap_instantiate___ns1__searchDatafileByParameterRestriction(
                                     "searchDatafileByParameterRestriction(%d, "
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatafileByParameterRestriction,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3___ns1__searchDatafileByParameterRestriction, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__searchDatafileByParameterRestriction);
@@ -94556,7 +94817,7 @@ soap_default___ns1__searchSampleByParameterRestriction(
     struct soap *soap, struct __ns1__searchSampleByParameterRestriction *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchSampleByParameterRestriction_ = NULL;
+  a->ns1__searchSampleByParameterRestriction_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -94594,10 +94855,10 @@ soap_in___ns1__searchSampleByParameterRestriction(
   short soap_flag;
   a = (struct __ns1__searchSampleByParameterRestriction *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchSampleByParameterRestriction,
-      sizeof(struct __ns1__searchSampleByParameterRestriction), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchSampleByParameterRestriction), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchSampleByParameterRestriction(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -94618,7 +94879,7 @@ soap_in___ns1__searchSampleByParameterRestriction(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -94642,7 +94903,7 @@ soap_get___ns1__searchSampleByParameterRestriction(
   if ((p = soap_in___ns1__searchSampleByParameterRestriction(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -94657,10 +94918,10 @@ soap_instantiate___ns1__searchSampleByParameterRestriction(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchSampleByParameterRestriction, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchSampleByParameterRestriction,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__searchSampleByParameterRestriction);
@@ -94702,7 +94963,7 @@ soap_default___ns1__searchDatasetByParameterRestriction(
     struct soap *soap, struct __ns1__searchDatasetByParameterRestriction *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatasetByParameterRestriction_ = NULL;
+  a->ns1__searchDatasetByParameterRestriction_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -94740,10 +95001,10 @@ soap_in___ns1__searchDatasetByParameterRestriction(
   short soap_flag;
   a = (struct __ns1__searchDatasetByParameterRestriction *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatasetByParameterRestriction,
-      sizeof(struct __ns1__searchDatasetByParameterRestriction), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchDatasetByParameterRestriction), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatasetByParameterRestriction(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -94764,7 +95025,7 @@ soap_in___ns1__searchDatasetByParameterRestriction(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -94788,7 +95049,7 @@ soap_get___ns1__searchDatasetByParameterRestriction(
   if ((p = soap_in___ns1__searchDatasetByParameterRestriction(soap, tag, p,
                                                               type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -94803,10 +95064,10 @@ soap_instantiate___ns1__searchDatasetByParameterRestriction(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatasetByParameterRestriction, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchDatasetByParameterRestriction,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__searchDatasetByParameterRestriction);
@@ -94848,7 +95109,7 @@ soap_default___ns1__getParameterByUnits(struct soap *soap,
                                         struct __ns1__getParameterByUnits *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getParameterByUnits_ = NULL;
+  a->ns1__getParameterByUnits_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getParameterByUnits(
@@ -94884,9 +95145,9 @@ soap_in___ns1__getParameterByUnits(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getParameterByUnits *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getParameterByUnits,
-      sizeof(struct __ns1__getParameterByUnits), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getParameterByUnits), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getParameterByUnits(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -94905,7 +95166,7 @@ soap_in___ns1__getParameterByUnits(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -94927,7 +95188,7 @@ soap_get___ns1__getParameterByUnits(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__getParameterByUnits(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -94942,10 +95203,11 @@ soap_instantiate___ns1__getParameterByUnits(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__getParameterByUnits(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getParameterByUnits, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getParameterByUnits, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getParameterByUnits);
     if (size)
@@ -94981,7 +95243,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__getParameterByRestriction(
     struct soap *soap, struct __ns1__getParameterByRestriction *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getParameterByRestriction_ = NULL;
+  a->ns1__getParameterByRestriction_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getParameterByRestriction(
@@ -95016,9 +95278,10 @@ soap_in___ns1__getParameterByRestriction(
   short soap_flag;
   a = (struct __ns1__getParameterByRestriction *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getParameterByRestriction,
-      sizeof(struct __ns1__getParameterByRestriction), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getParameterByRestriction), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getParameterByRestriction(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -95039,7 +95302,7 @@ soap_in___ns1__getParameterByRestriction(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -95060,7 +95323,7 @@ soap_get___ns1__getParameterByRestriction(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__getParameterByRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -95077,10 +95340,10 @@ soap_instantiate___ns1__getParameterByRestriction(struct soap *soap, int n,
              "soap_instantiate___ns1__getParameterByRestriction(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__getParameterByRestriction, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getParameterByRestriction,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getParameterByRestriction);
     if (size)
@@ -95119,7 +95382,7 @@ soap_default___ns1__getParameterByName(struct soap *soap,
                                        struct __ns1__getParameterByName *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getParameterByName_ = NULL;
+  a->ns1__getParameterByName_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getParameterByName(
@@ -95154,9 +95417,9 @@ soap_in___ns1__getParameterByName(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getParameterByName *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getParameterByName,
-      sizeof(struct __ns1__getParameterByName), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getParameterByName), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getParameterByName(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -95175,7 +95438,7 @@ soap_in___ns1__getParameterByName(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -95197,7 +95460,7 @@ soap_get___ns1__getParameterByName(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in___ns1__getParameterByName(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -95212,10 +95475,11 @@ soap_instantiate___ns1__getParameterByName(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate___ns1__getParameterByName(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getParameterByName, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getParameterByName, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getParameterByName);
     if (size)
@@ -95251,7 +95515,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__getParameterByNameUnits(
     struct soap *soap, struct __ns1__getParameterByNameUnits *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getParameterByNameUnits_ = NULL;
+  a->ns1__getParameterByNameUnits_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getParameterByNameUnits(
@@ -95286,9 +95550,10 @@ soap_in___ns1__getParameterByNameUnits(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getParameterByNameUnits *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getParameterByNameUnits,
-      sizeof(struct __ns1__getParameterByNameUnits), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getParameterByNameUnits), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getParameterByNameUnits(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -95309,7 +95574,7 @@ soap_in___ns1__getParameterByNameUnits(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -95330,7 +95595,7 @@ soap_get___ns1__getParameterByNameUnits(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__getParameterByNameUnits(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -95347,10 +95612,10 @@ soap_instantiate___ns1__getParameterByNameUnits(struct soap *soap, int n,
              "soap_instantiate___ns1__getParameterByNameUnits(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__getParameterByNameUnits, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getParameterByNameUnits,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getParameterByNameUnits);
     if (size)
@@ -95387,7 +95652,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchSampleByParameter(
     struct soap *soap, struct __ns1__searchSampleByParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchSampleByParameter_ = NULL;
+  a->ns1__searchSampleByParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchSampleByParameter(
@@ -95422,9 +95687,10 @@ soap_in___ns1__searchSampleByParameter(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__searchSampleByParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchSampleByParameter,
-      sizeof(struct __ns1__searchSampleByParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchSampleByParameter), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchSampleByParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -95445,7 +95711,7 @@ soap_in___ns1__searchSampleByParameter(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -95466,7 +95732,7 @@ soap_get___ns1__searchSampleByParameter(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchSampleByParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -95483,10 +95749,10 @@ soap_instantiate___ns1__searchSampleByParameter(struct soap *soap, int n,
              "soap_instantiate___ns1__searchSampleByParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__searchSampleByParameter, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__searchSampleByParameter,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchSampleByParameter);
     if (size)
@@ -95523,7 +95789,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchDatasetByParameter(
     struct soap *soap, struct __ns1__searchDatasetByParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatasetByParameter_ = NULL;
+  a->ns1__searchDatasetByParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchDatasetByParameter(
@@ -95558,9 +95824,10 @@ soap_in___ns1__searchDatasetByParameter(
   short soap_flag;
   a = (struct __ns1__searchDatasetByParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatasetByParameter,
-      sizeof(struct __ns1__searchDatasetByParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchDatasetByParameter), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatasetByParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -95581,7 +95848,7 @@ soap_in___ns1__searchDatasetByParameter(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -95602,7 +95869,7 @@ soap_get___ns1__searchDatasetByParameter(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchDatasetByParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -95619,10 +95886,10 @@ soap_instantiate___ns1__searchDatasetByParameter(struct soap *soap, int n,
              "soap_instantiate___ns1__searchDatasetByParameter(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatasetByParameter, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__searchDatasetByParameter,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchDatasetByParameter);
     if (size)
@@ -95659,7 +95926,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchDatafileByParameter(
     struct soap *soap, struct __ns1__searchDatafileByParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatafileByParameter_ = NULL;
+  a->ns1__searchDatafileByParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchDatafileByParameter(
@@ -95694,9 +95961,10 @@ soap_in___ns1__searchDatafileByParameter(
   short soap_flag;
   a = (struct __ns1__searchDatafileByParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatafileByParameter,
-      sizeof(struct __ns1__searchDatafileByParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchDatafileByParameter), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatafileByParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -95717,7 +95985,7 @@ soap_in___ns1__searchDatafileByParameter(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -95738,7 +96006,7 @@ soap_get___ns1__searchDatafileByParameter(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchDatafileByParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -95755,10 +96023,10 @@ soap_instantiate___ns1__searchDatafileByParameter(struct soap *soap, int n,
              "soap_instantiate___ns1__searchDatafileByParameter(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatafileByParameter, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__searchDatafileByParameter,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchDatafileByParameter);
     if (size)
@@ -95796,7 +96064,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchInvestigationByParameter(
     struct soap *soap, struct __ns1__searchInvestigationByParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchInvestigationByParameter_ = NULL;
+  a->ns1__searchInvestigationByParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchInvestigationByParameter(
@@ -95831,10 +96099,10 @@ soap_in___ns1__searchInvestigationByParameter(
   short soap_flag;
   a = (struct __ns1__searchInvestigationByParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchInvestigationByParameter,
-      sizeof(struct __ns1__searchInvestigationByParameter), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchInvestigationByParameter), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchInvestigationByParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -95855,7 +96123,7 @@ soap_in___ns1__searchInvestigationByParameter(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -95876,7 +96144,7 @@ soap_get___ns1__searchInvestigationByParameter(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchInvestigationByParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -95892,10 +96160,10 @@ soap_instantiate___ns1__searchInvestigationByParameter(struct soap *soap, int n,
                               "searchInvestigationByParameter(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchInvestigationByParameter, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchInvestigationByParameter, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchInvestigationByParameter);
     if (size)
@@ -95935,7 +96203,7 @@ soap_default___ns1__searchSampleByParameterComparison(
     struct soap *soap, struct __ns1__searchSampleByParameterComparison *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchSampleByParameterComparison_ = NULL;
+  a->ns1__searchSampleByParameterComparison_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -95973,10 +96241,10 @@ soap_in___ns1__searchSampleByParameterComparison(
   short soap_flag;
   a = (struct __ns1__searchSampleByParameterComparison *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchSampleByParameterComparison,
-      sizeof(struct __ns1__searchSampleByParameterComparison), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchSampleByParameterComparison), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchSampleByParameterComparison(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -95997,7 +96265,7 @@ soap_in___ns1__searchSampleByParameterComparison(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -96020,7 +96288,7 @@ soap_get___ns1__searchSampleByParameterComparison(
   if ((p = soap_in___ns1__searchSampleByParameterComparison(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -96037,10 +96305,10 @@ soap_instantiate___ns1__searchSampleByParameterComparison(struct soap *soap,
                               "searchSampleByParameterComparison(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchSampleByParameterComparison, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchSampleByParameterComparison,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchSampleByParameterComparison);
     if (size)
@@ -96081,7 +96349,7 @@ soap_default___ns1__searchDatasetByParameterComparison(
     struct soap *soap, struct __ns1__searchDatasetByParameterComparison *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatasetByParameterComparison_ = NULL;
+  a->ns1__searchDatasetByParameterComparison_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -96119,10 +96387,10 @@ soap_in___ns1__searchDatasetByParameterComparison(
   short soap_flag;
   a = (struct __ns1__searchDatasetByParameterComparison *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatasetByParameterComparison,
-      sizeof(struct __ns1__searchDatasetByParameterComparison), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchDatasetByParameterComparison), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatasetByParameterComparison(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -96143,7 +96411,7 @@ soap_in___ns1__searchDatasetByParameterComparison(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -96167,7 +96435,7 @@ soap_get___ns1__searchDatasetByParameterComparison(
   if ((p = soap_in___ns1__searchDatasetByParameterComparison(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -96182,10 +96450,10 @@ soap_instantiate___ns1__searchDatasetByParameterComparison(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatasetByParameterComparison, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchDatasetByParameterComparison,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__searchDatasetByParameterComparison);
@@ -96227,7 +96495,7 @@ soap_default___ns1__searchDatafileByParameterComparison(
     struct soap *soap, struct __ns1__searchDatafileByParameterComparison *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatafileByParameterComparison_ = NULL;
+  a->ns1__searchDatafileByParameterComparison_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -96265,10 +96533,10 @@ soap_in___ns1__searchDatafileByParameterComparison(
   short soap_flag;
   a = (struct __ns1__searchDatafileByParameterComparison *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatafileByParameterComparison,
-      sizeof(struct __ns1__searchDatafileByParameterComparison), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchDatafileByParameterComparison), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatafileByParameterComparison(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -96289,7 +96557,7 @@ soap_in___ns1__searchDatafileByParameterComparison(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -96313,7 +96581,7 @@ soap_get___ns1__searchDatafileByParameterComparison(
   if ((p = soap_in___ns1__searchDatafileByParameterComparison(soap, tag, p,
                                                               type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -96328,10 +96596,10 @@ soap_instantiate___ns1__searchDatafileByParameterComparison(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatafileByParameterComparison, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchDatafileByParameterComparison,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__searchDatafileByParameterComparison);
@@ -96374,7 +96642,7 @@ soap_default___ns1__searchInvestigationByParameterComparison(
     struct __ns1__searchInvestigationByParameterComparison *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchInvestigationByParameterComparison_ = NULL;
+  a->ns1__searchInvestigationByParameterComparison_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -96415,10 +96683,10 @@ soap_in___ns1__searchInvestigationByParameterComparison(
   a = (struct __ns1__searchInvestigationByParameterComparison *)soap_id_enter(
       soap, "", a,
       SOAP_TYPE_ICat3___ns1__searchInvestigationByParameterComparison,
-      sizeof(struct __ns1__searchInvestigationByParameterComparison), 0, NULL,
-      NULL, NULL);
+      sizeof(struct __ns1__searchInvestigationByParameterComparison), 0,
+      nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchInvestigationByParameterComparison(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -96439,7 +96707,7 @@ soap_in___ns1__searchInvestigationByParameterComparison(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -96465,7 +96733,7 @@ soap_get___ns1__searchInvestigationByParameterComparison(
   if ((p = soap_in___ns1__searchInvestigationByParameterComparison(soap, tag, p,
                                                                    type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -96480,11 +96748,11 @@ soap_instantiate___ns1__searchInvestigationByParameterComparison(
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat3___ns1__searchInvestigationByParameterComparison,
                 n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(
         struct __ns1__searchInvestigationByParameterComparison);
@@ -96527,7 +96795,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchSampleByParameterCondition(
     struct soap *soap, struct __ns1__searchSampleByParameterCondition *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchSampleByParameterCondition_ = NULL;
+  a->ns1__searchSampleByParameterCondition_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -96564,10 +96832,10 @@ soap_in___ns1__searchSampleByParameterCondition(
   short soap_flag;
   a = (struct __ns1__searchSampleByParameterCondition *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchSampleByParameterCondition,
-      sizeof(struct __ns1__searchSampleByParameterCondition), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchSampleByParameterCondition), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchSampleByParameterCondition(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -96588,7 +96856,7 @@ soap_in___ns1__searchSampleByParameterCondition(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -96610,7 +96878,7 @@ soap_get___ns1__searchSampleByParameterCondition(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchSampleByParameterCondition(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -96627,10 +96895,10 @@ soap_instantiate___ns1__searchSampleByParameterCondition(struct soap *soap,
                               "searchSampleByParameterCondition(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchSampleByParameterCondition, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchSampleByParameterCondition, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchSampleByParameterCondition);
     if (size)
@@ -96671,7 +96939,7 @@ soap_default___ns1__searchDatasetByParameterCondition(
     struct soap *soap, struct __ns1__searchDatasetByParameterCondition *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatasetByParameterCondition_ = NULL;
+  a->ns1__searchDatasetByParameterCondition_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -96709,10 +96977,10 @@ soap_in___ns1__searchDatasetByParameterCondition(
   short soap_flag;
   a = (struct __ns1__searchDatasetByParameterCondition *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatasetByParameterCondition,
-      sizeof(struct __ns1__searchDatasetByParameterCondition), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchDatasetByParameterCondition), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatasetByParameterCondition(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -96733,7 +97001,7 @@ soap_in___ns1__searchDatasetByParameterCondition(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -96756,7 +97024,7 @@ soap_get___ns1__searchDatasetByParameterCondition(
   if ((p = soap_in___ns1__searchDatasetByParameterCondition(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -96773,10 +97041,10 @@ soap_instantiate___ns1__searchDatasetByParameterCondition(struct soap *soap,
                               "searchDatasetByParameterCondition(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatasetByParameterCondition, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchDatasetByParameterCondition,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchDatasetByParameterCondition);
     if (size)
@@ -96817,7 +97085,7 @@ soap_default___ns1__searchDatafileByParameterCondition(
     struct soap *soap, struct __ns1__searchDatafileByParameterCondition *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatafileByParameterCondition_ = NULL;
+  a->ns1__searchDatafileByParameterCondition_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -96855,10 +97123,10 @@ soap_in___ns1__searchDatafileByParameterCondition(
   short soap_flag;
   a = (struct __ns1__searchDatafileByParameterCondition *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatafileByParameterCondition,
-      sizeof(struct __ns1__searchDatafileByParameterCondition), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__searchDatafileByParameterCondition), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatafileByParameterCondition(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -96879,7 +97147,7 @@ soap_in___ns1__searchDatafileByParameterCondition(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -96903,7 +97171,7 @@ soap_get___ns1__searchDatafileByParameterCondition(
   if ((p = soap_in___ns1__searchDatafileByParameterCondition(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -96918,10 +97186,10 @@ soap_instantiate___ns1__searchDatafileByParameterCondition(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatafileByParameterCondition, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchDatafileByParameterCondition,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__searchDatafileByParameterCondition);
@@ -96964,7 +97232,7 @@ soap_default___ns1__searchInvestigationByParameterCondition(
     struct __ns1__searchInvestigationByParameterCondition *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchInvestigationByParameterCondition_ = NULL;
+  a->ns1__searchInvestigationByParameterCondition_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -97005,10 +97273,10 @@ soap_in___ns1__searchInvestigationByParameterCondition(
   a = (struct __ns1__searchInvestigationByParameterCondition *)soap_id_enter(
       soap, "", a,
       SOAP_TYPE_ICat3___ns1__searchInvestigationByParameterCondition,
-      sizeof(struct __ns1__searchInvestigationByParameterCondition), 0, NULL,
-      NULL, NULL);
+      sizeof(struct __ns1__searchInvestigationByParameterCondition), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchInvestigationByParameterCondition(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -97029,7 +97297,7 @@ soap_in___ns1__searchInvestigationByParameterCondition(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -97054,7 +97322,7 @@ soap_get___ns1__searchInvestigationByParameterCondition(
   if ((p = soap_in___ns1__searchInvestigationByParameterCondition(soap, tag, p,
                                                                   type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -97069,11 +97337,11 @@ soap_instantiate___ns1__searchInvestigationByParameterCondition(
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat3___ns1__searchInvestigationByParameterCondition,
                 n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__searchInvestigationByParameterCondition);
@@ -97115,7 +97383,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__getFacilityUserByFederalId(
     struct soap *soap, struct __ns1__getFacilityUserByFederalId *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getFacilityUserByFederalId_ = NULL;
+  a->ns1__getFacilityUserByFederalId_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getFacilityUserByFederalId(
@@ -97150,9 +97418,10 @@ soap_in___ns1__getFacilityUserByFederalId(
   short soap_flag;
   a = (struct __ns1__getFacilityUserByFederalId *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getFacilityUserByFederalId,
-      sizeof(struct __ns1__getFacilityUserByFederalId), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getFacilityUserByFederalId), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getFacilityUserByFederalId(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -97173,7 +97442,7 @@ soap_in___ns1__getFacilityUserByFederalId(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -97194,7 +97463,7 @@ soap_get___ns1__getFacilityUserByFederalId(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__getFacilityUserByFederalId(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -97210,11 +97479,11 @@ soap_instantiate___ns1__getFacilityUserByFederalId(struct soap *soap, int n,
              fdebug,
              "soap_instantiate___ns1__getFacilityUserByFederalId(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__getFacilityUserByFederalId,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__getFacilityUserByFederalId, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getFacilityUserByFederalId);
     if (size)
@@ -97253,7 +97522,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__getFacilityUserByFacilityUserId(
     struct soap *soap, struct __ns1__getFacilityUserByFacilityUserId *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getFacilityUserByFacilityUserId_ = NULL;
+  a->ns1__getFacilityUserByFacilityUserId_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -97289,10 +97558,10 @@ soap_in___ns1__getFacilityUserByFacilityUserId(
   short soap_flag;
   a = (struct __ns1__getFacilityUserByFacilityUserId *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getFacilityUserByFacilityUserId,
-      sizeof(struct __ns1__getFacilityUserByFacilityUserId), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__getFacilityUserByFacilityUserId), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getFacilityUserByFacilityUserId(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -97313,7 +97582,7 @@ soap_in___ns1__getFacilityUserByFacilityUserId(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -97335,7 +97604,7 @@ soap_get___ns1__getFacilityUserByFacilityUserId(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__getFacilityUserByFacilityUserId(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -97351,10 +97620,10 @@ soap_instantiate___ns1__getFacilityUserByFacilityUserId(struct soap *soap,
                               "getFacilityUserByFacilityUserId(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getFacilityUserByFacilityUserId, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__getFacilityUserByFacilityUserId, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getFacilityUserByFacilityUserId);
     if (size)
@@ -97394,7 +97663,7 @@ soap_default___ns1__getICATAPIVersion(struct soap *soap,
                                       struct __ns1__getICATAPIVersion *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getICATAPIVersion_ = NULL;
+  a->ns1__getICATAPIVersion_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getICATAPIVersion(
@@ -97429,9 +97698,9 @@ soap_in___ns1__getICATAPIVersion(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getICATAPIVersion *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getICATAPIVersion,
-      sizeof(struct __ns1__getICATAPIVersion), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getICATAPIVersion), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getICATAPIVersion(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -97450,7 +97719,7 @@ soap_in___ns1__getICATAPIVersion(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -97472,7 +97741,7 @@ soap_get___ns1__getICATAPIVersion(struct soap *soap,
                                   const char *tag, const char *type) {
   if ((p = soap_in___ns1__getICATAPIVersion(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -97486,10 +97755,11 @@ soap_instantiate___ns1__getICATAPIVersion(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate___ns1__getICATAPIVersion(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getICATAPIVersion, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getICATAPIVersion, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getICATAPIVersion);
     if (size)
@@ -97523,7 +97793,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__checkDatasetDownloadAccess(
     struct soap *soap, struct __ns1__checkDatasetDownloadAccess *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__checkDatasetDownloadAccess_ = NULL;
+  a->ns1__checkDatasetDownloadAccess_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__checkDatasetDownloadAccess(
@@ -97558,9 +97828,10 @@ soap_in___ns1__checkDatasetDownloadAccess(
   short soap_flag;
   a = (struct __ns1__checkDatasetDownloadAccess *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__checkDatasetDownloadAccess,
-      sizeof(struct __ns1__checkDatasetDownloadAccess), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__checkDatasetDownloadAccess), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__checkDatasetDownloadAccess(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -97581,7 +97852,7 @@ soap_in___ns1__checkDatasetDownloadAccess(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -97602,7 +97873,7 @@ soap_get___ns1__checkDatasetDownloadAccess(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__checkDatasetDownloadAccess(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -97618,11 +97889,11 @@ soap_instantiate___ns1__checkDatasetDownloadAccess(struct soap *soap, int n,
              fdebug,
              "soap_instantiate___ns1__checkDatasetDownloadAccess(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__checkDatasetDownloadAccess,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__checkDatasetDownloadAccess, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__checkDatasetDownloadAccess);
     if (size)
@@ -97661,7 +97932,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__checkDatafileDownloadAccess(
     struct soap *soap, struct __ns1__checkDatafileDownloadAccess *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__checkDatafileDownloadAccess_ = NULL;
+  a->ns1__checkDatafileDownloadAccess_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__checkDatafileDownloadAccess(
@@ -97696,9 +97967,10 @@ soap_in___ns1__checkDatafileDownloadAccess(
   short soap_flag;
   a = (struct __ns1__checkDatafileDownloadAccess *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__checkDatafileDownloadAccess,
-      sizeof(struct __ns1__checkDatafileDownloadAccess), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__checkDatafileDownloadAccess), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__checkDatafileDownloadAccess(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -97719,7 +97991,7 @@ soap_in___ns1__checkDatafileDownloadAccess(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -97740,7 +98012,7 @@ soap_get___ns1__checkDatafileDownloadAccess(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__checkDatafileDownloadAccess(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -97757,11 +98029,11 @@ soap_instantiate___ns1__checkDatafileDownloadAccess(struct soap *soap, int n,
           fdebug,
           "soap_instantiate___ns1__checkDatafileDownloadAccess(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__checkDatafileDownloadAccess,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__checkDatafileDownloadAccess, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__checkDatafileDownloadAccess);
     if (size)
@@ -97801,7 +98073,7 @@ soap_default___ns1__downloadDatafiles(struct soap *soap,
                                       struct __ns1__downloadDatafiles *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__downloadDatafiles_ = NULL;
+  a->ns1__downloadDatafiles_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__downloadDatafiles(
@@ -97836,9 +98108,9 @@ soap_in___ns1__downloadDatafiles(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__downloadDatafiles *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__downloadDatafiles,
-      sizeof(struct __ns1__downloadDatafiles), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__downloadDatafiles), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__downloadDatafiles(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -97857,7 +98129,7 @@ soap_in___ns1__downloadDatafiles(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -97879,7 +98151,7 @@ soap_get___ns1__downloadDatafiles(struct soap *soap,
                                   const char *tag, const char *type) {
   if ((p = soap_in___ns1__downloadDatafiles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -97893,10 +98165,11 @@ soap_instantiate___ns1__downloadDatafiles(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate___ns1__downloadDatafiles(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__downloadDatafiles, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__downloadDatafiles, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__downloadDatafiles);
     if (size)
@@ -97931,7 +98204,7 @@ soap_default___ns1__downloadDataset(struct soap *soap,
                                     struct __ns1__downloadDataset *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__downloadDataset_ = NULL;
+  a->ns1__downloadDataset_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -97966,9 +98239,9 @@ soap_in___ns1__downloadDataset(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__downloadDataset *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__downloadDataset,
-      sizeof(struct __ns1__downloadDataset), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__downloadDataset), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__downloadDataset(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -97987,7 +98260,7 @@ soap_in___ns1__downloadDataset(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -98009,7 +98282,7 @@ soap_get___ns1__downloadDataset(struct soap *soap,
                                 const char *tag, const char *type) {
   if ((p = soap_in___ns1__downloadDataset(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -98024,9 +98297,9 @@ soap_instantiate___ns1__downloadDataset(struct soap *soap, int n,
                       "soap_instantiate___ns1__downloadDataset(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__downloadDataset, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__downloadDataset, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__downloadDataset);
     if (size)
@@ -98061,7 +98334,7 @@ soap_default___ns1__downloadDatafile(struct soap *soap,
                                      struct __ns1__downloadDatafile *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__downloadDatafile_ = NULL;
+  a->ns1__downloadDatafile_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__downloadDatafile(
@@ -98096,9 +98369,9 @@ soap_in___ns1__downloadDatafile(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__downloadDatafile *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__downloadDatafile,
-      sizeof(struct __ns1__downloadDatafile), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__downloadDatafile), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__downloadDatafile(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -98117,7 +98390,7 @@ soap_in___ns1__downloadDatafile(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -98139,7 +98412,7 @@ soap_get___ns1__downloadDatafile(struct soap *soap,
                                  const char *tag, const char *type) {
   if ((p = soap_in___ns1__downloadDatafile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -98154,9 +98427,9 @@ soap_instantiate___ns1__downloadDatafile(struct soap *soap, int n,
                       "soap_instantiate___ns1__downloadDatafile(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__downloadDatafile, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__downloadDatafile, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__downloadDatafile);
     if (size)
@@ -98191,7 +98464,7 @@ soap_default___ns1__ingestMetadata(struct soap *soap,
                                    struct __ns1__ingestMetadata *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__ingestMetadata_ = NULL;
+  a->ns1__ingestMetadata_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -98226,9 +98499,9 @@ soap_in___ns1__ingestMetadata(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__ingestMetadata *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__ingestMetadata,
-      sizeof(struct __ns1__ingestMetadata), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__ingestMetadata), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__ingestMetadata(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -98247,7 +98520,7 @@ soap_in___ns1__ingestMetadata(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -98269,7 +98542,7 @@ soap_get___ns1__ingestMetadata(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__ingestMetadata(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -98284,9 +98557,9 @@ soap_instantiate___ns1__ingestMetadata(struct soap *soap, int n,
                       "soap_instantiate___ns1__ingestMetadata(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__ingestMetadata, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__ingestMetadata, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__ingestMetadata);
     if (size)
@@ -98321,7 +98594,7 @@ soap_default___ns1__updateAuthorisation(struct soap *soap,
                                         struct __ns1__updateAuthorisation *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__updateAuthorisation_ = NULL;
+  a->ns1__updateAuthorisation_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__updateAuthorisation(
@@ -98357,9 +98630,9 @@ soap_in___ns1__updateAuthorisation(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__updateAuthorisation *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__updateAuthorisation,
-      sizeof(struct __ns1__updateAuthorisation), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__updateAuthorisation), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__updateAuthorisation(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -98378,7 +98651,7 @@ soap_in___ns1__updateAuthorisation(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -98400,7 +98673,7 @@ soap_get___ns1__updateAuthorisation(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__updateAuthorisation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -98415,10 +98688,11 @@ soap_instantiate___ns1__updateAuthorisation(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__updateAuthorisation(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__updateAuthorisation, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__updateAuthorisation, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__updateAuthorisation);
     if (size)
@@ -98454,7 +98728,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__updateAuthorisationResponse(
     struct soap *soap, struct __ns1__updateAuthorisationResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__updateAuthorisationResponse_ = NULL;
+  a->ns1__updateAuthorisationResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__updateAuthorisationResponse(
@@ -98491,9 +98765,10 @@ soap_in___ns1__updateAuthorisationResponse(
   short soap_flag;
   a = (struct __ns1__updateAuthorisationResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__updateAuthorisationResponse,
-      sizeof(struct __ns1__updateAuthorisationResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__updateAuthorisationResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__updateAuthorisationResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -98515,7 +98790,7 @@ soap_in___ns1__updateAuthorisationResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -98536,7 +98811,7 @@ soap_get___ns1__updateAuthorisationResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__updateAuthorisationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -98553,11 +98828,11 @@ soap_instantiate___ns1__updateAuthorisationResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate___ns1__updateAuthorisationResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__updateAuthorisationResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__updateAuthorisationResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__updateAuthorisationResponse);
     if (size)
@@ -98597,7 +98872,7 @@ soap_default___ns1__removeAuthorisation(struct soap *soap,
                                         struct __ns1__removeAuthorisation *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeAuthorisation_ = NULL;
+  a->ns1__removeAuthorisation_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeAuthorisation(
@@ -98633,9 +98908,9 @@ soap_in___ns1__removeAuthorisation(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removeAuthorisation *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeAuthorisation,
-      sizeof(struct __ns1__removeAuthorisation), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeAuthorisation), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeAuthorisation(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -98654,7 +98929,7 @@ soap_in___ns1__removeAuthorisation(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -98676,7 +98951,7 @@ soap_get___ns1__removeAuthorisation(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeAuthorisation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -98691,10 +98966,11 @@ soap_instantiate___ns1__removeAuthorisation(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__removeAuthorisation(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__removeAuthorisation, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__removeAuthorisation, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeAuthorisation);
     if (size)
@@ -98730,7 +99006,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__removeAuthorisationResponse(
     struct soap *soap, struct __ns1__removeAuthorisationResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeAuthorisationResponse_ = NULL;
+  a->ns1__removeAuthorisationResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeAuthorisationResponse(
@@ -98767,9 +99043,10 @@ soap_in___ns1__removeAuthorisationResponse(
   short soap_flag;
   a = (struct __ns1__removeAuthorisationResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeAuthorisationResponse,
-      sizeof(struct __ns1__removeAuthorisationResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeAuthorisationResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeAuthorisationResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -98791,7 +99068,7 @@ soap_in___ns1__removeAuthorisationResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -98812,7 +99089,7 @@ soap_get___ns1__removeAuthorisationResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeAuthorisationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -98829,11 +99106,11 @@ soap_instantiate___ns1__removeAuthorisationResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate___ns1__removeAuthorisationResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__removeAuthorisationResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__removeAuthorisationResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeAuthorisationResponse);
     if (size)
@@ -98873,7 +99150,7 @@ soap_default___ns1__deleteAuthorisation(struct soap *soap,
                                         struct __ns1__deleteAuthorisation *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteAuthorisation_ = NULL;
+  a->ns1__deleteAuthorisation_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteAuthorisation(
@@ -98909,9 +99186,9 @@ soap_in___ns1__deleteAuthorisation(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteAuthorisation *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteAuthorisation,
-      sizeof(struct __ns1__deleteAuthorisation), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteAuthorisation), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteAuthorisation(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -98930,7 +99207,7 @@ soap_in___ns1__deleteAuthorisation(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -98952,7 +99229,7 @@ soap_get___ns1__deleteAuthorisation(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteAuthorisation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -98967,10 +99244,11 @@ soap_instantiate___ns1__deleteAuthorisation(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__deleteAuthorisation(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__deleteAuthorisation, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteAuthorisation, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteAuthorisation);
     if (size)
@@ -99006,7 +99284,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__deleteAuthorisationResponse(
     struct soap *soap, struct __ns1__deleteAuthorisationResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteAuthorisationResponse_ = NULL;
+  a->ns1__deleteAuthorisationResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteAuthorisationResponse(
@@ -99043,9 +99321,10 @@ soap_in___ns1__deleteAuthorisationResponse(
   short soap_flag;
   a = (struct __ns1__deleteAuthorisationResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteAuthorisationResponse,
-      sizeof(struct __ns1__deleteAuthorisationResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteAuthorisationResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteAuthorisationResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -99067,7 +99346,7 @@ soap_in___ns1__deleteAuthorisationResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -99088,7 +99367,7 @@ soap_get___ns1__deleteAuthorisationResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteAuthorisationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -99105,11 +99384,11 @@ soap_instantiate___ns1__deleteAuthorisationResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate___ns1__deleteAuthorisationResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__deleteAuthorisationResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteAuthorisationResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteAuthorisationResponse);
     if (size)
@@ -99149,7 +99428,7 @@ soap_default___ns1__addAuthorisation(struct soap *soap,
                                      struct __ns1__addAuthorisation *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__addAuthorisation_ = NULL;
+  a->ns1__addAuthorisation_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__addAuthorisation(
@@ -99184,9 +99463,9 @@ soap_in___ns1__addAuthorisation(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__addAuthorisation *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__addAuthorisation,
-      sizeof(struct __ns1__addAuthorisation), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__addAuthorisation), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__addAuthorisation(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -99205,7 +99484,7 @@ soap_in___ns1__addAuthorisation(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -99227,7 +99506,7 @@ soap_get___ns1__addAuthorisation(struct soap *soap,
                                  const char *tag, const char *type) {
   if ((p = soap_in___ns1__addAuthorisation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -99242,9 +99521,9 @@ soap_instantiate___ns1__addAuthorisation(struct soap *soap, int n,
                       "soap_instantiate___ns1__addAuthorisation(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__addAuthorisation, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__addAuthorisation, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__addAuthorisation);
     if (size)
@@ -99279,7 +99558,7 @@ soap_default___ns1__getAuthorisations(struct soap *soap,
                                       struct __ns1__getAuthorisations *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getAuthorisations_ = NULL;
+  a->ns1__getAuthorisations_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getAuthorisations(
@@ -99314,9 +99593,9 @@ soap_in___ns1__getAuthorisations(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getAuthorisations *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getAuthorisations,
-      sizeof(struct __ns1__getAuthorisations), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getAuthorisations), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getAuthorisations(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -99335,7 +99614,7 @@ soap_in___ns1__getAuthorisations(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -99357,7 +99636,7 @@ soap_get___ns1__getAuthorisations(struct soap *soap,
                                   const char *tag, const char *type) {
   if ((p = soap_in___ns1__getAuthorisations(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -99371,10 +99650,11 @@ soap_instantiate___ns1__getAuthorisations(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate___ns1__getAuthorisations(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getAuthorisations, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getAuthorisations, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getAuthorisations);
     if (size)
@@ -99408,7 +99688,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__removeDataFileParameter(
     struct soap *soap, struct __ns1__removeDataFileParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeDataFileParameter_ = NULL;
+  a->ns1__removeDataFileParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeDataFileParameter(
@@ -99443,9 +99723,10 @@ soap_in___ns1__removeDataFileParameter(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removeDataFileParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeDataFileParameter,
-      sizeof(struct __ns1__removeDataFileParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeDataFileParameter), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeDataFileParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -99466,7 +99747,7 @@ soap_in___ns1__removeDataFileParameter(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -99487,7 +99768,7 @@ soap_get___ns1__removeDataFileParameter(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeDataFileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -99504,10 +99785,10 @@ soap_instantiate___ns1__removeDataFileParameter(struct soap *soap, int n,
              "soap_instantiate___ns1__removeDataFileParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__removeDataFileParameter, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__removeDataFileParameter,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeDataFileParameter);
     if (size)
@@ -99544,7 +99825,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__removeDataFileParameterResponse(
     struct soap *soap, struct __ns1__removeDataFileParameterResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeDataFileParameterResponse_ = NULL;
+  a->ns1__removeDataFileParameterResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -99582,10 +99863,10 @@ soap_in___ns1__removeDataFileParameterResponse(
   short soap_flag;
   a = (struct __ns1__removeDataFileParameterResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeDataFileParameterResponse,
-      sizeof(struct __ns1__removeDataFileParameterResponse), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__removeDataFileParameterResponse), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeDataFileParameterResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -99607,7 +99888,7 @@ soap_in___ns1__removeDataFileParameterResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -99629,7 +99910,7 @@ soap_get___ns1__removeDataFileParameterResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeDataFileParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -99645,10 +99926,10 @@ soap_instantiate___ns1__removeDataFileParameterResponse(struct soap *soap,
                               "removeDataFileParameterResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__removeDataFileParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__removeDataFileParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeDataFileParameterResponse);
     if (size)
@@ -99688,7 +99969,7 @@ soap_default___ns1__removeDataFile(struct soap *soap,
                                    struct __ns1__removeDataFile *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeDataFile_ = NULL;
+  a->ns1__removeDataFile_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -99723,9 +100004,9 @@ soap_in___ns1__removeDataFile(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removeDataFile *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeDataFile,
-      sizeof(struct __ns1__removeDataFile), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeDataFile), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeDataFile(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -99744,7 +100025,7 @@ soap_in___ns1__removeDataFile(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -99766,7 +100047,7 @@ soap_get___ns1__removeDataFile(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__removeDataFile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -99781,9 +100062,9 @@ soap_instantiate___ns1__removeDataFile(struct soap *soap, int n,
                       "soap_instantiate___ns1__removeDataFile(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__removeDataFile, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__removeDataFile, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeDataFile);
     if (size)
@@ -99817,7 +100098,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__removeDataFileResponse(
     struct soap *soap, struct __ns1__removeDataFileResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeDataFileResponse_ = NULL;
+  a->ns1__removeDataFileResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeDataFileResponse(
@@ -99854,9 +100135,10 @@ soap_in___ns1__removeDataFileResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removeDataFileResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeDataFileResponse,
-      sizeof(struct __ns1__removeDataFileResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeDataFileResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeDataFileResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -99877,7 +100159,7 @@ soap_in___ns1__removeDataFileResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -99898,7 +100180,7 @@ soap_get___ns1__removeDataFileResponse(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeDataFileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -99915,10 +100197,10 @@ soap_instantiate___ns1__removeDataFileResponse(struct soap *soap, int n,
              "soap_instantiate___ns1__removeDataFileResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__removeDataFileResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__removeDataFileResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeDataFileResponse);
     if (size)
@@ -99955,7 +100237,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__deleteDataFileParameter(
     struct soap *soap, struct __ns1__deleteDataFileParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteDataFileParameter_ = NULL;
+  a->ns1__deleteDataFileParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteDataFileParameter(
@@ -99990,9 +100272,10 @@ soap_in___ns1__deleteDataFileParameter(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteDataFileParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteDataFileParameter,
-      sizeof(struct __ns1__deleteDataFileParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteDataFileParameter), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteDataFileParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -100013,7 +100296,7 @@ soap_in___ns1__deleteDataFileParameter(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -100034,7 +100317,7 @@ soap_get___ns1__deleteDataFileParameter(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteDataFileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -100051,10 +100334,10 @@ soap_instantiate___ns1__deleteDataFileParameter(struct soap *soap, int n,
              "soap_instantiate___ns1__deleteDataFileParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__deleteDataFileParameter, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteDataFileParameter,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteDataFileParameter);
     if (size)
@@ -100091,7 +100374,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__deleteDataFileParameterResponse(
     struct soap *soap, struct __ns1__deleteDataFileParameterResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteDataFileParameterResponse_ = NULL;
+  a->ns1__deleteDataFileParameterResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -100129,10 +100412,10 @@ soap_in___ns1__deleteDataFileParameterResponse(
   short soap_flag;
   a = (struct __ns1__deleteDataFileParameterResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteDataFileParameterResponse,
-      sizeof(struct __ns1__deleteDataFileParameterResponse), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__deleteDataFileParameterResponse), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteDataFileParameterResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -100154,7 +100437,7 @@ soap_in___ns1__deleteDataFileParameterResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -100176,7 +100459,7 @@ soap_get___ns1__deleteDataFileParameterResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteDataFileParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -100192,10 +100475,10 @@ soap_instantiate___ns1__deleteDataFileParameterResponse(struct soap *soap,
                               "deleteDataFileParameterResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__deleteDataFileParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteDataFileParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteDataFileParameterResponse);
     if (size)
@@ -100234,7 +100517,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__modifyDataFileParameter(
     struct soap *soap, struct __ns1__modifyDataFileParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifyDataFileParameter_ = NULL;
+  a->ns1__modifyDataFileParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__modifyDataFileParameter(
@@ -100269,9 +100552,10 @@ soap_in___ns1__modifyDataFileParameter(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__modifyDataFileParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifyDataFileParameter,
-      sizeof(struct __ns1__modifyDataFileParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifyDataFileParameter), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifyDataFileParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -100292,7 +100576,7 @@ soap_in___ns1__modifyDataFileParameter(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -100313,7 +100597,7 @@ soap_get___ns1__modifyDataFileParameter(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifyDataFileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -100330,10 +100614,10 @@ soap_instantiate___ns1__modifyDataFileParameter(struct soap *soap, int n,
              "soap_instantiate___ns1__modifyDataFileParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__modifyDataFileParameter, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__modifyDataFileParameter,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifyDataFileParameter);
     if (size)
@@ -100370,7 +100654,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__modifyDataFileParameterResponse(
     struct soap *soap, struct __ns1__modifyDataFileParameterResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifyDataFileParameterResponse_ = NULL;
+  a->ns1__modifyDataFileParameterResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -100408,10 +100692,10 @@ soap_in___ns1__modifyDataFileParameterResponse(
   short soap_flag;
   a = (struct __ns1__modifyDataFileParameterResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifyDataFileParameterResponse,
-      sizeof(struct __ns1__modifyDataFileParameterResponse), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__modifyDataFileParameterResponse), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifyDataFileParameterResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -100433,7 +100717,7 @@ soap_in___ns1__modifyDataFileParameterResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -100455,7 +100739,7 @@ soap_get___ns1__modifyDataFileParameterResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifyDataFileParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -100471,10 +100755,10 @@ soap_instantiate___ns1__modifyDataFileParameterResponse(struct soap *soap,
                               "modifyDataFileParameterResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__modifyDataFileParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__modifyDataFileParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifyDataFileParameterResponse);
     if (size)
@@ -100513,7 +100797,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__addDataFileParameters(
     struct soap *soap, struct __ns1__addDataFileParameters *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__addDataFileParameters_ = NULL;
+  a->ns1__addDataFileParameters_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__addDataFileParameters(
@@ -100548,9 +100832,10 @@ soap_in___ns1__addDataFileParameters(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__addDataFileParameters *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__addDataFileParameters,
-      sizeof(struct __ns1__addDataFileParameters), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__addDataFileParameters), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__addDataFileParameters(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -100570,7 +100855,7 @@ soap_in___ns1__addDataFileParameters(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -100591,7 +100876,7 @@ soap_get___ns1__addDataFileParameters(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in___ns1__addDataFileParameters(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -100608,10 +100893,10 @@ soap_instantiate___ns1__addDataFileParameters(struct soap *soap, int n,
              "soap_instantiate___ns1__addDataFileParameters(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__addDataFileParameters, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__addDataFileParameters, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__addDataFileParameters);
     if (size)
@@ -100648,7 +100933,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__addDataFileParameter(
     struct soap *soap, struct __ns1__addDataFileParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__addDataFileParameter_ = NULL;
+  a->ns1__addDataFileParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__addDataFileParameter(
@@ -100683,9 +100968,9 @@ soap_in___ns1__addDataFileParameter(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__addDataFileParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__addDataFileParameter,
-      sizeof(struct __ns1__addDataFileParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__addDataFileParameter), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__addDataFileParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -100705,7 +100990,7 @@ soap_in___ns1__addDataFileParameter(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -100726,7 +101011,7 @@ soap_get___ns1__addDataFileParameter(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in___ns1__addDataFileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -100742,10 +101027,10 @@ soap_instantiate___ns1__addDataFileParameter(struct soap *soap, int n,
                    "soap_instantiate___ns1__addDataFileParameter(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__addDataFileParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__addDataFileParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__addDataFileParameter);
     if (size)
@@ -100783,7 +101068,7 @@ soap_default___ns1__modifyDataFile(struct soap *soap,
                                    struct __ns1__modifyDataFile *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifyDataFile_ = NULL;
+  a->ns1__modifyDataFile_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -100818,9 +101103,9 @@ soap_in___ns1__modifyDataFile(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__modifyDataFile *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifyDataFile,
-      sizeof(struct __ns1__modifyDataFile), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifyDataFile), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifyDataFile(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -100839,7 +101124,7 @@ soap_in___ns1__modifyDataFile(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -100861,7 +101146,7 @@ soap_get___ns1__modifyDataFile(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__modifyDataFile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -100876,9 +101161,9 @@ soap_instantiate___ns1__modifyDataFile(struct soap *soap, int n,
                       "soap_instantiate___ns1__modifyDataFile(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__modifyDataFile, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__modifyDataFile, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifyDataFile);
     if (size)
@@ -100912,7 +101197,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__modifyDataFileResponse(
     struct soap *soap, struct __ns1__modifyDataFileResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifyDataFileResponse_ = NULL;
+  a->ns1__modifyDataFileResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__modifyDataFileResponse(
@@ -100949,9 +101234,10 @@ soap_in___ns1__modifyDataFileResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__modifyDataFileResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifyDataFileResponse,
-      sizeof(struct __ns1__modifyDataFileResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifyDataFileResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifyDataFileResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -100972,7 +101258,7 @@ soap_in___ns1__modifyDataFileResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -100993,7 +101279,7 @@ soap_get___ns1__modifyDataFileResponse(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifyDataFileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -101010,10 +101296,10 @@ soap_instantiate___ns1__modifyDataFileResponse(struct soap *soap, int n,
              "soap_instantiate___ns1__modifyDataFileResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__modifyDataFileResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__modifyDataFileResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifyDataFileResponse);
     if (size)
@@ -101051,7 +101337,7 @@ soap_default___ns1__deleteDataFile(struct soap *soap,
                                    struct __ns1__deleteDataFile *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteDataFile_ = NULL;
+  a->ns1__deleteDataFile_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -101086,9 +101372,9 @@ soap_in___ns1__deleteDataFile(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteDataFile *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteDataFile,
-      sizeof(struct __ns1__deleteDataFile), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteDataFile), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteDataFile(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -101107,7 +101393,7 @@ soap_in___ns1__deleteDataFile(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -101129,7 +101415,7 @@ soap_get___ns1__deleteDataFile(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__deleteDataFile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -101144,9 +101430,9 @@ soap_instantiate___ns1__deleteDataFile(struct soap *soap, int n,
                       "soap_instantiate___ns1__deleteDataFile(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__deleteDataFile, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteDataFile, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteDataFile);
     if (size)
@@ -101180,7 +101466,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__deleteDataFileResponse(
     struct soap *soap, struct __ns1__deleteDataFileResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteDataFileResponse_ = NULL;
+  a->ns1__deleteDataFileResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteDataFileResponse(
@@ -101217,9 +101503,10 @@ soap_in___ns1__deleteDataFileResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteDataFileResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteDataFileResponse,
-      sizeof(struct __ns1__deleteDataFileResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteDataFileResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteDataFileResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -101240,7 +101527,7 @@ soap_in___ns1__deleteDataFileResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -101261,7 +101548,7 @@ soap_get___ns1__deleteDataFileResponse(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteDataFileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -101278,10 +101565,10 @@ soap_instantiate___ns1__deleteDataFileResponse(struct soap *soap, int n,
              "soap_instantiate___ns1__deleteDataFileResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__deleteDataFileResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteDataFileResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteDataFileResponse);
     if (size)
@@ -101319,7 +101606,7 @@ soap_default___ns1__createDataFiles(struct soap *soap,
                                     struct __ns1__createDataFiles *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__createDataFiles_ = NULL;
+  a->ns1__createDataFiles_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -101354,9 +101641,9 @@ soap_in___ns1__createDataFiles(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__createDataFiles *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__createDataFiles,
-      sizeof(struct __ns1__createDataFiles), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__createDataFiles), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__createDataFiles(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -101375,7 +101662,7 @@ soap_in___ns1__createDataFiles(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -101397,7 +101684,7 @@ soap_get___ns1__createDataFiles(struct soap *soap,
                                 const char *tag, const char *type) {
   if ((p = soap_in___ns1__createDataFiles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -101412,9 +101699,9 @@ soap_instantiate___ns1__createDataFiles(struct soap *soap, int n,
                       "soap_instantiate___ns1__createDataFiles(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__createDataFiles, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__createDataFiles, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__createDataFiles);
     if (size)
@@ -101449,7 +101736,7 @@ soap_default___ns1__createDataFile(struct soap *soap,
                                    struct __ns1__createDataFile *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__createDataFile_ = NULL;
+  a->ns1__createDataFile_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -101484,9 +101771,9 @@ soap_in___ns1__createDataFile(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__createDataFile *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__createDataFile,
-      sizeof(struct __ns1__createDataFile), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__createDataFile), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__createDataFile(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -101505,7 +101792,7 @@ soap_in___ns1__createDataFile(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -101527,7 +101814,7 @@ soap_get___ns1__createDataFile(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__createDataFile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -101542,9 +101829,9 @@ soap_instantiate___ns1__createDataFile(struct soap *soap, int n,
                       "soap_instantiate___ns1__createDataFile(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__createDataFile, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__createDataFile, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__createDataFile);
     if (size)
@@ -101579,7 +101866,7 @@ soap_default___ns1__getDatafiles(struct soap *soap,
                                  struct __ns1__getDatafiles *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getDatafiles_ = NULL;
+  a->ns1__getDatafiles_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -101613,9 +101900,9 @@ soap_in___ns1__getDatafiles(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getDatafiles *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getDatafiles,
-      sizeof(struct __ns1__getDatafiles), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getDatafiles), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getDatafiles(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -101634,7 +101921,7 @@ soap_in___ns1__getDatafiles(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -101655,7 +101942,7 @@ soap_get___ns1__getDatafiles(struct soap *soap, struct __ns1__getDatafiles *p,
                              const char *tag, const char *type) {
   if ((p = soap_in___ns1__getDatafiles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -101668,9 +101955,9 @@ soap_instantiate___ns1__getDatafiles(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate___ns1__getDatafiles(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getDatafiles, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__getDatafiles, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getDatafiles);
     if (size)
@@ -101705,7 +101992,7 @@ soap_default___ns1__getDatafile(struct soap *soap,
                                 struct __ns1__getDatafile *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getDatafile_ = NULL;
+  a->ns1__getDatafile_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -101739,9 +102026,9 @@ soap_in___ns1__getDatafile(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getDatafile *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getDatafile,
-      sizeof(struct __ns1__getDatafile), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getDatafile), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getDatafile(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -101760,7 +102047,7 @@ soap_in___ns1__getDatafile(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -101781,7 +102068,7 @@ soap_get___ns1__getDatafile(struct soap *soap, struct __ns1__getDatafile *p,
                             const char *tag, const char *type) {
   if ((p = soap_in___ns1__getDatafile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -101794,9 +102081,9 @@ soap_instantiate___ns1__getDatafile(struct soap *soap, int n, const char *type,
                             "soap_instantiate___ns1__getDatafile(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getDatafile, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__getDatafile, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getDatafile);
     if (size)
@@ -101830,7 +102117,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__removeDataSetParameter(
     struct soap *soap, struct __ns1__removeDataSetParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeDataSetParameter_ = NULL;
+  a->ns1__removeDataSetParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeDataSetParameter(
@@ -101865,9 +102152,10 @@ soap_in___ns1__removeDataSetParameter(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removeDataSetParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeDataSetParameter,
-      sizeof(struct __ns1__removeDataSetParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeDataSetParameter), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeDataSetParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -101887,7 +102175,7 @@ soap_in___ns1__removeDataSetParameter(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -101908,7 +102196,7 @@ soap_get___ns1__removeDataSetParameter(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeDataSetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -101925,10 +102213,10 @@ soap_instantiate___ns1__removeDataSetParameter(struct soap *soap, int n,
              "soap_instantiate___ns1__removeDataSetParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__removeDataSetParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__removeDataSetParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeDataSetParameter);
     if (size)
@@ -101965,7 +102253,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__removeDataSetParameterResponse(
     struct soap *soap, struct __ns1__removeDataSetParameterResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeDataSetParameterResponse_ = NULL;
+  a->ns1__removeDataSetParameterResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeDataSetParameterResponse(
@@ -102002,10 +102290,10 @@ soap_in___ns1__removeDataSetParameterResponse(
   short soap_flag;
   a = (struct __ns1__removeDataSetParameterResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeDataSetParameterResponse,
-      sizeof(struct __ns1__removeDataSetParameterResponse), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__removeDataSetParameterResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeDataSetParameterResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -102027,7 +102315,7 @@ soap_in___ns1__removeDataSetParameterResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -102048,7 +102336,7 @@ soap_get___ns1__removeDataSetParameterResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeDataSetParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -102064,10 +102352,10 @@ soap_instantiate___ns1__removeDataSetParameterResponse(struct soap *soap, int n,
                               "removeDataSetParameterResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__removeDataSetParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__removeDataSetParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeDataSetParameterResponse);
     if (size)
@@ -102107,7 +102395,7 @@ soap_default___ns1__removeDataSet(struct soap *soap,
                                   struct __ns1__removeDataSet *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeDataSet_ = NULL;
+  a->ns1__removeDataSet_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -102141,9 +102429,9 @@ soap_in___ns1__removeDataSet(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removeDataSet *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeDataSet,
-      sizeof(struct __ns1__removeDataSet), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeDataSet), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeDataSet(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -102162,7 +102450,7 @@ soap_in___ns1__removeDataSet(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -102183,7 +102471,7 @@ soap_get___ns1__removeDataSet(struct soap *soap, struct __ns1__removeDataSet *p,
                               const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeDataSet(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -102198,9 +102486,9 @@ soap_instantiate___ns1__removeDataSet(struct soap *soap, int n,
                       "soap_instantiate___ns1__removeDataSet(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__removeDataSet, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__removeDataSet, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeDataSet);
     if (size)
@@ -102234,7 +102522,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__removeDataSetResponse(
     struct soap *soap, struct __ns1__removeDataSetResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeDataSetResponse_ = NULL;
+  a->ns1__removeDataSetResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeDataSetResponse(
@@ -102271,9 +102559,10 @@ soap_in___ns1__removeDataSetResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removeDataSetResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeDataSetResponse,
-      sizeof(struct __ns1__removeDataSetResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeDataSetResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeDataSetResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -102294,7 +102583,7 @@ soap_in___ns1__removeDataSetResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -102315,7 +102604,7 @@ soap_get___ns1__removeDataSetResponse(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeDataSetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -102332,10 +102621,10 @@ soap_instantiate___ns1__removeDataSetResponse(struct soap *soap, int n,
              "soap_instantiate___ns1__removeDataSetResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__removeDataSetResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__removeDataSetResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeDataSetResponse);
     if (size)
@@ -102372,7 +102661,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__addDataSetParameters(
     struct soap *soap, struct __ns1__addDataSetParameters *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__addDataSetParameters_ = NULL;
+  a->ns1__addDataSetParameters_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__addDataSetParameters(
@@ -102407,9 +102696,9 @@ soap_in___ns1__addDataSetParameters(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__addDataSetParameters *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__addDataSetParameters,
-      sizeof(struct __ns1__addDataSetParameters), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__addDataSetParameters), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__addDataSetParameters(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -102429,7 +102718,7 @@ soap_in___ns1__addDataSetParameters(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -102450,7 +102739,7 @@ soap_get___ns1__addDataSetParameters(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in___ns1__addDataSetParameters(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -102466,10 +102755,10 @@ soap_instantiate___ns1__addDataSetParameters(struct soap *soap, int n,
                    "soap_instantiate___ns1__addDataSetParameters(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__addDataSetParameters, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__addDataSetParameters, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__addDataSetParameters);
     if (size)
@@ -102507,7 +102796,7 @@ soap_default___ns1__addDataSetParameter(struct soap *soap,
                                         struct __ns1__addDataSetParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__addDataSetParameter_ = NULL;
+  a->ns1__addDataSetParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__addDataSetParameter(
@@ -102543,9 +102832,9 @@ soap_in___ns1__addDataSetParameter(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__addDataSetParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__addDataSetParameter,
-      sizeof(struct __ns1__addDataSetParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__addDataSetParameter), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__addDataSetParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -102564,7 +102853,7 @@ soap_in___ns1__addDataSetParameter(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -102586,7 +102875,7 @@ soap_get___ns1__addDataSetParameter(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__addDataSetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -102601,10 +102890,11 @@ soap_instantiate___ns1__addDataSetParameter(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__addDataSetParameter(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__addDataSetParameter, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__addDataSetParameter, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__addDataSetParameter);
     if (size)
@@ -102641,7 +102931,7 @@ soap_default___ns1__setDataSetSample(struct soap *soap,
                                      struct __ns1__setDataSetSample *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__setDataSetSample_ = NULL;
+  a->ns1__setDataSetSample_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__setDataSetSample(
@@ -102676,9 +102966,9 @@ soap_in___ns1__setDataSetSample(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__setDataSetSample *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__setDataSetSample,
-      sizeof(struct __ns1__setDataSetSample), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__setDataSetSample), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__setDataSetSample(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -102697,7 +102987,7 @@ soap_in___ns1__setDataSetSample(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -102719,7 +103009,7 @@ soap_get___ns1__setDataSetSample(struct soap *soap,
                                  const char *tag, const char *type) {
   if ((p = soap_in___ns1__setDataSetSample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -102734,9 +103024,9 @@ soap_instantiate___ns1__setDataSetSample(struct soap *soap, int n,
                       "soap_instantiate___ns1__setDataSetSample(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__setDataSetSample, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__setDataSetSample, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__setDataSetSample);
     if (size)
@@ -102770,7 +103060,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__setDataSetSampleResponse(
     struct soap *soap, struct __ns1__setDataSetSampleResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__setDataSetSampleResponse_ = NULL;
+  a->ns1__setDataSetSampleResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__setDataSetSampleResponse(
@@ -102807,9 +103097,10 @@ soap_in___ns1__setDataSetSampleResponse(
   short soap_flag;
   a = (struct __ns1__setDataSetSampleResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__setDataSetSampleResponse,
-      sizeof(struct __ns1__setDataSetSampleResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__setDataSetSampleResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__setDataSetSampleResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -102831,7 +103122,7 @@ soap_in___ns1__setDataSetSampleResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -102852,7 +103143,7 @@ soap_get___ns1__setDataSetSampleResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__setDataSetSampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -102869,10 +103160,10 @@ soap_instantiate___ns1__setDataSetSampleResponse(struct soap *soap, int n,
              "soap_instantiate___ns1__setDataSetSampleResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__setDataSetSampleResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__setDataSetSampleResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__setDataSetSampleResponse);
     if (size)
@@ -102909,7 +103200,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__modifyDataSetParameter(
     struct soap *soap, struct __ns1__modifyDataSetParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifyDataSetParameter_ = NULL;
+  a->ns1__modifyDataSetParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__modifyDataSetParameter(
@@ -102944,9 +103235,10 @@ soap_in___ns1__modifyDataSetParameter(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__modifyDataSetParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifyDataSetParameter,
-      sizeof(struct __ns1__modifyDataSetParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifyDataSetParameter), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifyDataSetParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -102966,7 +103258,7 @@ soap_in___ns1__modifyDataSetParameter(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -102987,7 +103279,7 @@ soap_get___ns1__modifyDataSetParameter(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifyDataSetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -103004,10 +103296,10 @@ soap_instantiate___ns1__modifyDataSetParameter(struct soap *soap, int n,
              "soap_instantiate___ns1__modifyDataSetParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__modifyDataSetParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__modifyDataSetParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifyDataSetParameter);
     if (size)
@@ -103044,7 +103336,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__modifyDataSetParameterResponse(
     struct soap *soap, struct __ns1__modifyDataSetParameterResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifyDataSetParameterResponse_ = NULL;
+  a->ns1__modifyDataSetParameterResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__modifyDataSetParameterResponse(
@@ -103081,10 +103373,10 @@ soap_in___ns1__modifyDataSetParameterResponse(
   short soap_flag;
   a = (struct __ns1__modifyDataSetParameterResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifyDataSetParameterResponse,
-      sizeof(struct __ns1__modifyDataSetParameterResponse), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__modifyDataSetParameterResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifyDataSetParameterResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -103106,7 +103398,7 @@ soap_in___ns1__modifyDataSetParameterResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -103127,7 +103419,7 @@ soap_get___ns1__modifyDataSetParameterResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifyDataSetParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -103143,10 +103435,10 @@ soap_instantiate___ns1__modifyDataSetParameterResponse(struct soap *soap, int n,
                               "modifyDataSetParameterResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__modifyDataSetParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__modifyDataSetParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifyDataSetParameterResponse);
     if (size)
@@ -103186,7 +103478,7 @@ soap_default___ns1__modifyDataSet(struct soap *soap,
                                   struct __ns1__modifyDataSet *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifyDataSet_ = NULL;
+  a->ns1__modifyDataSet_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -103220,9 +103512,9 @@ soap_in___ns1__modifyDataSet(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__modifyDataSet *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifyDataSet,
-      sizeof(struct __ns1__modifyDataSet), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifyDataSet), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifyDataSet(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -103241,7 +103533,7 @@ soap_in___ns1__modifyDataSet(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -103262,7 +103554,7 @@ soap_get___ns1__modifyDataSet(struct soap *soap, struct __ns1__modifyDataSet *p,
                               const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifyDataSet(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -103277,9 +103569,9 @@ soap_instantiate___ns1__modifyDataSet(struct soap *soap, int n,
                       "soap_instantiate___ns1__modifyDataSet(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__modifyDataSet, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__modifyDataSet, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifyDataSet);
     if (size)
@@ -103313,7 +103605,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__modifyDataSetResponse(
     struct soap *soap, struct __ns1__modifyDataSetResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifyDataSetResponse_ = NULL;
+  a->ns1__modifyDataSetResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__modifyDataSetResponse(
@@ -103350,9 +103642,10 @@ soap_in___ns1__modifyDataSetResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__modifyDataSetResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifyDataSetResponse,
-      sizeof(struct __ns1__modifyDataSetResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifyDataSetResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifyDataSetResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -103373,7 +103666,7 @@ soap_in___ns1__modifyDataSetResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -103394,7 +103687,7 @@ soap_get___ns1__modifyDataSetResponse(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifyDataSetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -103411,10 +103704,10 @@ soap_instantiate___ns1__modifyDataSetResponse(struct soap *soap, int n,
              "soap_instantiate___ns1__modifyDataSetResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__modifyDataSetResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__modifyDataSetResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifyDataSetResponse);
     if (size)
@@ -103451,7 +103744,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__deleteDataSetParameter(
     struct soap *soap, struct __ns1__deleteDataSetParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteDataSetParameter_ = NULL;
+  a->ns1__deleteDataSetParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteDataSetParameter(
@@ -103486,9 +103779,10 @@ soap_in___ns1__deleteDataSetParameter(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteDataSetParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteDataSetParameter,
-      sizeof(struct __ns1__deleteDataSetParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteDataSetParameter), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteDataSetParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -103508,7 +103802,7 @@ soap_in___ns1__deleteDataSetParameter(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -103529,7 +103823,7 @@ soap_get___ns1__deleteDataSetParameter(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteDataSetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -103546,10 +103840,10 @@ soap_instantiate___ns1__deleteDataSetParameter(struct soap *soap, int n,
              "soap_instantiate___ns1__deleteDataSetParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__deleteDataSetParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteDataSetParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteDataSetParameter);
     if (size)
@@ -103586,7 +103880,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__deleteDataSetParameterResponse(
     struct soap *soap, struct __ns1__deleteDataSetParameterResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteDataSetParameterResponse_ = NULL;
+  a->ns1__deleteDataSetParameterResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteDataSetParameterResponse(
@@ -103623,10 +103917,10 @@ soap_in___ns1__deleteDataSetParameterResponse(
   short soap_flag;
   a = (struct __ns1__deleteDataSetParameterResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteDataSetParameterResponse,
-      sizeof(struct __ns1__deleteDataSetParameterResponse), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__deleteDataSetParameterResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteDataSetParameterResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -103648,7 +103942,7 @@ soap_in___ns1__deleteDataSetParameterResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -103669,7 +103963,7 @@ soap_get___ns1__deleteDataSetParameterResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteDataSetParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -103685,10 +103979,10 @@ soap_instantiate___ns1__deleteDataSetParameterResponse(struct soap *soap, int n,
                               "deleteDataSetParameterResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__deleteDataSetParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteDataSetParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteDataSetParameterResponse);
     if (size)
@@ -103728,7 +104022,7 @@ soap_default___ns1__deleteDataSet(struct soap *soap,
                                   struct __ns1__deleteDataSet *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteDataSet_ = NULL;
+  a->ns1__deleteDataSet_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -103762,9 +104056,9 @@ soap_in___ns1__deleteDataSet(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteDataSet *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteDataSet,
-      sizeof(struct __ns1__deleteDataSet), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteDataSet), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteDataSet(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -103783,7 +104077,7 @@ soap_in___ns1__deleteDataSet(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -103804,7 +104098,7 @@ soap_get___ns1__deleteDataSet(struct soap *soap, struct __ns1__deleteDataSet *p,
                               const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteDataSet(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -103819,9 +104113,9 @@ soap_instantiate___ns1__deleteDataSet(struct soap *soap, int n,
                       "soap_instantiate___ns1__deleteDataSet(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__deleteDataSet, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteDataSet, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteDataSet);
     if (size)
@@ -103855,7 +104149,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__deleteDataSetResponse(
     struct soap *soap, struct __ns1__deleteDataSetResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteDataSetResponse_ = NULL;
+  a->ns1__deleteDataSetResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteDataSetResponse(
@@ -103892,9 +104186,10 @@ soap_in___ns1__deleteDataSetResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteDataSetResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteDataSetResponse,
-      sizeof(struct __ns1__deleteDataSetResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteDataSetResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteDataSetResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -103915,7 +104210,7 @@ soap_in___ns1__deleteDataSetResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -103936,7 +104231,7 @@ soap_get___ns1__deleteDataSetResponse(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteDataSetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -103953,10 +104248,10 @@ soap_instantiate___ns1__deleteDataSetResponse(struct soap *soap, int n,
              "soap_instantiate___ns1__deleteDataSetResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__deleteDataSetResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteDataSetResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteDataSetResponse);
     if (size)
@@ -103994,7 +104289,7 @@ soap_default___ns1__createDataSets(struct soap *soap,
                                    struct __ns1__createDataSets *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__createDataSets_ = NULL;
+  a->ns1__createDataSets_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -104029,9 +104324,9 @@ soap_in___ns1__createDataSets(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__createDataSets *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__createDataSets,
-      sizeof(struct __ns1__createDataSets), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__createDataSets), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__createDataSets(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -104050,7 +104345,7 @@ soap_in___ns1__createDataSets(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -104072,7 +104367,7 @@ soap_get___ns1__createDataSets(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__createDataSets(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -104087,9 +104382,9 @@ soap_instantiate___ns1__createDataSets(struct soap *soap, int n,
                       "soap_instantiate___ns1__createDataSets(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__createDataSets, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__createDataSets, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__createDataSets);
     if (size)
@@ -104124,7 +104419,7 @@ soap_default___ns1__createDataSet(struct soap *soap,
                                   struct __ns1__createDataSet *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__createDataSet_ = NULL;
+  a->ns1__createDataSet_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -104158,9 +104453,9 @@ soap_in___ns1__createDataSet(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__createDataSet *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__createDataSet,
-      sizeof(struct __ns1__createDataSet), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__createDataSet), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__createDataSet(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -104179,7 +104474,7 @@ soap_in___ns1__createDataSet(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -104200,7 +104495,7 @@ soap_get___ns1__createDataSet(struct soap *soap, struct __ns1__createDataSet *p,
                               const char *tag, const char *type) {
   if ((p = soap_in___ns1__createDataSet(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -104215,9 +104510,9 @@ soap_instantiate___ns1__createDataSet(struct soap *soap, int n,
                       "soap_instantiate___ns1__createDataSet(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__createDataSet, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__createDataSet, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__createDataSet);
     if (size)
@@ -104252,7 +104547,7 @@ soap_default___ns1__getDatasets(struct soap *soap,
                                 struct __ns1__getDatasets *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getDatasets_ = NULL;
+  a->ns1__getDatasets_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -104286,9 +104581,9 @@ soap_in___ns1__getDatasets(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getDatasets *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getDatasets,
-      sizeof(struct __ns1__getDatasets), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getDatasets), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getDatasets(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -104307,7 +104602,7 @@ soap_in___ns1__getDatasets(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -104328,7 +104623,7 @@ soap_get___ns1__getDatasets(struct soap *soap, struct __ns1__getDatasets *p,
                             const char *tag, const char *type) {
   if ((p = soap_in___ns1__getDatasets(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -104341,9 +104636,9 @@ soap_instantiate___ns1__getDatasets(struct soap *soap, int n, const char *type,
                             "soap_instantiate___ns1__getDatasets(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getDatasets, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__getDatasets, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getDatasets);
     if (size)
@@ -104378,7 +104673,7 @@ soap_default___ns1__getDatasetIncludes(struct soap *soap,
                                        struct __ns1__getDatasetIncludes *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getDatasetIncludes_ = NULL;
+  a->ns1__getDatasetIncludes_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getDatasetIncludes(
@@ -104413,9 +104708,9 @@ soap_in___ns1__getDatasetIncludes(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getDatasetIncludes *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getDatasetIncludes,
-      sizeof(struct __ns1__getDatasetIncludes), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getDatasetIncludes), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getDatasetIncludes(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -104434,7 +104729,7 @@ soap_in___ns1__getDatasetIncludes(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -104456,7 +104751,7 @@ soap_get___ns1__getDatasetIncludes(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in___ns1__getDatasetIncludes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -104471,10 +104766,11 @@ soap_instantiate___ns1__getDatasetIncludes(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate___ns1__getDatasetIncludes(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getDatasetIncludes, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getDatasetIncludes, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getDatasetIncludes);
     if (size)
@@ -104510,7 +104806,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__getDataset(struct soap *soap, struct __ns1__getDataset *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getDataset_ = NULL;
+  a->ns1__getDataset_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -104544,9 +104840,9 @@ soap_in___ns1__getDataset(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getDataset *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getDataset,
-      sizeof(struct __ns1__getDataset), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getDataset), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getDataset(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -104564,7 +104860,7 @@ soap_in___ns1__getDataset(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -104584,7 +104880,7 @@ soap_get___ns1__getDataset(struct soap *soap, struct __ns1__getDataset *p,
                            const char *tag, const char *type) {
   if ((p = soap_in___ns1__getDataset(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -104597,9 +104893,9 @@ soap_instantiate___ns1__getDataset(struct soap *soap, int n, const char *type,
                             "soap_instantiate___ns1__getDataset(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getDataset, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__getDataset, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getDataset);
     if (size)
@@ -104633,7 +104929,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__removeSampleParameter(
     struct soap *soap, struct __ns1__removeSampleParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeSampleParameter_ = NULL;
+  a->ns1__removeSampleParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeSampleParameter(
@@ -104668,9 +104964,10 @@ soap_in___ns1__removeSampleParameter(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removeSampleParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeSampleParameter,
-      sizeof(struct __ns1__removeSampleParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeSampleParameter), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeSampleParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -104690,7 +104987,7 @@ soap_in___ns1__removeSampleParameter(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -104711,7 +105008,7 @@ soap_get___ns1__removeSampleParameter(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeSampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -104728,10 +105025,10 @@ soap_instantiate___ns1__removeSampleParameter(struct soap *soap, int n,
              "soap_instantiate___ns1__removeSampleParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__removeSampleParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__removeSampleParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeSampleParameter);
     if (size)
@@ -104768,7 +105065,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__removeSampleParameterResponse(
     struct soap *soap, struct __ns1__removeSampleParameterResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeSampleParameterResponse_ = NULL;
+  a->ns1__removeSampleParameterResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeSampleParameterResponse(
@@ -104805,9 +105102,10 @@ soap_in___ns1__removeSampleParameterResponse(
   short soap_flag;
   a = (struct __ns1__removeSampleParameterResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeSampleParameterResponse,
-      sizeof(struct __ns1__removeSampleParameterResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeSampleParameterResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeSampleParameterResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -104829,7 +105127,7 @@ soap_in___ns1__removeSampleParameterResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -104850,7 +105148,7 @@ soap_get___ns1__removeSampleParameterResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeSampleParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -104868,10 +105166,10 @@ soap_instantiate___ns1__removeSampleParameterResponse(struct soap *soap, int n,
           "soap_instantiate___ns1__removeSampleParameterResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__removeSampleParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__removeSampleParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeSampleParameterResponse);
     if (size)
@@ -104911,7 +105209,7 @@ soap_default___ns1__removeSample(struct soap *soap,
                                  struct __ns1__removeSample *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeSample_ = NULL;
+  a->ns1__removeSample_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -104945,9 +105243,9 @@ soap_in___ns1__removeSample(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removeSample *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeSample,
-      sizeof(struct __ns1__removeSample), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeSample), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeSample(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -104966,7 +105264,7 @@ soap_in___ns1__removeSample(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -104987,7 +105285,7 @@ soap_get___ns1__removeSample(struct soap *soap, struct __ns1__removeSample *p,
                              const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeSample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -105000,9 +105298,9 @@ soap_instantiate___ns1__removeSample(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate___ns1__removeSample(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__removeSample, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__removeSample, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeSample);
     if (size)
@@ -105036,7 +105334,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__removeSampleResponse(
     struct soap *soap, struct __ns1__removeSampleResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeSampleResponse_ = NULL;
+  a->ns1__removeSampleResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeSampleResponse(
@@ -105073,9 +105371,9 @@ soap_in___ns1__removeSampleResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removeSampleResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeSampleResponse,
-      sizeof(struct __ns1__removeSampleResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeSampleResponse), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeSampleResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -105096,7 +105394,7 @@ soap_in___ns1__removeSampleResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -105117,7 +105415,7 @@ soap_get___ns1__removeSampleResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeSampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -105133,10 +105431,10 @@ soap_instantiate___ns1__removeSampleResponse(struct soap *soap, int n,
                    "soap_instantiate___ns1__removeSampleResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__removeSampleResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__removeSampleResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeSampleResponse);
     if (size)
@@ -105174,7 +105472,7 @@ soap_default___ns1__removePublication(struct soap *soap,
                                       struct __ns1__removePublication *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removePublication_ = NULL;
+  a->ns1__removePublication_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removePublication(
@@ -105209,9 +105507,9 @@ soap_in___ns1__removePublication(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removePublication *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removePublication,
-      sizeof(struct __ns1__removePublication), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removePublication), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removePublication(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -105230,7 +105528,7 @@ soap_in___ns1__removePublication(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -105252,7 +105550,7 @@ soap_get___ns1__removePublication(struct soap *soap,
                                   const char *tag, const char *type) {
   if ((p = soap_in___ns1__removePublication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -105266,10 +105564,11 @@ soap_instantiate___ns1__removePublication(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate___ns1__removePublication(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__removePublication, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__removePublication, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removePublication);
     if (size)
@@ -105303,7 +105602,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__removePublicationResponse(
     struct soap *soap, struct __ns1__removePublicationResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removePublicationResponse_ = NULL;
+  a->ns1__removePublicationResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removePublicationResponse(
@@ -105340,9 +105639,10 @@ soap_in___ns1__removePublicationResponse(
   short soap_flag;
   a = (struct __ns1__removePublicationResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removePublicationResponse,
-      sizeof(struct __ns1__removePublicationResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removePublicationResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removePublicationResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -105364,7 +105664,7 @@ soap_in___ns1__removePublicationResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -105385,7 +105685,7 @@ soap_get___ns1__removePublicationResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__removePublicationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -105402,10 +105702,10 @@ soap_instantiate___ns1__removePublicationResponse(struct soap *soap, int n,
              "soap_instantiate___ns1__removePublicationResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__removePublicationResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__removePublicationResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removePublicationResponse);
     if (size)
@@ -105444,7 +105744,7 @@ soap_default___ns1__removeInvestigator(struct soap *soap,
                                        struct __ns1__removeInvestigator *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeInvestigator_ = NULL;
+  a->ns1__removeInvestigator_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeInvestigator(
@@ -105479,9 +105779,9 @@ soap_in___ns1__removeInvestigator(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removeInvestigator *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeInvestigator,
-      sizeof(struct __ns1__removeInvestigator), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeInvestigator), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeInvestigator(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -105500,7 +105800,7 @@ soap_in___ns1__removeInvestigator(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -105522,7 +105822,7 @@ soap_get___ns1__removeInvestigator(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeInvestigator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -105537,10 +105837,11 @@ soap_instantiate___ns1__removeInvestigator(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate___ns1__removeInvestigator(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__removeInvestigator, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__removeInvestigator, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeInvestigator);
     if (size)
@@ -105576,7 +105877,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__removeInvestigatorResponse(
     struct soap *soap, struct __ns1__removeInvestigatorResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeInvestigatorResponse_ = NULL;
+  a->ns1__removeInvestigatorResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeInvestigatorResponse(
@@ -105613,9 +105914,10 @@ soap_in___ns1__removeInvestigatorResponse(
   short soap_flag;
   a = (struct __ns1__removeInvestigatorResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeInvestigatorResponse,
-      sizeof(struct __ns1__removeInvestigatorResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeInvestigatorResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeInvestigatorResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -105637,7 +105939,7 @@ soap_in___ns1__removeInvestigatorResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -105658,7 +105960,7 @@ soap_get___ns1__removeInvestigatorResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeInvestigatorResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -105674,11 +105976,11 @@ soap_instantiate___ns1__removeInvestigatorResponse(struct soap *soap, int n,
              fdebug,
              "soap_instantiate___ns1__removeInvestigatorResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__removeInvestigatorResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__removeInvestigatorResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeInvestigatorResponse);
     if (size)
@@ -105718,7 +106020,7 @@ soap_default___ns1__removeKeyword(struct soap *soap,
                                   struct __ns1__removeKeyword *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeKeyword_ = NULL;
+  a->ns1__removeKeyword_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -105752,9 +106054,9 @@ soap_in___ns1__removeKeyword(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removeKeyword *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeKeyword,
-      sizeof(struct __ns1__removeKeyword), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeKeyword), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeKeyword(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -105773,7 +106075,7 @@ soap_in___ns1__removeKeyword(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -105794,7 +106096,7 @@ soap_get___ns1__removeKeyword(struct soap *soap, struct __ns1__removeKeyword *p,
                               const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeKeyword(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -105809,9 +106111,9 @@ soap_instantiate___ns1__removeKeyword(struct soap *soap, int n,
                       "soap_instantiate___ns1__removeKeyword(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__removeKeyword, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__removeKeyword, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeKeyword);
     if (size)
@@ -105845,7 +106147,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__removeKeywordResponse(
     struct soap *soap, struct __ns1__removeKeywordResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeKeywordResponse_ = NULL;
+  a->ns1__removeKeywordResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeKeywordResponse(
@@ -105882,9 +106184,10 @@ soap_in___ns1__removeKeywordResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removeKeywordResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeKeywordResponse,
-      sizeof(struct __ns1__removeKeywordResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeKeywordResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeKeywordResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -105905,7 +106208,7 @@ soap_in___ns1__removeKeywordResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -105926,7 +106229,7 @@ soap_get___ns1__removeKeywordResponse(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeKeywordResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -105943,10 +106246,10 @@ soap_instantiate___ns1__removeKeywordResponse(struct soap *soap, int n,
              "soap_instantiate___ns1__removeKeywordResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__removeKeywordResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__removeKeywordResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeKeywordResponse);
     if (size)
@@ -105983,7 +106286,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__modifySampleParameter(
     struct soap *soap, struct __ns1__modifySampleParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifySampleParameter_ = NULL;
+  a->ns1__modifySampleParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__modifySampleParameter(
@@ -106018,9 +106321,10 @@ soap_in___ns1__modifySampleParameter(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__modifySampleParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifySampleParameter,
-      sizeof(struct __ns1__modifySampleParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifySampleParameter), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifySampleParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -106040,7 +106344,7 @@ soap_in___ns1__modifySampleParameter(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -106061,7 +106365,7 @@ soap_get___ns1__modifySampleParameter(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifySampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -106078,10 +106382,10 @@ soap_instantiate___ns1__modifySampleParameter(struct soap *soap, int n,
              "soap_instantiate___ns1__modifySampleParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__modifySampleParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__modifySampleParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifySampleParameter);
     if (size)
@@ -106118,7 +106422,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__modifySampleParameterResponse(
     struct soap *soap, struct __ns1__modifySampleParameterResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifySampleParameterResponse_ = NULL;
+  a->ns1__modifySampleParameterResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__modifySampleParameterResponse(
@@ -106155,9 +106459,10 @@ soap_in___ns1__modifySampleParameterResponse(
   short soap_flag;
   a = (struct __ns1__modifySampleParameterResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifySampleParameterResponse,
-      sizeof(struct __ns1__modifySampleParameterResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifySampleParameterResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifySampleParameterResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -106179,7 +106484,7 @@ soap_in___ns1__modifySampleParameterResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -106200,7 +106505,7 @@ soap_get___ns1__modifySampleParameterResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifySampleParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -106218,10 +106523,10 @@ soap_instantiate___ns1__modifySampleParameterResponse(struct soap *soap, int n,
           "soap_instantiate___ns1__modifySampleParameterResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__modifySampleParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__modifySampleParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifySampleParameterResponse);
     if (size)
@@ -106261,7 +106566,7 @@ soap_default___ns1__modifyPublication(struct soap *soap,
                                       struct __ns1__modifyPublication *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifyPublication_ = NULL;
+  a->ns1__modifyPublication_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__modifyPublication(
@@ -106296,9 +106601,9 @@ soap_in___ns1__modifyPublication(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__modifyPublication *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifyPublication,
-      sizeof(struct __ns1__modifyPublication), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifyPublication), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifyPublication(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -106317,7 +106622,7 @@ soap_in___ns1__modifyPublication(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -106339,7 +106644,7 @@ soap_get___ns1__modifyPublication(struct soap *soap,
                                   const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifyPublication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -106353,10 +106658,11 @@ soap_instantiate___ns1__modifyPublication(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate___ns1__modifyPublication(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__modifyPublication, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__modifyPublication, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifyPublication);
     if (size)
@@ -106390,7 +106696,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__modifyPublicationResponse(
     struct soap *soap, struct __ns1__modifyPublicationResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifyPublicationResponse_ = NULL;
+  a->ns1__modifyPublicationResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__modifyPublicationResponse(
@@ -106427,9 +106733,10 @@ soap_in___ns1__modifyPublicationResponse(
   short soap_flag;
   a = (struct __ns1__modifyPublicationResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifyPublicationResponse,
-      sizeof(struct __ns1__modifyPublicationResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifyPublicationResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifyPublicationResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -106451,7 +106758,7 @@ soap_in___ns1__modifyPublicationResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -106472,7 +106779,7 @@ soap_get___ns1__modifyPublicationResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifyPublicationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -106489,10 +106796,10 @@ soap_instantiate___ns1__modifyPublicationResponse(struct soap *soap, int n,
              "soap_instantiate___ns1__modifyPublicationResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__modifyPublicationResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__modifyPublicationResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifyPublicationResponse);
     if (size)
@@ -106531,7 +106838,7 @@ soap_default___ns1__modifySample(struct soap *soap,
                                  struct __ns1__modifySample *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifySample_ = NULL;
+  a->ns1__modifySample_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -106565,9 +106872,9 @@ soap_in___ns1__modifySample(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__modifySample *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifySample,
-      sizeof(struct __ns1__modifySample), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifySample), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifySample(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -106586,7 +106893,7 @@ soap_in___ns1__modifySample(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -106607,7 +106914,7 @@ soap_get___ns1__modifySample(struct soap *soap, struct __ns1__modifySample *p,
                              const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifySample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -106620,9 +106927,9 @@ soap_instantiate___ns1__modifySample(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate___ns1__modifySample(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__modifySample, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__modifySample, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifySample);
     if (size)
@@ -106656,7 +106963,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__modifySampleResponse(
     struct soap *soap, struct __ns1__modifySampleResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifySampleResponse_ = NULL;
+  a->ns1__modifySampleResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__modifySampleResponse(
@@ -106693,9 +107000,9 @@ soap_in___ns1__modifySampleResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__modifySampleResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifySampleResponse,
-      sizeof(struct __ns1__modifySampleResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifySampleResponse), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifySampleResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -106716,7 +107023,7 @@ soap_in___ns1__modifySampleResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -106737,7 +107044,7 @@ soap_get___ns1__modifySampleResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifySampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -106753,10 +107060,10 @@ soap_instantiate___ns1__modifySampleResponse(struct soap *soap, int n,
                    "soap_instantiate___ns1__modifySampleResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__modifySampleResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__modifySampleResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifySampleResponse);
     if (size)
@@ -106794,7 +107101,7 @@ soap_default___ns1__modifyInvestigator(struct soap *soap,
                                        struct __ns1__modifyInvestigator *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifyInvestigator_ = NULL;
+  a->ns1__modifyInvestigator_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__modifyInvestigator(
@@ -106829,9 +107136,9 @@ soap_in___ns1__modifyInvestigator(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__modifyInvestigator *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifyInvestigator,
-      sizeof(struct __ns1__modifyInvestigator), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifyInvestigator), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifyInvestigator(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -106850,7 +107157,7 @@ soap_in___ns1__modifyInvestigator(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -106872,7 +107179,7 @@ soap_get___ns1__modifyInvestigator(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifyInvestigator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -106887,10 +107194,11 @@ soap_instantiate___ns1__modifyInvestigator(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate___ns1__modifyInvestigator(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__modifyInvestigator, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__modifyInvestigator, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifyInvestigator);
     if (size)
@@ -106926,7 +107234,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__modifyInvestigatorResponse(
     struct soap *soap, struct __ns1__modifyInvestigatorResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifyInvestigatorResponse_ = NULL;
+  a->ns1__modifyInvestigatorResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__modifyInvestigatorResponse(
@@ -106963,9 +107271,10 @@ soap_in___ns1__modifyInvestigatorResponse(
   short soap_flag;
   a = (struct __ns1__modifyInvestigatorResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifyInvestigatorResponse,
-      sizeof(struct __ns1__modifyInvestigatorResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifyInvestigatorResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifyInvestigatorResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -106987,7 +107296,7 @@ soap_in___ns1__modifyInvestigatorResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -107008,7 +107317,7 @@ soap_get___ns1__modifyInvestigatorResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifyInvestigatorResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -107024,11 +107333,11 @@ soap_instantiate___ns1__modifyInvestigatorResponse(struct soap *soap, int n,
              fdebug,
              "soap_instantiate___ns1__modifyInvestigatorResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__modifyInvestigatorResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__modifyInvestigatorResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifyInvestigatorResponse);
     if (size)
@@ -107068,7 +107377,7 @@ soap_default___ns1__modifyInvestigation(struct soap *soap,
                                         struct __ns1__modifyInvestigation *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifyInvestigation_ = NULL;
+  a->ns1__modifyInvestigation_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__modifyInvestigation(
@@ -107104,9 +107413,9 @@ soap_in___ns1__modifyInvestigation(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__modifyInvestigation *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifyInvestigation,
-      sizeof(struct __ns1__modifyInvestigation), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifyInvestigation), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifyInvestigation(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -107125,7 +107434,7 @@ soap_in___ns1__modifyInvestigation(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -107147,7 +107456,7 @@ soap_get___ns1__modifyInvestigation(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifyInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -107162,10 +107471,11 @@ soap_instantiate___ns1__modifyInvestigation(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__modifyInvestigation(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__modifyInvestigation, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__modifyInvestigation, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifyInvestigation);
     if (size)
@@ -107201,7 +107511,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__modifyInvestigationResponse(
     struct soap *soap, struct __ns1__modifyInvestigationResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__modifyInvestigationResponse_ = NULL;
+  a->ns1__modifyInvestigationResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__modifyInvestigationResponse(
@@ -107238,9 +107548,10 @@ soap_in___ns1__modifyInvestigationResponse(
   short soap_flag;
   a = (struct __ns1__modifyInvestigationResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__modifyInvestigationResponse,
-      sizeof(struct __ns1__modifyInvestigationResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__modifyInvestigationResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__modifyInvestigationResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -107262,7 +107573,7 @@ soap_in___ns1__modifyInvestigationResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -107283,7 +107594,7 @@ soap_get___ns1__modifyInvestigationResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__modifyInvestigationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -107300,11 +107611,11 @@ soap_instantiate___ns1__modifyInvestigationResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate___ns1__modifyInvestigationResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__modifyInvestigationResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__modifyInvestigationResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__modifyInvestigationResponse);
     if (size)
@@ -107343,7 +107654,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__deleteSampleParameter(
     struct soap *soap, struct __ns1__deleteSampleParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteSampleParameter_ = NULL;
+  a->ns1__deleteSampleParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteSampleParameter(
@@ -107378,9 +107689,10 @@ soap_in___ns1__deleteSampleParameter(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteSampleParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteSampleParameter,
-      sizeof(struct __ns1__deleteSampleParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteSampleParameter), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteSampleParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -107400,7 +107712,7 @@ soap_in___ns1__deleteSampleParameter(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -107421,7 +107733,7 @@ soap_get___ns1__deleteSampleParameter(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteSampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -107438,10 +107750,10 @@ soap_instantiate___ns1__deleteSampleParameter(struct soap *soap, int n,
              "soap_instantiate___ns1__deleteSampleParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__deleteSampleParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteSampleParameter, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteSampleParameter);
     if (size)
@@ -107478,7 +107790,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__deleteSampleParameterResponse(
     struct soap *soap, struct __ns1__deleteSampleParameterResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteSampleParameterResponse_ = NULL;
+  a->ns1__deleteSampleParameterResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteSampleParameterResponse(
@@ -107515,9 +107827,10 @@ soap_in___ns1__deleteSampleParameterResponse(
   short soap_flag;
   a = (struct __ns1__deleteSampleParameterResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteSampleParameterResponse,
-      sizeof(struct __ns1__deleteSampleParameterResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteSampleParameterResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteSampleParameterResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -107539,7 +107852,7 @@ soap_in___ns1__deleteSampleParameterResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -107560,7 +107873,7 @@ soap_get___ns1__deleteSampleParameterResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteSampleParameterResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -107578,10 +107891,10 @@ soap_instantiate___ns1__deleteSampleParameterResponse(struct soap *soap, int n,
           "soap_instantiate___ns1__deleteSampleParameterResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__deleteSampleParameterResponse, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteSampleParameterResponse, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteSampleParameterResponse);
     if (size)
@@ -107621,7 +107934,7 @@ soap_default___ns1__deleteSample(struct soap *soap,
                                  struct __ns1__deleteSample *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteSample_ = NULL;
+  a->ns1__deleteSample_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -107655,9 +107968,9 @@ soap_in___ns1__deleteSample(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteSample *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteSample,
-      sizeof(struct __ns1__deleteSample), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteSample), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteSample(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -107676,7 +107989,7 @@ soap_in___ns1__deleteSample(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -107697,7 +108010,7 @@ soap_get___ns1__deleteSample(struct soap *soap, struct __ns1__deleteSample *p,
                              const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteSample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -107710,9 +108023,9 @@ soap_instantiate___ns1__deleteSample(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate___ns1__deleteSample(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__deleteSample, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteSample, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteSample);
     if (size)
@@ -107746,7 +108059,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__deleteSampleResponse(
     struct soap *soap, struct __ns1__deleteSampleResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteSampleResponse_ = NULL;
+  a->ns1__deleteSampleResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteSampleResponse(
@@ -107783,9 +108096,9 @@ soap_in___ns1__deleteSampleResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteSampleResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteSampleResponse,
-      sizeof(struct __ns1__deleteSampleResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteSampleResponse), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteSampleResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -107806,7 +108119,7 @@ soap_in___ns1__deleteSampleResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -107827,7 +108140,7 @@ soap_get___ns1__deleteSampleResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteSampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -107843,10 +108156,10 @@ soap_instantiate___ns1__deleteSampleResponse(struct soap *soap, int n,
                    "soap_instantiate___ns1__deleteSampleResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__deleteSampleResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteSampleResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteSampleResponse);
     if (size)
@@ -107884,7 +108197,7 @@ soap_default___ns1__deletePublication(struct soap *soap,
                                       struct __ns1__deletePublication *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deletePublication_ = NULL;
+  a->ns1__deletePublication_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deletePublication(
@@ -107919,9 +108232,9 @@ soap_in___ns1__deletePublication(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deletePublication *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deletePublication,
-      sizeof(struct __ns1__deletePublication), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deletePublication), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deletePublication(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -107940,7 +108253,7 @@ soap_in___ns1__deletePublication(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -107962,7 +108275,7 @@ soap_get___ns1__deletePublication(struct soap *soap,
                                   const char *tag, const char *type) {
   if ((p = soap_in___ns1__deletePublication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -107976,10 +108289,11 @@ soap_instantiate___ns1__deletePublication(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate___ns1__deletePublication(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__deletePublication, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__deletePublication, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deletePublication);
     if (size)
@@ -108013,7 +108327,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__deletePublicationResponse(
     struct soap *soap, struct __ns1__deletePublicationResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deletePublicationResponse_ = NULL;
+  a->ns1__deletePublicationResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deletePublicationResponse(
@@ -108050,9 +108364,10 @@ soap_in___ns1__deletePublicationResponse(
   short soap_flag;
   a = (struct __ns1__deletePublicationResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deletePublicationResponse,
-      sizeof(struct __ns1__deletePublicationResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deletePublicationResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deletePublicationResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -108074,7 +108389,7 @@ soap_in___ns1__deletePublicationResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -108095,7 +108410,7 @@ soap_get___ns1__deletePublicationResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__deletePublicationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -108112,10 +108427,10 @@ soap_instantiate___ns1__deletePublicationResponse(struct soap *soap, int n,
              "soap_instantiate___ns1__deletePublicationResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__deletePublicationResponse, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__deletePublicationResponse,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deletePublicationResponse);
     if (size)
@@ -108154,7 +108469,7 @@ soap_default___ns1__deleteKeyword(struct soap *soap,
                                   struct __ns1__deleteKeyword *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteKeyword_ = NULL;
+  a->ns1__deleteKeyword_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -108188,9 +108503,9 @@ soap_in___ns1__deleteKeyword(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteKeyword *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteKeyword,
-      sizeof(struct __ns1__deleteKeyword), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteKeyword), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteKeyword(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -108209,7 +108524,7 @@ soap_in___ns1__deleteKeyword(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -108230,7 +108545,7 @@ soap_get___ns1__deleteKeyword(struct soap *soap, struct __ns1__deleteKeyword *p,
                               const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteKeyword(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -108245,9 +108560,9 @@ soap_instantiate___ns1__deleteKeyword(struct soap *soap, int n,
                       "soap_instantiate___ns1__deleteKeyword(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__deleteKeyword, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteKeyword, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteKeyword);
     if (size)
@@ -108281,7 +108596,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__deleteKeywordResponse(
     struct soap *soap, struct __ns1__deleteKeywordResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteKeywordResponse_ = NULL;
+  a->ns1__deleteKeywordResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteKeywordResponse(
@@ -108318,9 +108633,10 @@ soap_in___ns1__deleteKeywordResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteKeywordResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteKeywordResponse,
-      sizeof(struct __ns1__deleteKeywordResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteKeywordResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteKeywordResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -108341,7 +108657,7 @@ soap_in___ns1__deleteKeywordResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -108362,7 +108678,7 @@ soap_get___ns1__deleteKeywordResponse(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteKeywordResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -108379,10 +108695,10 @@ soap_instantiate___ns1__deleteKeywordResponse(struct soap *soap, int n,
              "soap_instantiate___ns1__deleteKeywordResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__deleteKeywordResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteKeywordResponse, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteKeywordResponse);
     if (size)
@@ -108420,7 +108736,7 @@ soap_default___ns1__deleteInvestigator(struct soap *soap,
                                        struct __ns1__deleteInvestigator *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteInvestigator_ = NULL;
+  a->ns1__deleteInvestigator_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteInvestigator(
@@ -108455,9 +108771,9 @@ soap_in___ns1__deleteInvestigator(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteInvestigator *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteInvestigator,
-      sizeof(struct __ns1__deleteInvestigator), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteInvestigator), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteInvestigator(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -108476,7 +108792,7 @@ soap_in___ns1__deleteInvestigator(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -108498,7 +108814,7 @@ soap_get___ns1__deleteInvestigator(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteInvestigator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -108513,10 +108829,11 @@ soap_instantiate___ns1__deleteInvestigator(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate___ns1__deleteInvestigator(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__deleteInvestigator, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteInvestigator, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteInvestigator);
     if (size)
@@ -108552,7 +108869,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__deleteInvestigatorResponse(
     struct soap *soap, struct __ns1__deleteInvestigatorResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteInvestigatorResponse_ = NULL;
+  a->ns1__deleteInvestigatorResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteInvestigatorResponse(
@@ -108589,9 +108906,10 @@ soap_in___ns1__deleteInvestigatorResponse(
   short soap_flag;
   a = (struct __ns1__deleteInvestigatorResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteInvestigatorResponse,
-      sizeof(struct __ns1__deleteInvestigatorResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteInvestigatorResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteInvestigatorResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -108613,7 +108931,7 @@ soap_in___ns1__deleteInvestigatorResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -108634,7 +108952,7 @@ soap_get___ns1__deleteInvestigatorResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteInvestigatorResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -108650,11 +108968,11 @@ soap_instantiate___ns1__deleteInvestigatorResponse(struct soap *soap, int n,
              fdebug,
              "soap_instantiate___ns1__deleteInvestigatorResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__deleteInvestigatorResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteInvestigatorResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteInvestigatorResponse);
     if (size)
@@ -108694,7 +109012,7 @@ soap_default___ns1__addSampleParameter(struct soap *soap,
                                        struct __ns1__addSampleParameter *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__addSampleParameter_ = NULL;
+  a->ns1__addSampleParameter_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__addSampleParameter(
@@ -108729,9 +109047,9 @@ soap_in___ns1__addSampleParameter(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__addSampleParameter *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__addSampleParameter,
-      sizeof(struct __ns1__addSampleParameter), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__addSampleParameter), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__addSampleParameter(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -108750,7 +109068,7 @@ soap_in___ns1__addSampleParameter(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -108772,7 +109090,7 @@ soap_get___ns1__addSampleParameter(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in___ns1__addSampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -108787,10 +109105,11 @@ soap_instantiate___ns1__addSampleParameter(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate___ns1__addSampleParameter(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__addSampleParameter, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__addSampleParameter, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__addSampleParameter);
     if (size)
@@ -108827,7 +109146,7 @@ soap_default___ns1__addPublication(struct soap *soap,
                                    struct __ns1__addPublication *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__addPublication_ = NULL;
+  a->ns1__addPublication_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -108862,9 +109181,9 @@ soap_in___ns1__addPublication(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__addPublication *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__addPublication,
-      sizeof(struct __ns1__addPublication), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__addPublication), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__addPublication(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -108883,7 +109202,7 @@ soap_in___ns1__addPublication(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -108905,7 +109224,7 @@ soap_get___ns1__addPublication(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__addPublication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -108920,9 +109239,9 @@ soap_instantiate___ns1__addPublication(struct soap *soap, int n,
                       "soap_instantiate___ns1__addPublication(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__addPublication, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__addPublication, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__addPublication);
     if (size)
@@ -108956,7 +109275,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__addSample(struct soap *soap, struct __ns1__addSample *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__addSample_ = NULL;
+  a->ns1__addSample_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -108989,9 +109308,9 @@ soap_in___ns1__addSample(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__addSample *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__addSample,
-      sizeof(struct __ns1__addSample), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__addSample), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__addSample(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -109009,7 +109328,7 @@ soap_in___ns1__addSample(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -109029,7 +109348,7 @@ soap_get___ns1__addSample(struct soap *soap, struct __ns1__addSample *p,
                           const char *tag, const char *type) {
   if ((p = soap_in___ns1__addSample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -109041,10 +109360,10 @@ soap_instantiate___ns1__addSample(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate___ns1__addSample(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__addSample, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__addSample, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__addSample);
     if (size)
@@ -109078,7 +109397,7 @@ soap_default___ns1__addInvestigator(struct soap *soap,
                                     struct __ns1__addInvestigator *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__addInvestigator_ = NULL;
+  a->ns1__addInvestigator_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -109113,9 +109432,9 @@ soap_in___ns1__addInvestigator(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__addInvestigator *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__addInvestigator,
-      sizeof(struct __ns1__addInvestigator), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__addInvestigator), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__addInvestigator(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -109134,7 +109453,7 @@ soap_in___ns1__addInvestigator(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -109156,7 +109475,7 @@ soap_get___ns1__addInvestigator(struct soap *soap,
                                 const char *tag, const char *type) {
   if ((p = soap_in___ns1__addInvestigator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -109171,9 +109490,9 @@ soap_instantiate___ns1__addInvestigator(struct soap *soap, int n,
                       "soap_instantiate___ns1__addInvestigator(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__addInvestigator, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__addInvestigator, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__addInvestigator);
     if (size)
@@ -109207,7 +109526,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__addKeyword(struct soap *soap, struct __ns1__addKeyword *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__addKeyword_ = NULL;
+  a->ns1__addKeyword_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -109241,9 +109560,9 @@ soap_in___ns1__addKeyword(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__addKeyword *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__addKeyword,
-      sizeof(struct __ns1__addKeyword), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__addKeyword), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__addKeyword(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -109261,7 +109580,7 @@ soap_in___ns1__addKeyword(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -109281,7 +109600,7 @@ soap_get___ns1__addKeyword(struct soap *soap, struct __ns1__addKeyword *p,
                            const char *tag, const char *type) {
   if ((p = soap_in___ns1__addKeyword(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -109294,9 +109613,9 @@ soap_instantiate___ns1__addKeyword(struct soap *soap, int n, const char *type,
                             "soap_instantiate___ns1__addKeyword(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__addKeyword, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__addKeyword, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__addKeyword);
     if (size)
@@ -109331,7 +109650,7 @@ soap_default___ns1__removeInvestigation(struct soap *soap,
                                         struct __ns1__removeInvestigation *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeInvestigation_ = NULL;
+  a->ns1__removeInvestigation_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeInvestigation(
@@ -109367,9 +109686,9 @@ soap_in___ns1__removeInvestigation(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__removeInvestigation *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeInvestigation,
-      sizeof(struct __ns1__removeInvestigation), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeInvestigation), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeInvestigation(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -109388,7 +109707,7 @@ soap_in___ns1__removeInvestigation(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -109410,7 +109729,7 @@ soap_get___ns1__removeInvestigation(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -109425,10 +109744,11 @@ soap_instantiate___ns1__removeInvestigation(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__removeInvestigation(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__removeInvestigation, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__removeInvestigation, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeInvestigation);
     if (size)
@@ -109464,7 +109784,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__removeInvestigationResponse(
     struct soap *soap, struct __ns1__removeInvestigationResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__removeInvestigationResponse_ = NULL;
+  a->ns1__removeInvestigationResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__removeInvestigationResponse(
@@ -109501,9 +109821,10 @@ soap_in___ns1__removeInvestigationResponse(
   short soap_flag;
   a = (struct __ns1__removeInvestigationResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__removeInvestigationResponse,
-      sizeof(struct __ns1__removeInvestigationResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__removeInvestigationResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__removeInvestigationResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -109525,7 +109846,7 @@ soap_in___ns1__removeInvestigationResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -109546,7 +109867,7 @@ soap_get___ns1__removeInvestigationResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__removeInvestigationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -109563,11 +109884,11 @@ soap_instantiate___ns1__removeInvestigationResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate___ns1__removeInvestigationResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__removeInvestigationResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__removeInvestigationResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__removeInvestigationResponse);
     if (size)
@@ -109607,7 +109928,7 @@ soap_default___ns1__deleteInvestigation(struct soap *soap,
                                         struct __ns1__deleteInvestigation *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteInvestigation_ = NULL;
+  a->ns1__deleteInvestigation_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteInvestigation(
@@ -109643,9 +109964,9 @@ soap_in___ns1__deleteInvestigation(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteInvestigation *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteInvestigation,
-      sizeof(struct __ns1__deleteInvestigation), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteInvestigation), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteInvestigation(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -109664,7 +109985,7 @@ soap_in___ns1__deleteInvestigation(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -109686,7 +110007,7 @@ soap_get___ns1__deleteInvestigation(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -109701,10 +110022,11 @@ soap_instantiate___ns1__deleteInvestigation(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__deleteInvestigation(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__deleteInvestigation, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteInvestigation, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteInvestigation);
     if (size)
@@ -109740,7 +110062,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__deleteInvestigationResponse(
     struct soap *soap, struct __ns1__deleteInvestigationResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteInvestigationResponse_ = NULL;
+  a->ns1__deleteInvestigationResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteInvestigationResponse(
@@ -109777,9 +110099,10 @@ soap_in___ns1__deleteInvestigationResponse(
   short soap_flag;
   a = (struct __ns1__deleteInvestigationResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__deleteInvestigationResponse,
-      sizeof(struct __ns1__deleteInvestigationResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteInvestigationResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteInvestigationResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -109801,7 +110124,7 @@ soap_in___ns1__deleteInvestigationResponse(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -109822,7 +110145,7 @@ soap_get___ns1__deleteInvestigationResponse(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteInvestigationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -109839,11 +110162,11 @@ soap_instantiate___ns1__deleteInvestigationResponse(struct soap *soap, int n,
           fdebug,
           "soap_instantiate___ns1__deleteInvestigationResponse(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__deleteInvestigationResponse,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__deleteInvestigationResponse, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteInvestigationResponse);
     if (size)
@@ -109883,7 +110206,7 @@ soap_default___ns1__createInvestigation(struct soap *soap,
                                         struct __ns1__createInvestigation *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__createInvestigation_ = NULL;
+  a->ns1__createInvestigation_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__createInvestigation(
@@ -109919,9 +110242,9 @@ soap_in___ns1__createInvestigation(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__createInvestigation *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__createInvestigation,
-      sizeof(struct __ns1__createInvestigation), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__createInvestigation), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__createInvestigation(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -109940,7 +110263,7 @@ soap_in___ns1__createInvestigation(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -109962,7 +110285,7 @@ soap_get___ns1__createInvestigation(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__createInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -109977,10 +110300,11 @@ soap_instantiate___ns1__createInvestigation(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__createInvestigation(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__createInvestigation, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__createInvestigation, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__createInvestigation);
     if (size)
@@ -110016,7 +110340,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__getInvestigationsIncludes(
     struct soap *soap, struct __ns1__getInvestigationsIncludes *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getInvestigationsIncludes_ = NULL;
+  a->ns1__getInvestigationsIncludes_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getInvestigationsIncludes(
@@ -110051,9 +110375,10 @@ soap_in___ns1__getInvestigationsIncludes(
   short soap_flag;
   a = (struct __ns1__getInvestigationsIncludes *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getInvestigationsIncludes,
-      sizeof(struct __ns1__getInvestigationsIncludes), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getInvestigationsIncludes), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getInvestigationsIncludes(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -110074,7 +110399,7 @@ soap_in___ns1__getInvestigationsIncludes(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -110095,7 +110420,7 @@ soap_get___ns1__getInvestigationsIncludes(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__getInvestigationsIncludes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -110112,10 +110437,10 @@ soap_instantiate___ns1__getInvestigationsIncludes(struct soap *soap, int n,
              "soap_instantiate___ns1__getInvestigationsIncludes(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__getInvestigationsIncludes, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getInvestigationsIncludes,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getInvestigationsIncludes);
     if (size)
@@ -110154,7 +110479,7 @@ soap_default___ns1__getInvestigations(struct soap *soap,
                                       struct __ns1__getInvestigations *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getInvestigations_ = NULL;
+  a->ns1__getInvestigations_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getInvestigations(
@@ -110189,9 +110514,9 @@ soap_in___ns1__getInvestigations(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getInvestigations *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getInvestigations,
-      sizeof(struct __ns1__getInvestigations), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getInvestigations), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getInvestigations(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -110210,7 +110535,7 @@ soap_in___ns1__getInvestigations(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -110232,7 +110557,7 @@ soap_get___ns1__getInvestigations(struct soap *soap,
                                   const char *tag, const char *type) {
   if ((p = soap_in___ns1__getInvestigations(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -110246,10 +110571,11 @@ soap_instantiate___ns1__getInvestigations(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate___ns1__getInvestigations(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getInvestigations, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getInvestigations, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getInvestigations);
     if (size)
@@ -110283,7 +110609,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__getInvestigationIncludes(
     struct soap *soap, struct __ns1__getInvestigationIncludes *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getInvestigationIncludes_ = NULL;
+  a->ns1__getInvestigationIncludes_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getInvestigationIncludes(
@@ -110318,9 +110644,10 @@ soap_in___ns1__getInvestigationIncludes(
   short soap_flag;
   a = (struct __ns1__getInvestigationIncludes *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getInvestigationIncludes,
-      sizeof(struct __ns1__getInvestigationIncludes), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getInvestigationIncludes), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getInvestigationIncludes(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -110341,7 +110668,7 @@ soap_in___ns1__getInvestigationIncludes(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -110362,7 +110689,7 @@ soap_get___ns1__getInvestigationIncludes(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__getInvestigationIncludes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -110379,10 +110706,10 @@ soap_instantiate___ns1__getInvestigationIncludes(struct soap *soap, int n,
              "soap_instantiate___ns1__getInvestigationIncludes(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__getInvestigationIncludes, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getInvestigationIncludes,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getInvestigationIncludes);
     if (size)
@@ -110420,7 +110747,7 @@ soap_default___ns1__getInvestigation(struct soap *soap,
                                      struct __ns1__getInvestigation *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getInvestigation_ = NULL;
+  a->ns1__getInvestigation_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getInvestigation(
@@ -110455,9 +110782,9 @@ soap_in___ns1__getInvestigation(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getInvestigation *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getInvestigation,
-      sizeof(struct __ns1__getInvestigation), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getInvestigation), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getInvestigation(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -110476,7 +110803,7 @@ soap_in___ns1__getInvestigation(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -110498,7 +110825,7 @@ soap_get___ns1__getInvestigation(struct soap *soap,
                                  const char *tag, const char *type) {
   if ((p = soap_in___ns1__getInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -110513,9 +110840,9 @@ soap_instantiate___ns1__getInvestigation(struct soap *soap, int n,
                       "soap_instantiate___ns1__getInvestigation(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getInvestigation, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__getInvestigation, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getInvestigation);
     if (size)
@@ -110550,7 +110877,7 @@ soap_default___ns1__listDatafileFormats(struct soap *soap,
                                         struct __ns1__listDatafileFormats *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__listDatafileFormats_ = NULL;
+  a->ns1__listDatafileFormats_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__listDatafileFormats(
@@ -110586,9 +110913,9 @@ soap_in___ns1__listDatafileFormats(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__listDatafileFormats *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__listDatafileFormats,
-      sizeof(struct __ns1__listDatafileFormats), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__listDatafileFormats), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__listDatafileFormats(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -110607,7 +110934,7 @@ soap_in___ns1__listDatafileFormats(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -110629,7 +110956,7 @@ soap_get___ns1__listDatafileFormats(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__listDatafileFormats(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -110644,10 +110971,11 @@ soap_instantiate___ns1__listDatafileFormats(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__listDatafileFormats(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__listDatafileFormats, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__listDatafileFormats, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__listDatafileFormats);
     if (size)
@@ -110683,7 +111011,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchByRunNumberPagination(
     struct soap *soap, struct __ns1__searchByRunNumberPagination *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchByRunNumberPagination_ = NULL;
+  a->ns1__searchByRunNumberPagination_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchByRunNumberPagination(
@@ -110718,9 +111046,10 @@ soap_in___ns1__searchByRunNumberPagination(
   short soap_flag;
   a = (struct __ns1__searchByRunNumberPagination *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchByRunNumberPagination,
-      sizeof(struct __ns1__searchByRunNumberPagination), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchByRunNumberPagination), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchByRunNumberPagination(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -110741,7 +111070,7 @@ soap_in___ns1__searchByRunNumberPagination(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -110762,7 +111091,7 @@ soap_get___ns1__searchByRunNumberPagination(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchByRunNumberPagination(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -110779,11 +111108,11 @@ soap_instantiate___ns1__searchByRunNumberPagination(struct soap *soap, int n,
           fdebug,
           "soap_instantiate___ns1__searchByRunNumberPagination(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__searchByRunNumberPagination,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchByRunNumberPagination, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchByRunNumberPagination);
     if (size)
@@ -110823,7 +111152,7 @@ soap_default___ns1__searchByRunNumber(struct soap *soap,
                                       struct __ns1__searchByRunNumber *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchByRunNumber_ = NULL;
+  a->ns1__searchByRunNumber_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchByRunNumber(
@@ -110858,9 +111187,9 @@ soap_in___ns1__searchByRunNumber(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__searchByRunNumber *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchByRunNumber,
-      sizeof(struct __ns1__searchByRunNumber), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchByRunNumber), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchByRunNumber(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -110879,7 +111208,7 @@ soap_in___ns1__searchByRunNumber(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -110901,7 +111230,7 @@ soap_get___ns1__searchByRunNumber(struct soap *soap,
                                   const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchByRunNumber(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -110915,10 +111244,11 @@ soap_instantiate___ns1__searchByRunNumber(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate___ns1__searchByRunNumber(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchByRunNumber, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__searchByRunNumber, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchByRunNumber);
     if (size)
@@ -110953,7 +111283,7 @@ soap_default___ns1__listDatasetStatus(struct soap *soap,
                                       struct __ns1__listDatasetStatus *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__listDatasetStatus_ = NULL;
+  a->ns1__listDatasetStatus_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__listDatasetStatus(
@@ -110988,9 +111318,9 @@ soap_in___ns1__listDatasetStatus(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__listDatasetStatus *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__listDatasetStatus,
-      sizeof(struct __ns1__listDatasetStatus), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__listDatasetStatus), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__listDatasetStatus(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -111009,7 +111339,7 @@ soap_in___ns1__listDatasetStatus(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -111031,7 +111361,7 @@ soap_get___ns1__listDatasetStatus(struct soap *soap,
                                   const char *tag, const char *type) {
   if ((p = soap_in___ns1__listDatasetStatus(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -111045,10 +111375,11 @@ soap_instantiate___ns1__listDatasetStatus(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate___ns1__listDatasetStatus(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__listDatasetStatus, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__listDatasetStatus, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__listDatasetStatus);
     if (size)
@@ -111083,7 +111414,7 @@ soap_default___ns1__listDatasetTypes(struct soap *soap,
                                      struct __ns1__listDatasetTypes *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__listDatasetTypes_ = NULL;
+  a->ns1__listDatasetTypes_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__listDatasetTypes(
@@ -111118,9 +111449,9 @@ soap_in___ns1__listDatasetTypes(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__listDatasetTypes *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__listDatasetTypes,
-      sizeof(struct __ns1__listDatasetTypes), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__listDatasetTypes), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__listDatasetTypes(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -111139,7 +111470,7 @@ soap_in___ns1__listDatasetTypes(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -111161,7 +111492,7 @@ soap_get___ns1__listDatasetTypes(struct soap *soap,
                                  const char *tag, const char *type) {
   if ((p = soap_in___ns1__listDatasetTypes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -111176,9 +111507,9 @@ soap_instantiate___ns1__listDatasetTypes(struct soap *soap, int n,
                       "soap_instantiate___ns1__listDatasetTypes(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__listDatasetTypes, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__listDatasetTypes, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__listDatasetTypes);
     if (size)
@@ -111212,7 +111543,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchDatasetsBySample(
     struct soap *soap, struct __ns1__searchDatasetsBySample *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchDatasetsBySample_ = NULL;
+  a->ns1__searchDatasetsBySample_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchDatasetsBySample(
@@ -111247,9 +111578,10 @@ soap_in___ns1__searchDatasetsBySample(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__searchDatasetsBySample *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchDatasetsBySample,
-      sizeof(struct __ns1__searchDatasetsBySample), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchDatasetsBySample), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchDatasetsBySample(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -111269,7 +111601,7 @@ soap_in___ns1__searchDatasetsBySample(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -111290,7 +111622,7 @@ soap_get___ns1__searchDatasetsBySample(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchDatasetsBySample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -111307,10 +111639,10 @@ soap_instantiate___ns1__searchDatasetsBySample(struct soap *soap, int n,
              "soap_instantiate___ns1__searchDatasetsBySample(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__searchDatasetsBySample, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__searchDatasetsBySample, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchDatasetsBySample);
     if (size)
@@ -111347,7 +111679,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchSamplesBySampleName(
     struct soap *soap, struct __ns1__searchSamplesBySampleName *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchSamplesBySampleName_ = NULL;
+  a->ns1__searchSamplesBySampleName_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchSamplesBySampleName(
@@ -111382,9 +111714,10 @@ soap_in___ns1__searchSamplesBySampleName(
   short soap_flag;
   a = (struct __ns1__searchSamplesBySampleName *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchSamplesBySampleName,
-      sizeof(struct __ns1__searchSamplesBySampleName), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchSamplesBySampleName), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchSamplesBySampleName(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -111405,7 +111738,7 @@ soap_in___ns1__searchSamplesBySampleName(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -111426,7 +111759,7 @@ soap_get___ns1__searchSamplesBySampleName(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchSamplesBySampleName(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -111443,10 +111776,10 @@ soap_instantiate___ns1__searchSamplesBySampleName(struct soap *soap, int n,
              "soap_instantiate___ns1__searchSamplesBySampleName(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__searchSamplesBySampleName, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__searchSamplesBySampleName,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchSamplesBySampleName);
     if (size)
@@ -111484,7 +111817,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__listInvestigationTypes(
     struct soap *soap, struct __ns1__listInvestigationTypes *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__listInvestigationTypes_ = NULL;
+  a->ns1__listInvestigationTypes_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__listInvestigationTypes(
@@ -111519,9 +111852,10 @@ soap_in___ns1__listInvestigationTypes(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__listInvestigationTypes *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__listInvestigationTypes,
-      sizeof(struct __ns1__listInvestigationTypes), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__listInvestigationTypes), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__listInvestigationTypes(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -111541,7 +111875,7 @@ soap_in___ns1__listInvestigationTypes(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -111562,7 +111896,7 @@ soap_get___ns1__listInvestigationTypes(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__listInvestigationTypes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -111579,10 +111913,10 @@ soap_instantiate___ns1__listInvestigationTypes(struct soap *soap, int n,
              "soap_instantiate___ns1__listInvestigationTypes(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__listInvestigationTypes, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__listInvestigationTypes, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__listInvestigationTypes);
     if (size)
@@ -111619,7 +111953,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__getInstrumentsWithData(
     struct soap *soap, struct __ns1__getInstrumentsWithData *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getInstrumentsWithData_ = NULL;
+  a->ns1__getInstrumentsWithData_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getInstrumentsWithData(
@@ -111654,9 +111988,10 @@ soap_in___ns1__getInstrumentsWithData(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getInstrumentsWithData *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getInstrumentsWithData,
-      sizeof(struct __ns1__getInstrumentsWithData), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getInstrumentsWithData), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getInstrumentsWithData(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -111676,7 +112011,7 @@ soap_in___ns1__getInstrumentsWithData(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -111697,7 +112032,7 @@ soap_get___ns1__getInstrumentsWithData(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__getInstrumentsWithData(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -111714,10 +112049,10 @@ soap_instantiate___ns1__getInstrumentsWithData(struct soap *soap, int n,
              "soap_instantiate___ns1__getInstrumentsWithData(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__getInstrumentsWithData, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getInstrumentsWithData, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getInstrumentsWithData);
     if (size)
@@ -111756,7 +112091,7 @@ soap_default___ns1__getFacilityCyclesWithDataForInstrument(
     struct __ns1__getFacilityCyclesWithDataForInstrument *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getFacilityCyclesWithDataForInstrument_ = NULL;
+  a->ns1__getFacilityCyclesWithDataForInstrument_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -111796,10 +112131,10 @@ soap_in___ns1__getFacilityCyclesWithDataForInstrument(
   a = (struct __ns1__getFacilityCyclesWithDataForInstrument *)soap_id_enter(
       soap, "", a,
       SOAP_TYPE_ICat3___ns1__getFacilityCyclesWithDataForInstrument,
-      sizeof(struct __ns1__getFacilityCyclesWithDataForInstrument), 0, NULL,
-      NULL, NULL);
+      sizeof(struct __ns1__getFacilityCyclesWithDataForInstrument), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getFacilityCyclesWithDataForInstrument(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -111820,7 +112155,7 @@ soap_in___ns1__getFacilityCyclesWithDataForInstrument(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -111845,7 +112180,7 @@ soap_get___ns1__getFacilityCyclesWithDataForInstrument(
   if ((p = soap_in___ns1__getFacilityCyclesWithDataForInstrument(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -111859,11 +112194,12 @@ soap_instantiate___ns1__getFacilityCyclesWithDataForInstrument(
                                     "getFacilityCyclesWithDataForInstrument(%d,"
                                     " %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getFacilityCyclesWithDataForInstrument,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3___ns1__getFacilityCyclesWithDataForInstrument,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__getFacilityCyclesWithDataForInstrument);
@@ -111906,7 +112242,7 @@ soap_default___ns1__listFacilityCycles(struct soap *soap,
                                        struct __ns1__listFacilityCycles *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__listFacilityCycles_ = NULL;
+  a->ns1__listFacilityCycles_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__listFacilityCycles(
@@ -111941,9 +112277,9 @@ soap_in___ns1__listFacilityCycles(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__listFacilityCycles *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__listFacilityCycles,
-      sizeof(struct __ns1__listFacilityCycles), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__listFacilityCycles), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__listFacilityCycles(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -111962,7 +112298,7 @@ soap_in___ns1__listFacilityCycles(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -111984,7 +112320,7 @@ soap_get___ns1__listFacilityCycles(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in___ns1__listFacilityCycles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -111999,10 +112335,11 @@ soap_instantiate___ns1__listFacilityCycles(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate___ns1__listFacilityCycles(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__listFacilityCycles, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__listFacilityCycles, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__listFacilityCycles);
     if (size)
@@ -112039,7 +112376,7 @@ soap_default___ns1__listParameters(struct soap *soap,
                                    struct __ns1__listParameters *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__listParameters_ = NULL;
+  a->ns1__listParameters_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -112074,9 +112411,9 @@ soap_in___ns1__listParameters(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__listParameters *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__listParameters,
-      sizeof(struct __ns1__listParameters), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__listParameters), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__listParameters(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -112095,7 +112432,7 @@ soap_in___ns1__listParameters(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -112117,7 +112454,7 @@ soap_get___ns1__listParameters(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__listParameters(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -112132,9 +112469,9 @@ soap_instantiate___ns1__listParameters(struct soap *soap, int n,
                       "soap_instantiate___ns1__listParameters(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__listParameters, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__listParameters, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__listParameters);
     if (size)
@@ -112168,7 +112505,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__listRoles(struct soap *soap, struct __ns1__listRoles *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__listRoles_ = NULL;
+  a->ns1__listRoles_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -112201,9 +112538,9 @@ soap_in___ns1__listRoles(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__listRoles *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__listRoles,
-      sizeof(struct __ns1__listRoles), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__listRoles), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__listRoles(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -112221,7 +112558,7 @@ soap_in___ns1__listRoles(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -112241,7 +112578,7 @@ soap_get___ns1__listRoles(struct soap *soap, struct __ns1__listRoles *p,
                           const char *tag, const char *type) {
   if ((p = soap_in___ns1__listRoles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -112253,10 +112590,10 @@ soap_instantiate___ns1__listRoles(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate___ns1__listRoles(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__listRoles, n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__listRoles, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__listRoles);
     if (size)
@@ -112290,7 +112627,7 @@ soap_default___ns1__getAllInstruments(struct soap *soap,
                                       struct __ns1__getAllInstruments *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getAllInstruments_ = NULL;
+  a->ns1__getAllInstruments_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getAllInstruments(
@@ -112325,9 +112662,9 @@ soap_in___ns1__getAllInstruments(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getAllInstruments *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getAllInstruments,
-      sizeof(struct __ns1__getAllInstruments), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getAllInstruments), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getAllInstruments(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -112346,7 +112683,7 @@ soap_in___ns1__getAllInstruments(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -112368,7 +112705,7 @@ soap_get___ns1__getAllInstruments(struct soap *soap,
                                   const char *tag, const char *type) {
   if ((p = soap_in___ns1__getAllInstruments(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -112382,10 +112719,11 @@ soap_instantiate___ns1__getAllInstruments(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate___ns1__getAllInstruments(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getAllInstruments, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getAllInstruments, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getAllInstruments);
     if (size)
@@ -112420,7 +112758,7 @@ soap_default___ns1__listInstruments(struct soap *soap,
                                     struct __ns1__listInstruments *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__listInstruments_ = NULL;
+  a->ns1__listInstruments_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -112455,9 +112793,9 @@ soap_in___ns1__listInstruments(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__listInstruments *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__listInstruments,
-      sizeof(struct __ns1__listInstruments), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__listInstruments), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__listInstruments(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -112476,7 +112814,7 @@ soap_in___ns1__listInstruments(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -112498,7 +112836,7 @@ soap_get___ns1__listInstruments(struct soap *soap,
                                 const char *tag, const char *type) {
   if ((p = soap_in___ns1__listInstruments(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -112513,9 +112851,9 @@ soap_instantiate___ns1__listInstruments(struct soap *soap, int n,
                       "soap_instantiate___ns1__listInstruments(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__listInstruments, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__listInstruments, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__listInstruments);
     if (size)
@@ -112549,7 +112887,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchByUserSurnamePagination(
     struct soap *soap, struct __ns1__searchByUserSurnamePagination *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchByUserSurnamePagination_ = NULL;
+  a->ns1__searchByUserSurnamePagination_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchByUserSurnamePagination(
@@ -112584,9 +112922,10 @@ soap_in___ns1__searchByUserSurnamePagination(
   short soap_flag;
   a = (struct __ns1__searchByUserSurnamePagination *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchByUserSurnamePagination,
-      sizeof(struct __ns1__searchByUserSurnamePagination), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchByUserSurnamePagination), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchByUserSurnamePagination(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -112607,7 +112946,7 @@ soap_in___ns1__searchByUserSurnamePagination(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -112628,7 +112967,7 @@ soap_get___ns1__searchByUserSurnamePagination(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchByUserSurnamePagination(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -112646,10 +112985,10 @@ soap_instantiate___ns1__searchByUserSurnamePagination(struct soap *soap, int n,
           "soap_instantiate___ns1__searchByUserSurnamePagination(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchByUserSurnamePagination, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchByUserSurnamePagination, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchByUserSurnamePagination);
     if (size)
@@ -112689,7 +113028,7 @@ soap_default___ns1__searchByUserSurname(struct soap *soap,
                                         struct __ns1__searchByUserSurname *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchByUserSurname_ = NULL;
+  a->ns1__searchByUserSurname_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchByUserSurname(
@@ -112725,9 +113064,9 @@ soap_in___ns1__searchByUserSurname(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__searchByUserSurname *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchByUserSurname,
-      sizeof(struct __ns1__searchByUserSurname), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchByUserSurname), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchByUserSurname(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -112746,7 +113085,7 @@ soap_in___ns1__searchByUserSurname(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -112768,7 +113107,7 @@ soap_get___ns1__searchByUserSurname(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchByUserSurname(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -112783,10 +113122,11 @@ soap_instantiate___ns1__searchByUserSurname(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__searchByUserSurname(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchByUserSurname, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__searchByUserSurname, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchByUserSurname);
     if (size)
@@ -112822,7 +113162,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchByUserIDPagination(
     struct soap *soap, struct __ns1__searchByUserIDPagination *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchByUserIDPagination_ = NULL;
+  a->ns1__searchByUserIDPagination_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchByUserIDPagination(
@@ -112857,9 +113197,10 @@ soap_in___ns1__searchByUserIDPagination(
   short soap_flag;
   a = (struct __ns1__searchByUserIDPagination *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchByUserIDPagination,
-      sizeof(struct __ns1__searchByUserIDPagination), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchByUserIDPagination), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchByUserIDPagination(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -112880,7 +113221,7 @@ soap_in___ns1__searchByUserIDPagination(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -112901,7 +113242,7 @@ soap_get___ns1__searchByUserIDPagination(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchByUserIDPagination(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -112918,10 +113259,10 @@ soap_instantiate___ns1__searchByUserIDPagination(struct soap *soap, int n,
              "soap_instantiate___ns1__searchByUserIDPagination(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__searchByUserIDPagination, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__searchByUserIDPagination,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchByUserIDPagination);
     if (size)
@@ -112959,7 +113300,7 @@ soap_default___ns1__searchByUserID(struct soap *soap,
                                    struct __ns1__searchByUserID *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchByUserID_ = NULL;
+  a->ns1__searchByUserID_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -112994,9 +113335,9 @@ soap_in___ns1__searchByUserID(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__searchByUserID *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchByUserID,
-      sizeof(struct __ns1__searchByUserID), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchByUserID), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchByUserID(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -113015,7 +113356,7 @@ soap_in___ns1__searchByUserID(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -113037,7 +113378,7 @@ soap_get___ns1__searchByUserID(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__searchByUserID(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -113052,9 +113393,9 @@ soap_instantiate___ns1__searchByUserID(struct soap *soap, int n,
                       "soap_instantiate___ns1__searchByUserID(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchByUserID, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchByUserID, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchByUserID);
     if (size)
@@ -113089,7 +113430,7 @@ soap_default___ns1__getMyInvestigationsIncludesPagination(
     struct soap *soap, struct __ns1__getMyInvestigationsIncludesPagination *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getMyInvestigationsIncludesPagination_ = NULL;
+  a->ns1__getMyInvestigationsIncludesPagination_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -113127,10 +113468,10 @@ soap_in___ns1__getMyInvestigationsIncludesPagination(
   short soap_flag;
   a = (struct __ns1__getMyInvestigationsIncludesPagination *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getMyInvestigationsIncludesPagination,
-      sizeof(struct __ns1__getMyInvestigationsIncludesPagination), 0, NULL,
-      NULL, NULL);
+      sizeof(struct __ns1__getMyInvestigationsIncludesPagination), 0, nullptr,
+      nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getMyInvestigationsIncludesPagination(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -113151,7 +113492,7 @@ soap_in___ns1__getMyInvestigationsIncludesPagination(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -113175,7 +113516,7 @@ soap_get___ns1__getMyInvestigationsIncludesPagination(
   if ((p = soap_in___ns1__getMyInvestigationsIncludesPagination(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -113189,11 +113530,12 @@ soap_instantiate___ns1__getMyInvestigationsIncludesPagination(
                                     "getMyInvestigationsIncludesPagination(%d, "
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getMyInvestigationsIncludesPagination,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3___ns1__getMyInvestigationsIncludesPagination, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(struct __ns1__getMyInvestigationsIncludesPagination);
@@ -113235,7 +113577,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__getMyInvestigationsIncludes(
     struct soap *soap, struct __ns1__getMyInvestigationsIncludes *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getMyInvestigationsIncludes_ = NULL;
+  a->ns1__getMyInvestigationsIncludes_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getMyInvestigationsIncludes(
@@ -113270,9 +113612,10 @@ soap_in___ns1__getMyInvestigationsIncludes(
   short soap_flag;
   a = (struct __ns1__getMyInvestigationsIncludes *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getMyInvestigationsIncludes,
-      sizeof(struct __ns1__getMyInvestigationsIncludes), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getMyInvestigationsIncludes), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getMyInvestigationsIncludes(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -113293,7 +113636,7 @@ soap_in___ns1__getMyInvestigationsIncludes(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -113314,7 +113657,7 @@ soap_get___ns1__getMyInvestigationsIncludes(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__getMyInvestigationsIncludes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -113331,11 +113674,11 @@ soap_instantiate___ns1__getMyInvestigationsIncludes(struct soap *soap, int n,
           fdebug,
           "soap_instantiate___ns1__getMyInvestigationsIncludes(%d, %s, %s)\n",
           n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__getMyInvestigationsIncludes,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__getMyInvestigationsIncludes, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getMyInvestigationsIncludes);
     if (size)
@@ -113375,7 +113718,7 @@ soap_default___ns1__getMyInvestigations(struct soap *soap,
                                         struct __ns1__getMyInvestigations *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getMyInvestigations_ = NULL;
+  a->ns1__getMyInvestigations_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getMyInvestigations(
@@ -113411,9 +113754,9 @@ soap_in___ns1__getMyInvestigations(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getMyInvestigations *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getMyInvestigations,
-      sizeof(struct __ns1__getMyInvestigations), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getMyInvestigations), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getMyInvestigations(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -113432,7 +113775,7 @@ soap_in___ns1__getMyInvestigations(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -113454,7 +113797,7 @@ soap_get___ns1__getMyInvestigations(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__getMyInvestigations(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -113469,10 +113812,11 @@ soap_instantiate___ns1__getMyInvestigations(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__getMyInvestigations(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getMyInvestigations, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getMyInvestigations, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getMyInvestigations);
     if (size)
@@ -113509,7 +113853,7 @@ soap_default___ns1__searchByKeywordsAll(struct soap *soap,
                                         struct __ns1__searchByKeywordsAll *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchByKeywordsAll_ = NULL;
+  a->ns1__searchByKeywordsAll_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchByKeywordsAll(
@@ -113545,9 +113889,9 @@ soap_in___ns1__searchByKeywordsAll(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__searchByKeywordsAll *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchByKeywordsAll,
-      sizeof(struct __ns1__searchByKeywordsAll), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchByKeywordsAll), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchByKeywordsAll(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -113566,7 +113910,7 @@ soap_in___ns1__searchByKeywordsAll(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -113588,7 +113932,7 @@ soap_get___ns1__searchByKeywordsAll(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchByKeywordsAll(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -113603,10 +113947,11 @@ soap_instantiate___ns1__searchByKeywordsAll(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__searchByKeywordsAll(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchByKeywordsAll, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__searchByKeywordsAll, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchByKeywordsAll);
     if (size)
@@ -113643,7 +113988,7 @@ soap_default___ns1__searchByKeywords(struct soap *soap,
                                      struct __ns1__searchByKeywords *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchByKeywords_ = NULL;
+  a->ns1__searchByKeywords_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchByKeywords(
@@ -113678,9 +114023,9 @@ soap_in___ns1__searchByKeywords(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__searchByKeywords *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchByKeywords,
-      sizeof(struct __ns1__searchByKeywords), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchByKeywords), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchByKeywords(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -113699,7 +114044,7 @@ soap_in___ns1__searchByKeywords(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -113721,7 +114066,7 @@ soap_get___ns1__searchByKeywords(struct soap *soap,
                                  const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchByKeywords(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -113736,9 +114081,9 @@ soap_instantiate___ns1__searchByKeywords(struct soap *soap, int n,
                       "soap_instantiate___ns1__searchByKeywords(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchByKeywords, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchByKeywords, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchByKeywords);
     if (size)
@@ -113772,7 +114117,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__searchByAdvancedPagination(
     struct soap *soap, struct __ns1__searchByAdvancedPagination *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchByAdvancedPagination_ = NULL;
+  a->ns1__searchByAdvancedPagination_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchByAdvancedPagination(
@@ -113807,9 +114152,10 @@ soap_in___ns1__searchByAdvancedPagination(
   short soap_flag;
   a = (struct __ns1__searchByAdvancedPagination *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchByAdvancedPagination,
-      sizeof(struct __ns1__searchByAdvancedPagination), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchByAdvancedPagination), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchByAdvancedPagination(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -113830,7 +114176,7 @@ soap_in___ns1__searchByAdvancedPagination(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -113851,7 +114197,7 @@ soap_get___ns1__searchByAdvancedPagination(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchByAdvancedPagination(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -113867,11 +114213,11 @@ soap_instantiate___ns1__searchByAdvancedPagination(struct soap *soap, int n,
              fdebug,
              "soap_instantiate___ns1__searchByAdvancedPagination(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__searchByAdvancedPagination,
-                n, ICat3_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchByAdvancedPagination, n,
+      ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchByAdvancedPagination);
     if (size)
@@ -113911,7 +114257,7 @@ soap_default___ns1__searchByAdvanced(struct soap *soap,
                                      struct __ns1__searchByAdvanced *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchByAdvanced_ = NULL;
+  a->ns1__searchByAdvanced_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__searchByAdvanced(
@@ -113946,9 +114292,9 @@ soap_in___ns1__searchByAdvanced(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__searchByAdvanced *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__searchByAdvanced,
-      sizeof(struct __ns1__searchByAdvanced), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchByAdvanced), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchByAdvanced(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -113967,7 +114313,7 @@ soap_in___ns1__searchByAdvanced(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -113989,7 +114335,7 @@ soap_get___ns1__searchByAdvanced(struct soap *soap,
                                  const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchByAdvanced(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -114004,9 +114350,9 @@ soap_instantiate___ns1__searchByAdvanced(struct soap *soap, int n,
                       "soap_instantiate___ns1__searchByAdvanced(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__searchByAdvanced, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__searchByAdvanced, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchByAdvanced);
     if (size)
@@ -114041,7 +114387,7 @@ soap_default___ns1__getAllKeywords(struct soap *soap,
                                    struct __ns1__getAllKeywords *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getAllKeywords_ = NULL;
+  a->ns1__getAllKeywords_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -114076,9 +114422,9 @@ soap_in___ns1__getAllKeywords(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getAllKeywords *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getAllKeywords,
-      sizeof(struct __ns1__getAllKeywords), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getAllKeywords), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getAllKeywords(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -114097,7 +114443,7 @@ soap_in___ns1__getAllKeywords(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -114119,7 +114465,7 @@ soap_get___ns1__getAllKeywords(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__getAllKeywords(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -114134,9 +114480,9 @@ soap_instantiate___ns1__getAllKeywords(struct soap *soap, int n,
                       "soap_instantiate___ns1__getAllKeywords(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getAllKeywords, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__getAllKeywords, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getAllKeywords);
     if (size)
@@ -114170,7 +114516,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__getKeywordsForUserType(
     struct soap *soap, struct __ns1__getKeywordsForUserType *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getKeywordsForUserType_ = NULL;
+  a->ns1__getKeywordsForUserType_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getKeywordsForUserType(
@@ -114205,9 +114551,10 @@ soap_in___ns1__getKeywordsForUserType(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getKeywordsForUserType *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getKeywordsForUserType,
-      sizeof(struct __ns1__getKeywordsForUserType), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getKeywordsForUserType), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getKeywordsForUserType(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -114227,7 +114574,7 @@ soap_in___ns1__getKeywordsForUserType(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -114248,7 +114595,7 @@ soap_get___ns1__getKeywordsForUserType(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__getKeywordsForUserType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -114265,10 +114612,10 @@ soap_instantiate___ns1__getKeywordsForUserType(struct soap *soap, int n,
              "soap_instantiate___ns1__getKeywordsForUserType(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__getKeywordsForUserType, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getKeywordsForUserType, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getKeywordsForUserType);
     if (size)
@@ -114305,7 +114652,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__getKeywordsForUserMax(
     struct soap *soap, struct __ns1__getKeywordsForUserMax *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getKeywordsForUserMax_ = NULL;
+  a->ns1__getKeywordsForUserMax_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getKeywordsForUserMax(
@@ -114340,9 +114687,10 @@ soap_in___ns1__getKeywordsForUserMax(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getKeywordsForUserMax *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getKeywordsForUserMax,
-      sizeof(struct __ns1__getKeywordsForUserMax), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getKeywordsForUserMax), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getKeywordsForUserMax(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -114362,7 +114710,7 @@ soap_in___ns1__getKeywordsForUserMax(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -114383,7 +114731,7 @@ soap_get___ns1__getKeywordsForUserMax(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in___ns1__getKeywordsForUserMax(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -114400,10 +114748,10 @@ soap_instantiate___ns1__getKeywordsForUserMax(struct soap *soap, int n,
              "soap_instantiate___ns1__getKeywordsForUserMax(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__getKeywordsForUserMax, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getKeywordsForUserMax, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getKeywordsForUserMax);
     if (size)
@@ -114440,7 +114788,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__getKeywordsForUserStartWithMax(
     struct soap *soap, struct __ns1__getKeywordsForUserStartWithMax *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getKeywordsForUserStartWithMax_ = NULL;
+  a->ns1__getKeywordsForUserStartWithMax_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getKeywordsForUserStartWithMax(
@@ -114475,10 +114823,10 @@ soap_in___ns1__getKeywordsForUserStartWithMax(
   short soap_flag;
   a = (struct __ns1__getKeywordsForUserStartWithMax *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getKeywordsForUserStartWithMax,
-      sizeof(struct __ns1__getKeywordsForUserStartWithMax), 0, NULL, NULL,
-      NULL);
+      sizeof(struct __ns1__getKeywordsForUserStartWithMax), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getKeywordsForUserStartWithMax(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -114499,7 +114847,7 @@ soap_in___ns1__getKeywordsForUserStartWithMax(
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -114520,7 +114868,7 @@ soap_get___ns1__getKeywordsForUserStartWithMax(
     const char *tag, const char *type) {
   if ((p = soap_in___ns1__getKeywordsForUserStartWithMax(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -114536,10 +114884,10 @@ soap_instantiate___ns1__getKeywordsForUserStartWithMax(struct soap *soap, int n,
                               "getKeywordsForUserStartWithMax(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getKeywordsForUserStartWithMax, n,
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__getKeywordsForUserStartWithMax, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getKeywordsForUserStartWithMax);
     if (size)
@@ -114579,7 +114927,7 @@ soap_default___ns1__getKeywordsForUser(struct soap *soap,
                                        struct __ns1__getKeywordsForUser *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getKeywordsForUser_ = NULL;
+  a->ns1__getKeywordsForUser_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getKeywordsForUser(
@@ -114614,9 +114962,9 @@ soap_in___ns1__getKeywordsForUser(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getKeywordsForUser *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getKeywordsForUser,
-      sizeof(struct __ns1__getKeywordsForUser), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getKeywordsForUser), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getKeywordsForUser(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -114635,7 +114983,7 @@ soap_in___ns1__getKeywordsForUser(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -114657,7 +115005,7 @@ soap_get___ns1__getKeywordsForUser(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in___ns1__getKeywordsForUser(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -114672,10 +115020,11 @@ soap_instantiate___ns1__getKeywordsForUser(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate___ns1__getKeywordsForUser(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getKeywordsForUser, n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__getKeywordsForUser, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getKeywordsForUser);
     if (size)
@@ -114712,7 +115061,7 @@ soap_default___ns1__isSessionValid(struct soap *soap,
                                    struct __ns1__isSessionValid *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__isSessionValid_ = NULL;
+  a->ns1__isSessionValid_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -114747,9 +115096,9 @@ soap_in___ns1__isSessionValid(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__isSessionValid *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__isSessionValid,
-      sizeof(struct __ns1__isSessionValid), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__isSessionValid), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__isSessionValid(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -114768,7 +115117,7 @@ soap_in___ns1__isSessionValid(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -114790,7 +115139,7 @@ soap_get___ns1__isSessionValid(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__isSessionValid(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -114805,9 +115154,9 @@ soap_instantiate___ns1__isSessionValid(struct soap *soap, int n,
                       "soap_instantiate___ns1__isSessionValid(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__isSessionValid, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__isSessionValid, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__isSessionValid);
     if (size)
@@ -114842,7 +115191,7 @@ soap_default___ns1__getUserDetails(struct soap *soap,
                                    struct __ns1__getUserDetails *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getUserDetails = NULL;
+  a->ns1__getUserDetails = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -114877,9 +115226,9 @@ soap_in___ns1__getUserDetails(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getUserDetails *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__getUserDetails,
-      sizeof(struct __ns1__getUserDetails), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getUserDetails), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getUserDetails(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -114898,7 +115247,7 @@ soap_in___ns1__getUserDetails(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -114920,7 +115269,7 @@ soap_get___ns1__getUserDetails(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__getUserDetails(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -114935,9 +115284,9 @@ soap_instantiate___ns1__getUserDetails(struct soap *soap, int n,
                       "soap_instantiate___ns1__getUserDetails(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__getUserDetails, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__getUserDetails, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getUserDetails);
     if (size)
@@ -114971,7 +115320,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__logout(struct soap *soap, struct __ns1__logout *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__logout_ = NULL;
+  a->ns1__logout_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -115003,9 +115352,9 @@ soap_in___ns1__logout(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__logout *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__logout, sizeof(struct __ns1__logout),
-      0, NULL, NULL, NULL);
+      0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__logout(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -115023,7 +115372,7 @@ soap_in___ns1__logout(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -115042,7 +115391,7 @@ soap_get___ns1__logout(struct soap *soap, struct __ns1__logout *p,
                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__logout(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -115055,9 +115404,9 @@ soap_instantiate___ns1__logout(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate___ns1__logout(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__logout, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__logout, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__logout);
     if (size)
@@ -115091,7 +115440,7 @@ soap_default___ns1__loginLifetime(struct soap *soap,
                                   struct __ns1__loginLifetime *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__loginLifetime_ = NULL;
+  a->ns1__loginLifetime_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -115125,9 +115474,9 @@ soap_in___ns1__loginLifetime(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__loginLifetime *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__loginLifetime,
-      sizeof(struct __ns1__loginLifetime), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__loginLifetime), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__loginLifetime(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -115146,7 +115495,7 @@ soap_in___ns1__loginLifetime(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -115167,7 +115516,7 @@ soap_get___ns1__loginLifetime(struct soap *soap, struct __ns1__loginLifetime *p,
                               const char *tag, const char *type) {
   if ((p = soap_in___ns1__loginLifetime(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -115182,9 +115531,9 @@ soap_instantiate___ns1__loginLifetime(struct soap *soap, int n,
                       "soap_instantiate___ns1__loginLifetime(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3___ns1__loginLifetime, n, ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3___ns1__loginLifetime, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__loginLifetime);
     if (size)
@@ -115218,7 +115567,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__login(struct soap *soap, struct __ns1__login *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__login_ = NULL;
+  a->ns1__login_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -115249,9 +115598,9 @@ soap_in___ns1__login(struct soap *soap, const char *tag, struct __ns1__login *a,
   short soap_flag;
   a = (struct __ns1__login *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat3___ns1__login, sizeof(struct __ns1__login), 0,
-      NULL, NULL, NULL);
+      nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__login(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -115269,7 +115618,7 @@ soap_in___ns1__login(struct soap *soap, const char *tag, struct __ns1__login *a,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -115288,7 +115637,7 @@ soap_get___ns1__login(struct soap *soap, struct __ns1__login *p,
                       const char *tag, const char *type) {
   if ((p = soap_in___ns1__login(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -115301,9 +115650,9 @@ soap_instantiate___ns1__login(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate___ns1__login(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3___ns1__login, n, ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3___ns1__login, n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__login);
     if (size)
@@ -115804,7 +116153,7 @@ soap_out_PointerTons1__searchFacilityUserByRestrictionResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchFacilityUserByRestrictionResponse *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchFacilityUserByRestrictionResponse);
   if (id < 0)
     return soap->error;
@@ -115815,22 +116164,22 @@ SOAP_FMAC3 ns1__searchFacilityUserByRestrictionResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchFacilityUserByRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchFacilityUserByRestrictionResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchFacilityUserByRestrictionResponse **)soap_malloc(
               soap, sizeof(ns1__searchFacilityUserByRestrictionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchFacilityUserByRestrictionResponse *)
               soap_instantiate_ns1__searchFacilityUserByRestrictionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchFacilityUserByRestrictionResponse **p =
         (ns1__searchFacilityUserByRestrictionResponse **)soap_id_lookup(
@@ -115839,7 +116188,7 @@ soap_in_PointerTons1__searchFacilityUserByRestrictionResponse(
             sizeof(ns1__searchFacilityUserByRestrictionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -115849,7 +116198,7 @@ soap_put_PointerTons1__searchFacilityUserByRestrictionResponse(
     struct soap *soap, ns1__searchFacilityUserByRestrictionResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchFacilityUserByRestrictionResponse);
   if (soap_out_PointerTons1__searchFacilityUserByRestrictionResponse(
           soap, tag ? tag : "ns1:searchFacilityUserByRestrictionResponse", id,
@@ -115865,7 +116214,7 @@ soap_get_PointerTons1__searchFacilityUserByRestrictionResponse(
   if ((p = soap_in_PointerTons1__searchFacilityUserByRestrictionResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -115883,7 +116232,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchFacilityUserByRestriction(
     struct soap *soap, const char *tag, int id,
     ns1__searchFacilityUserByRestriction *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchFacilityUserByRestriction);
   if (id < 0)
     return soap->error;
@@ -115894,22 +116243,22 @@ SOAP_FMAC3 ns1__searchFacilityUserByRestriction **SOAP_FMAC4
 soap_in_PointerTons1__searchFacilityUserByRestriction(
     struct soap *soap, const char *tag,
     ns1__searchFacilityUserByRestriction **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchFacilityUserByRestriction **)soap_malloc(
               soap, sizeof(ns1__searchFacilityUserByRestriction *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchFacilityUserByRestriction *)
               soap_instantiate_ns1__searchFacilityUserByRestriction(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchFacilityUserByRestriction **p =
         (ns1__searchFacilityUserByRestriction **)soap_id_lookup(
@@ -115918,7 +116267,7 @@ soap_in_PointerTons1__searchFacilityUserByRestriction(
             sizeof(ns1__searchFacilityUserByRestriction), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -115928,7 +116277,7 @@ soap_put_PointerTons1__searchFacilityUserByRestriction(
     struct soap *soap, ns1__searchFacilityUserByRestriction *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__searchFacilityUserByRestriction);
   if (soap_out_PointerTons1__searchFacilityUserByRestriction(
           soap, tag ? tag : "ns1:searchFacilityUserByRestriction", id, a, type))
@@ -115943,7 +116292,7 @@ soap_get_PointerTons1__searchFacilityUserByRestriction(
   if ((p = soap_in_PointerTons1__searchFacilityUserByRestriction(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -115963,7 +116312,7 @@ soap_out_PointerTons1__searchSampleByParameterLogicalResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchSampleByParameterLogicalResponse *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchSampleByParameterLogicalResponse);
   if (id < 0)
     return soap->error;
@@ -115974,22 +116323,22 @@ SOAP_FMAC3 ns1__searchSampleByParameterLogicalResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByParameterLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterLogicalResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByParameterLogicalResponse **)soap_malloc(
               soap, sizeof(ns1__searchSampleByParameterLogicalResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByParameterLogicalResponse *)
               soap_instantiate_ns1__searchSampleByParameterLogicalResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByParameterLogicalResponse **p =
         (ns1__searchSampleByParameterLogicalResponse **)soap_id_lookup(
@@ -115998,7 +116347,7 @@ soap_in_PointerTons1__searchSampleByParameterLogicalResponse(
             sizeof(ns1__searchSampleByParameterLogicalResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -116008,7 +116357,7 @@ soap_put_PointerTons1__searchSampleByParameterLogicalResponse(
     struct soap *soap, ns1__searchSampleByParameterLogicalResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterLogicalResponse);
   if (soap_out_PointerTons1__searchSampleByParameterLogicalResponse(
           soap, tag ? tag : "ns1:searchSampleByParameterLogicalResponse", id, a,
@@ -116024,7 +116373,7 @@ soap_get_PointerTons1__searchSampleByParameterLogicalResponse(
   if ((p = soap_in_PointerTons1__searchSampleByParameterLogicalResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -116041,7 +116390,7 @@ soap_serialize_PointerTons1__searchSampleByParameterLogical(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchSampleByParameterLogical(
     struct soap *soap, const char *tag, int id,
     ns1__searchSampleByParameterLogical *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchSampleByParameterLogical);
   if (id < 0)
     return soap->error;
@@ -116052,22 +116401,22 @@ SOAP_FMAC3 ns1__searchSampleByParameterLogical **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByParameterLogical(
     struct soap *soap, const char *tag, ns1__searchSampleByParameterLogical **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByParameterLogical **)soap_malloc(
               soap, sizeof(ns1__searchSampleByParameterLogical *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByParameterLogical *)
               soap_instantiate_ns1__searchSampleByParameterLogical(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByParameterLogical **p =
         (ns1__searchSampleByParameterLogical **)soap_id_lookup(
@@ -116076,7 +116425,7 @@ soap_in_PointerTons1__searchSampleByParameterLogical(
             sizeof(ns1__searchSampleByParameterLogical), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -116085,7 +116434,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchSampleByParameterLogical(
     struct soap *soap, ns1__searchSampleByParameterLogical *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterLogical);
   if (soap_out_PointerTons1__searchSampleByParameterLogical(
           soap, tag ? tag : "ns1:searchSampleByParameterLogical", id, a, type))
@@ -116100,7 +116449,7 @@ soap_get_PointerTons1__searchSampleByParameterLogical(
   if ((p = soap_in_PointerTons1__searchSampleByParameterLogical(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -116120,7 +116469,7 @@ soap_out_PointerTons1__searchDatasetByParameterLogicalResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatasetByParameterLogicalResponse *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterLogicalResponse);
   if (id < 0)
     return soap->error;
@@ -116131,22 +116480,22 @@ SOAP_FMAC3 ns1__searchDatasetByParameterLogicalResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByParameterLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterLogicalResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByParameterLogicalResponse **)soap_malloc(
               soap, sizeof(ns1__searchDatasetByParameterLogicalResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByParameterLogicalResponse *)
               soap_instantiate_ns1__searchDatasetByParameterLogicalResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByParameterLogicalResponse **p =
         (ns1__searchDatasetByParameterLogicalResponse **)soap_id_lookup(
@@ -116155,7 +116504,7 @@ soap_in_PointerTons1__searchDatasetByParameterLogicalResponse(
             sizeof(ns1__searchDatasetByParameterLogicalResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -116165,7 +116514,7 @@ soap_put_PointerTons1__searchDatasetByParameterLogicalResponse(
     struct soap *soap, ns1__searchDatasetByParameterLogicalResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterLogicalResponse);
   if (soap_out_PointerTons1__searchDatasetByParameterLogicalResponse(
           soap, tag ? tag : "ns1:searchDatasetByParameterLogicalResponse", id,
@@ -116181,7 +116530,7 @@ soap_get_PointerTons1__searchDatasetByParameterLogicalResponse(
   if ((p = soap_in_PointerTons1__searchDatasetByParameterLogicalResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -116199,7 +116548,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchDatasetByParameterLogical(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatasetByParameterLogical *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatasetByParameterLogical);
   if (id < 0)
     return soap->error;
@@ -116210,22 +116559,22 @@ SOAP_FMAC3 ns1__searchDatasetByParameterLogical **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByParameterLogical(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterLogical **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByParameterLogical **)soap_malloc(
               soap, sizeof(ns1__searchDatasetByParameterLogical *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByParameterLogical *)
               soap_instantiate_ns1__searchDatasetByParameterLogical(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByParameterLogical **p =
         (ns1__searchDatasetByParameterLogical **)soap_id_lookup(
@@ -116234,7 +116583,7 @@ soap_in_PointerTons1__searchDatasetByParameterLogical(
             sizeof(ns1__searchDatasetByParameterLogical), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -116244,7 +116593,7 @@ soap_put_PointerTons1__searchDatasetByParameterLogical(
     struct soap *soap, ns1__searchDatasetByParameterLogical *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterLogical);
   if (soap_out_PointerTons1__searchDatasetByParameterLogical(
           soap, tag ? tag : "ns1:searchDatasetByParameterLogical", id, a, type))
@@ -116259,7 +116608,7 @@ soap_get_PointerTons1__searchDatasetByParameterLogical(
   if ((p = soap_in_PointerTons1__searchDatasetByParameterLogical(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -116280,7 +116629,7 @@ soap_out_PointerTons1__searchDatafileByParameterLogicalResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatafileByParameterLogicalResponse *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterLogicalResponse);
   if (id < 0)
     return soap->error;
@@ -116291,22 +116640,22 @@ SOAP_FMAC3 ns1__searchDatafileByParameterLogicalResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByParameterLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterLogicalResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByParameterLogicalResponse **)soap_malloc(
               soap, sizeof(ns1__searchDatafileByParameterLogicalResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByParameterLogicalResponse *)
               soap_instantiate_ns1__searchDatafileByParameterLogicalResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByParameterLogicalResponse **p =
         (ns1__searchDatafileByParameterLogicalResponse **)soap_id_lookup(
@@ -116315,7 +116664,7 @@ soap_in_PointerTons1__searchDatafileByParameterLogicalResponse(
             sizeof(ns1__searchDatafileByParameterLogicalResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -116325,7 +116674,7 @@ soap_put_PointerTons1__searchDatafileByParameterLogicalResponse(
     struct soap *soap, ns1__searchDatafileByParameterLogicalResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterLogicalResponse);
   if (soap_out_PointerTons1__searchDatafileByParameterLogicalResponse(
           soap, tag ? tag : "ns1:searchDatafileByParameterLogicalResponse", id,
@@ -116341,7 +116690,7 @@ soap_get_PointerTons1__searchDatafileByParameterLogicalResponse(
   if ((p = soap_in_PointerTons1__searchDatafileByParameterLogicalResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -116359,7 +116708,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchDatafileByParameterLogical(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatafileByParameterLogical *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatafileByParameterLogical);
   if (id < 0)
     return soap->error;
@@ -116370,22 +116719,22 @@ SOAP_FMAC3 ns1__searchDatafileByParameterLogical **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByParameterLogical(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterLogical **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByParameterLogical **)soap_malloc(
               soap, sizeof(ns1__searchDatafileByParameterLogical *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByParameterLogical *)
               soap_instantiate_ns1__searchDatafileByParameterLogical(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByParameterLogical **p =
         (ns1__searchDatafileByParameterLogical **)soap_id_lookup(
@@ -116394,7 +116743,7 @@ soap_in_PointerTons1__searchDatafileByParameterLogical(
             sizeof(ns1__searchDatafileByParameterLogical), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -116404,7 +116753,7 @@ soap_put_PointerTons1__searchDatafileByParameterLogical(
     struct soap *soap, ns1__searchDatafileByParameterLogical *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterLogical);
   if (soap_out_PointerTons1__searchDatafileByParameterLogical(
           soap, tag ? tag : "ns1:searchDatafileByParameterLogical", id, a,
@@ -116420,7 +116769,7 @@ soap_get_PointerTons1__searchDatafileByParameterLogical(
   if ((p = soap_in_PointerTons1__searchDatafileByParameterLogical(soap, tag, p,
                                                                   type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -116442,7 +116791,7 @@ soap_out_PointerTons1__searchInvestigationByParameterLogicalResponse(
     ns1__searchInvestigationByParameterLogicalResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterLogicalResponse);
   if (id < 0)
     return soap->error;
@@ -116453,25 +116802,25 @@ SOAP_FMAC3 ns1__searchInvestigationByParameterLogicalResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchInvestigationByParameterLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterLogicalResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByParameterLogicalResponse **)
               soap_malloc(
                   soap,
                   sizeof(
                       ns1__searchInvestigationByParameterLogicalResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByParameterLogicalResponse *)
               soap_instantiate_ns1__searchInvestigationByParameterLogicalResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByParameterLogicalResponse **p =
         (ns1__searchInvestigationByParameterLogicalResponse **)soap_id_lookup(
@@ -116480,7 +116829,7 @@ soap_in_PointerTons1__searchInvestigationByParameterLogicalResponse(
             sizeof(ns1__searchInvestigationByParameterLogicalResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -116491,7 +116840,7 @@ soap_put_PointerTons1__searchInvestigationByParameterLogicalResponse(
     ns1__searchInvestigationByParameterLogicalResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterLogicalResponse);
   if (soap_out_PointerTons1__searchInvestigationByParameterLogicalResponse(
           soap, tag ? tag : "ns1:searchInvestigationByParameterLogicalResponse",
@@ -116507,7 +116856,7 @@ soap_get_PointerTons1__searchInvestigationByParameterLogicalResponse(
   if ((p = soap_in_PointerTons1__searchInvestigationByParameterLogicalResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -116526,7 +116875,7 @@ soap_out_PointerTons1__searchInvestigationByParameterLogical(
     struct soap *soap, const char *tag, int id,
     ns1__searchInvestigationByParameterLogical *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterLogical);
   if (id < 0)
     return soap->error;
@@ -116537,22 +116886,22 @@ SOAP_FMAC3 ns1__searchInvestigationByParameterLogical **SOAP_FMAC4
 soap_in_PointerTons1__searchInvestigationByParameterLogical(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterLogical **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByParameterLogical **)soap_malloc(
               soap, sizeof(ns1__searchInvestigationByParameterLogical *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByParameterLogical *)
               soap_instantiate_ns1__searchInvestigationByParameterLogical(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByParameterLogical **p =
         (ns1__searchInvestigationByParameterLogical **)soap_id_lookup(
@@ -116561,7 +116910,7 @@ soap_in_PointerTons1__searchInvestigationByParameterLogical(
             sizeof(ns1__searchInvestigationByParameterLogical), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -116571,7 +116920,7 @@ soap_put_PointerTons1__searchInvestigationByParameterLogical(
     struct soap *soap, ns1__searchInvestigationByParameterLogical *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterLogical);
   if (soap_out_PointerTons1__searchInvestigationByParameterLogical(
           soap, tag ? tag : "ns1:searchInvestigationByParameterLogical", id, a,
@@ -116587,7 +116936,7 @@ soap_get_PointerTons1__searchInvestigationByParameterLogical(
   if ((p = soap_in_PointerTons1__searchInvestigationByParameterLogical(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -116609,7 +116958,7 @@ soap_out_PointerTons1__searchDatafileByRestrictionLogicalResponse(
     ns1__searchDatafileByRestrictionLogicalResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionLogicalResponse);
   if (id < 0)
     return soap->error;
@@ -116620,22 +116969,22 @@ SOAP_FMAC3 ns1__searchDatafileByRestrictionLogicalResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByRestrictionLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByRestrictionLogicalResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByRestrictionLogicalResponse **)soap_malloc(
               soap, sizeof(ns1__searchDatafileByRestrictionLogicalResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByRestrictionLogicalResponse *)
               soap_instantiate_ns1__searchDatafileByRestrictionLogicalResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByRestrictionLogicalResponse **p =
         (ns1__searchDatafileByRestrictionLogicalResponse **)soap_id_lookup(
@@ -116644,7 +116993,7 @@ soap_in_PointerTons1__searchDatafileByRestrictionLogicalResponse(
             sizeof(ns1__searchDatafileByRestrictionLogicalResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -116655,7 +117004,7 @@ soap_put_PointerTons1__searchDatafileByRestrictionLogicalResponse(
     ns1__searchDatafileByRestrictionLogicalResponse *const *a, const char *tag,
     const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByRestrictionLogicalResponse);
   if (soap_out_PointerTons1__searchDatafileByRestrictionLogicalResponse(
           soap, tag ? tag : "ns1:searchDatafileByRestrictionLogicalResponse",
@@ -116671,7 +117020,7 @@ soap_get_PointerTons1__searchDatafileByRestrictionLogicalResponse(
   if ((p = soap_in_PointerTons1__searchDatafileByRestrictionLogicalResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -116689,7 +117038,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchDatafileByRestrictionLogical(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatafileByRestrictionLogical *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionLogical);
   if (id < 0)
     return soap->error;
@@ -116700,22 +117049,22 @@ SOAP_FMAC3 ns1__searchDatafileByRestrictionLogical **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByRestrictionLogical(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByRestrictionLogical **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByRestrictionLogical **)soap_malloc(
               soap, sizeof(ns1__searchDatafileByRestrictionLogical *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByRestrictionLogical *)
               soap_instantiate_ns1__searchDatafileByRestrictionLogical(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByRestrictionLogical **p =
         (ns1__searchDatafileByRestrictionLogical **)soap_id_lookup(
@@ -116724,7 +117073,7 @@ soap_in_PointerTons1__searchDatafileByRestrictionLogical(
             sizeof(ns1__searchDatafileByRestrictionLogical), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -116734,7 +117083,7 @@ soap_put_PointerTons1__searchDatafileByRestrictionLogical(
     struct soap *soap, ns1__searchDatafileByRestrictionLogical *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByRestrictionLogical);
   if (soap_out_PointerTons1__searchDatafileByRestrictionLogical(
           soap, tag ? tag : "ns1:searchDatafileByRestrictionLogical", id, a,
@@ -116750,7 +117099,7 @@ soap_get_PointerTons1__searchDatafileByRestrictionLogical(
   if ((p = soap_in_PointerTons1__searchDatafileByRestrictionLogical(soap, tag,
                                                                     p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -116772,7 +117121,7 @@ soap_out_PointerTons1__searchInvestigationByRestrictionLogicalResponse(
     ns1__searchInvestigationByRestrictionLogicalResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionLogicalResponse);
   if (id < 0)
     return soap->error;
@@ -116784,25 +117133,25 @@ soap_in_PointerTons1__searchInvestigationByRestrictionLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByRestrictionLogicalResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByRestrictionLogicalResponse **)
               soap_malloc(
                   soap,
                   sizeof(
                       ns1__searchInvestigationByRestrictionLogicalResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByRestrictionLogicalResponse *)
               soap_instantiate_ns1__searchInvestigationByRestrictionLogicalResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByRestrictionLogicalResponse **p =
         (ns1__searchInvestigationByRestrictionLogicalResponse **)soap_id_lookup(
@@ -116811,7 +117160,7 @@ soap_in_PointerTons1__searchInvestigationByRestrictionLogicalResponse(
             sizeof(ns1__searchInvestigationByRestrictionLogicalResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -116822,7 +117171,7 @@ soap_put_PointerTons1__searchInvestigationByRestrictionLogicalResponse(
     ns1__searchInvestigationByRestrictionLogicalResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByRestrictionLogicalResponse);
   if (soap_out_PointerTons1__searchInvestigationByRestrictionLogicalResponse(
           soap,
@@ -116839,7 +117188,7 @@ soap_get_PointerTons1__searchInvestigationByRestrictionLogicalResponse(
   if ((p = soap_in_PointerTons1__searchInvestigationByRestrictionLogicalResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -116859,7 +117208,7 @@ soap_out_PointerTons1__searchInvestigationByRestrictionLogical(
     struct soap *soap, const char *tag, int id,
     ns1__searchInvestigationByRestrictionLogical *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionLogical);
   if (id < 0)
     return soap->error;
@@ -116870,22 +117219,22 @@ SOAP_FMAC3 ns1__searchInvestigationByRestrictionLogical **SOAP_FMAC4
 soap_in_PointerTons1__searchInvestigationByRestrictionLogical(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByRestrictionLogical **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByRestrictionLogical **)soap_malloc(
               soap, sizeof(ns1__searchInvestigationByRestrictionLogical *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByRestrictionLogical *)
               soap_instantiate_ns1__searchInvestigationByRestrictionLogical(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByRestrictionLogical **p =
         (ns1__searchInvestigationByRestrictionLogical **)soap_id_lookup(
@@ -116894,7 +117243,7 @@ soap_in_PointerTons1__searchInvestigationByRestrictionLogical(
             sizeof(ns1__searchInvestigationByRestrictionLogical), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -116904,7 +117253,7 @@ soap_put_PointerTons1__searchInvestigationByRestrictionLogical(
     struct soap *soap, ns1__searchInvestigationByRestrictionLogical *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByRestrictionLogical);
   if (soap_out_PointerTons1__searchInvestigationByRestrictionLogical(
           soap, tag ? tag : "ns1:searchInvestigationByRestrictionLogical", id,
@@ -116920,7 +117269,7 @@ soap_get_PointerTons1__searchInvestigationByRestrictionLogical(
   if ((p = soap_in_PointerTons1__searchInvestigationByRestrictionLogical(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -116942,7 +117291,7 @@ soap_out_PointerTons1__searchDatasetByRestrictionLogicalResponse(
     ns1__searchDatasetByRestrictionLogicalResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionLogicalResponse);
   if (id < 0)
     return soap->error;
@@ -116953,22 +117302,22 @@ SOAP_FMAC3 ns1__searchDatasetByRestrictionLogicalResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByRestrictionLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByRestrictionLogicalResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByRestrictionLogicalResponse **)soap_malloc(
               soap, sizeof(ns1__searchDatasetByRestrictionLogicalResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByRestrictionLogicalResponse *)
               soap_instantiate_ns1__searchDatasetByRestrictionLogicalResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByRestrictionLogicalResponse **p =
         (ns1__searchDatasetByRestrictionLogicalResponse **)soap_id_lookup(
@@ -116977,7 +117326,7 @@ soap_in_PointerTons1__searchDatasetByRestrictionLogicalResponse(
             sizeof(ns1__searchDatasetByRestrictionLogicalResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -116987,7 +117336,7 @@ soap_put_PointerTons1__searchDatasetByRestrictionLogicalResponse(
     struct soap *soap, ns1__searchDatasetByRestrictionLogicalResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByRestrictionLogicalResponse);
   if (soap_out_PointerTons1__searchDatasetByRestrictionLogicalResponse(
           soap, tag ? tag : "ns1:searchDatasetByRestrictionLogicalResponse", id,
@@ -117003,7 +117352,7 @@ soap_get_PointerTons1__searchDatasetByRestrictionLogicalResponse(
   if ((p = soap_in_PointerTons1__searchDatasetByRestrictionLogicalResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -117021,7 +117370,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchDatasetByRestrictionLogical(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatasetByRestrictionLogical *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionLogical);
   if (id < 0)
     return soap->error;
@@ -117032,22 +117381,22 @@ SOAP_FMAC3 ns1__searchDatasetByRestrictionLogical **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByRestrictionLogical(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByRestrictionLogical **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByRestrictionLogical **)soap_malloc(
               soap, sizeof(ns1__searchDatasetByRestrictionLogical *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByRestrictionLogical *)
               soap_instantiate_ns1__searchDatasetByRestrictionLogical(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByRestrictionLogical **p =
         (ns1__searchDatasetByRestrictionLogical **)soap_id_lookup(
@@ -117056,7 +117405,7 @@ soap_in_PointerTons1__searchDatasetByRestrictionLogical(
             sizeof(ns1__searchDatasetByRestrictionLogical), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -117066,7 +117415,7 @@ soap_put_PointerTons1__searchDatasetByRestrictionLogical(
     struct soap *soap, ns1__searchDatasetByRestrictionLogical *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByRestrictionLogical);
   if (soap_out_PointerTons1__searchDatasetByRestrictionLogical(
           soap, tag ? tag : "ns1:searchDatasetByRestrictionLogical", id, a,
@@ -117082,7 +117431,7 @@ soap_get_PointerTons1__searchDatasetByRestrictionLogical(
   if ((p = soap_in_PointerTons1__searchDatasetByRestrictionLogical(soap, tag, p,
                                                                    type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -117103,7 +117452,7 @@ soap_out_PointerTons1__searchSampleByRestrictionLogicalResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchSampleByRestrictionLogicalResponse *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionLogicalResponse);
   if (id < 0)
     return soap->error;
@@ -117114,22 +117463,22 @@ SOAP_FMAC3 ns1__searchSampleByRestrictionLogicalResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByRestrictionLogicalResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByRestrictionLogicalResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByRestrictionLogicalResponse **)soap_malloc(
               soap, sizeof(ns1__searchSampleByRestrictionLogicalResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByRestrictionLogicalResponse *)
               soap_instantiate_ns1__searchSampleByRestrictionLogicalResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByRestrictionLogicalResponse **p =
         (ns1__searchSampleByRestrictionLogicalResponse **)soap_id_lookup(
@@ -117138,7 +117487,7 @@ soap_in_PointerTons1__searchSampleByRestrictionLogicalResponse(
             sizeof(ns1__searchSampleByRestrictionLogicalResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -117148,7 +117497,7 @@ soap_put_PointerTons1__searchSampleByRestrictionLogicalResponse(
     struct soap *soap, ns1__searchSampleByRestrictionLogicalResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchSampleByRestrictionLogicalResponse);
   if (soap_out_PointerTons1__searchSampleByRestrictionLogicalResponse(
           soap, tag ? tag : "ns1:searchSampleByRestrictionLogicalResponse", id,
@@ -117164,7 +117513,7 @@ soap_get_PointerTons1__searchSampleByRestrictionLogicalResponse(
   if ((p = soap_in_PointerTons1__searchSampleByRestrictionLogicalResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -117182,7 +117531,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchSampleByRestrictionLogical(
     struct soap *soap, const char *tag, int id,
     ns1__searchSampleByRestrictionLogical *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionLogical);
   if (id < 0)
     return soap->error;
@@ -117193,22 +117542,22 @@ SOAP_FMAC3 ns1__searchSampleByRestrictionLogical **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByRestrictionLogical(
     struct soap *soap, const char *tag,
     ns1__searchSampleByRestrictionLogical **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByRestrictionLogical **)soap_malloc(
               soap, sizeof(ns1__searchSampleByRestrictionLogical *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByRestrictionLogical *)
               soap_instantiate_ns1__searchSampleByRestrictionLogical(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByRestrictionLogical **p =
         (ns1__searchSampleByRestrictionLogical **)soap_id_lookup(
@@ -117217,7 +117566,7 @@ soap_in_PointerTons1__searchSampleByRestrictionLogical(
             sizeof(ns1__searchSampleByRestrictionLogical), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -117227,7 +117576,7 @@ soap_put_PointerTons1__searchSampleByRestrictionLogical(
     struct soap *soap, ns1__searchSampleByRestrictionLogical *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchSampleByRestrictionLogical);
   if (soap_out_PointerTons1__searchSampleByRestrictionLogical(
           soap, tag ? tag : "ns1:searchSampleByRestrictionLogical", id, a,
@@ -117243,7 +117592,7 @@ soap_get_PointerTons1__searchSampleByRestrictionLogical(
   if ((p = soap_in_PointerTons1__searchSampleByRestrictionLogical(soap, tag, p,
                                                                   type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -117265,7 +117614,7 @@ soap_out_PointerTons1__searchSampleByRestrictionComparisonResponse(
     ns1__searchSampleByRestrictionComparisonResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionComparisonResponse);
   if (id < 0)
     return soap->error;
@@ -117276,23 +117625,23 @@ SOAP_FMAC3 ns1__searchSampleByRestrictionComparisonResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByRestrictionComparisonResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByRestrictionComparisonResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByRestrictionComparisonResponse **)soap_malloc(
               soap,
               sizeof(ns1__searchSampleByRestrictionComparisonResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByRestrictionComparisonResponse *)
               soap_instantiate_ns1__searchSampleByRestrictionComparisonResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByRestrictionComparisonResponse **p =
         (ns1__searchSampleByRestrictionComparisonResponse **)soap_id_lookup(
@@ -117301,7 +117650,7 @@ soap_in_PointerTons1__searchSampleByRestrictionComparisonResponse(
             sizeof(ns1__searchSampleByRestrictionComparisonResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -117312,7 +117661,7 @@ soap_put_PointerTons1__searchSampleByRestrictionComparisonResponse(
     ns1__searchSampleByRestrictionComparisonResponse *const *a, const char *tag,
     const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchSampleByRestrictionComparisonResponse);
   if (soap_out_PointerTons1__searchSampleByRestrictionComparisonResponse(
           soap, tag ? tag : "ns1:searchSampleByRestrictionComparisonResponse",
@@ -117328,7 +117677,7 @@ soap_get_PointerTons1__searchSampleByRestrictionComparisonResponse(
   if ((p = soap_in_PointerTons1__searchSampleByRestrictionComparisonResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -117347,7 +117696,7 @@ soap_out_PointerTons1__searchSampleByRestrictionComparison(
     struct soap *soap, const char *tag, int id,
     ns1__searchSampleByRestrictionComparison *const *a, const char *type) {
   id =
-      soap_element_id(soap, tag, id, *a, NULL, 0, type,
+      soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                       SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionComparison);
   if (id < 0)
     return soap->error;
@@ -117358,22 +117707,22 @@ SOAP_FMAC3 ns1__searchSampleByRestrictionComparison **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByRestrictionComparison(
     struct soap *soap, const char *tag,
     ns1__searchSampleByRestrictionComparison **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByRestrictionComparison **)soap_malloc(
               soap, sizeof(ns1__searchSampleByRestrictionComparison *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByRestrictionComparison *)
               soap_instantiate_ns1__searchSampleByRestrictionComparison(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByRestrictionComparison **p =
         (ns1__searchSampleByRestrictionComparison **)soap_id_lookup(
@@ -117382,7 +117731,7 @@ soap_in_PointerTons1__searchSampleByRestrictionComparison(
             sizeof(ns1__searchSampleByRestrictionComparison), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -117392,7 +117741,7 @@ soap_put_PointerTons1__searchSampleByRestrictionComparison(
     struct soap *soap, ns1__searchSampleByRestrictionComparison *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchSampleByRestrictionComparison);
   if (soap_out_PointerTons1__searchSampleByRestrictionComparison(
           soap, tag ? tag : "ns1:searchSampleByRestrictionComparison", id, a,
@@ -117408,7 +117757,7 @@ soap_get_PointerTons1__searchSampleByRestrictionComparison(
   if ((p = soap_in_PointerTons1__searchSampleByRestrictionComparison(soap, tag,
                                                                      p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -117430,7 +117779,7 @@ soap_out_PointerTons1__searchDatafileByRestrictionComparisonResponse(
     ns1__searchDatafileByRestrictionComparisonResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionComparisonResponse);
   if (id < 0)
     return soap->error;
@@ -117441,25 +117790,25 @@ SOAP_FMAC3 ns1__searchDatafileByRestrictionComparisonResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByRestrictionComparisonResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByRestrictionComparisonResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByRestrictionComparisonResponse **)
               soap_malloc(
                   soap,
                   sizeof(
                       ns1__searchDatafileByRestrictionComparisonResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByRestrictionComparisonResponse *)
               soap_instantiate_ns1__searchDatafileByRestrictionComparisonResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByRestrictionComparisonResponse **p =
         (ns1__searchDatafileByRestrictionComparisonResponse **)soap_id_lookup(
@@ -117468,7 +117817,7 @@ soap_in_PointerTons1__searchDatafileByRestrictionComparisonResponse(
             sizeof(ns1__searchDatafileByRestrictionComparisonResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -117479,7 +117828,7 @@ soap_put_PointerTons1__searchDatafileByRestrictionComparisonResponse(
     ns1__searchDatafileByRestrictionComparisonResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByRestrictionComparisonResponse);
   if (soap_out_PointerTons1__searchDatafileByRestrictionComparisonResponse(
           soap, tag ? tag : "ns1:searchDatafileByRestrictionComparisonResponse",
@@ -117495,7 +117844,7 @@ soap_get_PointerTons1__searchDatafileByRestrictionComparisonResponse(
   if ((p = soap_in_PointerTons1__searchDatafileByRestrictionComparisonResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -117514,7 +117863,7 @@ soap_out_PointerTons1__searchDatafileByRestrictionComparison(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatafileByRestrictionComparison *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionComparison);
   if (id < 0)
     return soap->error;
@@ -117525,22 +117874,22 @@ SOAP_FMAC3 ns1__searchDatafileByRestrictionComparison **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByRestrictionComparison(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByRestrictionComparison **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByRestrictionComparison **)soap_malloc(
               soap, sizeof(ns1__searchDatafileByRestrictionComparison *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByRestrictionComparison *)
               soap_instantiate_ns1__searchDatafileByRestrictionComparison(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByRestrictionComparison **p =
         (ns1__searchDatafileByRestrictionComparison **)soap_id_lookup(
@@ -117549,7 +117898,7 @@ soap_in_PointerTons1__searchDatafileByRestrictionComparison(
             sizeof(ns1__searchDatafileByRestrictionComparison), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -117559,7 +117908,7 @@ soap_put_PointerTons1__searchDatafileByRestrictionComparison(
     struct soap *soap, ns1__searchDatafileByRestrictionComparison *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByRestrictionComparison);
   if (soap_out_PointerTons1__searchDatafileByRestrictionComparison(
           soap, tag ? tag : "ns1:searchDatafileByRestrictionComparison", id, a,
@@ -117575,7 +117924,7 @@ soap_get_PointerTons1__searchDatafileByRestrictionComparison(
   if ((p = soap_in_PointerTons1__searchDatafileByRestrictionComparison(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -117597,7 +117946,7 @@ soap_out_PointerTons1__searchDatasetByRestrictionComparisonResponse(
     ns1__searchDatasetByRestrictionComparisonResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionComparisonResponse);
   if (id < 0)
     return soap->error;
@@ -117608,23 +117957,23 @@ SOAP_FMAC3 ns1__searchDatasetByRestrictionComparisonResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByRestrictionComparisonResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByRestrictionComparisonResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByRestrictionComparisonResponse **)soap_malloc(
               soap,
               sizeof(ns1__searchDatasetByRestrictionComparisonResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByRestrictionComparisonResponse *)
               soap_instantiate_ns1__searchDatasetByRestrictionComparisonResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByRestrictionComparisonResponse **p =
         (ns1__searchDatasetByRestrictionComparisonResponse **)soap_id_lookup(
@@ -117633,7 +117982,7 @@ soap_in_PointerTons1__searchDatasetByRestrictionComparisonResponse(
             sizeof(ns1__searchDatasetByRestrictionComparisonResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -117644,7 +117993,7 @@ soap_put_PointerTons1__searchDatasetByRestrictionComparisonResponse(
     ns1__searchDatasetByRestrictionComparisonResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByRestrictionComparisonResponse);
   if (soap_out_PointerTons1__searchDatasetByRestrictionComparisonResponse(
           soap, tag ? tag : "ns1:searchDatasetByRestrictionComparisonResponse",
@@ -117660,7 +118009,7 @@ soap_get_PointerTons1__searchDatasetByRestrictionComparisonResponse(
   if ((p = soap_in_PointerTons1__searchDatasetByRestrictionComparisonResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -117679,7 +118028,7 @@ soap_out_PointerTons1__searchDatasetByRestrictionComparison(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatasetByRestrictionComparison *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionComparison);
   if (id < 0)
     return soap->error;
@@ -117690,22 +118039,22 @@ SOAP_FMAC3 ns1__searchDatasetByRestrictionComparison **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByRestrictionComparison(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByRestrictionComparison **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByRestrictionComparison **)soap_malloc(
               soap, sizeof(ns1__searchDatasetByRestrictionComparison *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByRestrictionComparison *)
               soap_instantiate_ns1__searchDatasetByRestrictionComparison(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByRestrictionComparison **p =
         (ns1__searchDatasetByRestrictionComparison **)soap_id_lookup(
@@ -117714,7 +118063,7 @@ soap_in_PointerTons1__searchDatasetByRestrictionComparison(
             sizeof(ns1__searchDatasetByRestrictionComparison), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -117724,7 +118073,7 @@ soap_put_PointerTons1__searchDatasetByRestrictionComparison(
     struct soap *soap, ns1__searchDatasetByRestrictionComparison *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByRestrictionComparison);
   if (soap_out_PointerTons1__searchDatasetByRestrictionComparison(
           soap, tag ? tag : "ns1:searchDatasetByRestrictionComparison", id, a,
@@ -117740,7 +118089,7 @@ soap_get_PointerTons1__searchDatasetByRestrictionComparison(
   if ((p = soap_in_PointerTons1__searchDatasetByRestrictionComparison(soap, tag,
                                                                       p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -117762,7 +118111,7 @@ soap_out_PointerTons1__searchInvestigationByRestrictionComparasionResponse(
     ns1__searchInvestigationByRestrictionComparasionResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionComparasionResponse);
   if (id < 0)
     return soap->error;
@@ -117774,25 +118123,25 @@ soap_in_PointerTons1__searchInvestigationByRestrictionComparasionResponse(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByRestrictionComparasionResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByRestrictionComparasionResponse **)
               soap_malloc(
                   soap,
                   sizeof(
                       ns1__searchInvestigationByRestrictionComparasionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByRestrictionComparasionResponse *)
               soap_instantiate_ns1__searchInvestigationByRestrictionComparasionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByRestrictionComparasionResponse **p =
         (ns1__searchInvestigationByRestrictionComparasionResponse **)soap_id_lookup(
@@ -117802,7 +118151,7 @@ soap_in_PointerTons1__searchInvestigationByRestrictionComparasionResponse(
             0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -117813,7 +118162,7 @@ soap_put_PointerTons1__searchInvestigationByRestrictionComparasionResponse(
     ns1__searchInvestigationByRestrictionComparasionResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByRestrictionComparasionResponse);
   if (soap_out_PointerTons1__searchInvestigationByRestrictionComparasionResponse(
           soap,
@@ -117831,7 +118180,7 @@ soap_get_PointerTons1__searchInvestigationByRestrictionComparasionResponse(
   if ((p = soap_in_PointerTons1__searchInvestigationByRestrictionComparasionResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -117853,7 +118202,7 @@ soap_out_PointerTons1__searchInvestigationByRestrictionComparasion(
     ns1__searchInvestigationByRestrictionComparasion *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionComparasion);
   if (id < 0)
     return soap->error;
@@ -117864,23 +118213,23 @@ SOAP_FMAC3 ns1__searchInvestigationByRestrictionComparasion **SOAP_FMAC4
 soap_in_PointerTons1__searchInvestigationByRestrictionComparasion(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByRestrictionComparasion **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByRestrictionComparasion **)soap_malloc(
               soap,
               sizeof(ns1__searchInvestigationByRestrictionComparasion *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByRestrictionComparasion *)
               soap_instantiate_ns1__searchInvestigationByRestrictionComparasion(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByRestrictionComparasion **p =
         (ns1__searchInvestigationByRestrictionComparasion **)soap_id_lookup(
@@ -117889,7 +118238,7 @@ soap_in_PointerTons1__searchInvestigationByRestrictionComparasion(
             sizeof(ns1__searchInvestigationByRestrictionComparasion), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -117900,7 +118249,7 @@ soap_put_PointerTons1__searchInvestigationByRestrictionComparasion(
     ns1__searchInvestigationByRestrictionComparasion *const *a, const char *tag,
     const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByRestrictionComparasion);
   if (soap_out_PointerTons1__searchInvestigationByRestrictionComparasion(
           soap, tag ? tag : "ns1:searchInvestigationByRestrictionComparasion",
@@ -117916,7 +118265,7 @@ soap_get_PointerTons1__searchInvestigationByRestrictionComparasion(
   if ((p = soap_in_PointerTons1__searchInvestigationByRestrictionComparasion(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -117934,7 +118283,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchSampleByRestrictionResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchSampleByRestrictionResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchSampleByRestrictionResponse);
   if (id < 0)
     return soap->error;
@@ -117945,22 +118294,22 @@ SOAP_FMAC3 ns1__searchSampleByRestrictionResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByRestrictionResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByRestrictionResponse **)soap_malloc(
               soap, sizeof(ns1__searchSampleByRestrictionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByRestrictionResponse *)
               soap_instantiate_ns1__searchSampleByRestrictionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByRestrictionResponse **p =
         (ns1__searchSampleByRestrictionResponse **)soap_id_lookup(
@@ -117969,7 +118318,7 @@ soap_in_PointerTons1__searchSampleByRestrictionResponse(
             sizeof(ns1__searchSampleByRestrictionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -117979,7 +118328,7 @@ soap_put_PointerTons1__searchSampleByRestrictionResponse(
     struct soap *soap, ns1__searchSampleByRestrictionResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchSampleByRestrictionResponse);
   if (soap_out_PointerTons1__searchSampleByRestrictionResponse(
           soap, tag ? tag : "ns1:searchSampleByRestrictionResponse", id, a,
@@ -117995,7 +118344,7 @@ soap_get_PointerTons1__searchSampleByRestrictionResponse(
   if ((p = soap_in_PointerTons1__searchSampleByRestrictionResponse(soap, tag, p,
                                                                    type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -118011,7 +118360,7 @@ soap_serialize_PointerTons1__searchSampleByRestriction(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchSampleByRestriction(
     struct soap *soap, const char *tag, int id,
     ns1__searchSampleByRestriction *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchSampleByRestriction);
   if (id < 0)
     return soap->error;
@@ -118022,22 +118371,22 @@ SOAP_FMAC3 ns1__searchSampleByRestriction **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByRestriction(
     struct soap *soap, const char *tag, ns1__searchSampleByRestriction **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByRestriction **)soap_malloc(
               soap, sizeof(ns1__searchSampleByRestriction *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByRestriction *)
               soap_instantiate_ns1__searchSampleByRestriction(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByRestriction **p =
         (ns1__searchSampleByRestriction **)soap_id_lookup(
@@ -118046,7 +118395,7 @@ soap_in_PointerTons1__searchSampleByRestriction(
             sizeof(ns1__searchSampleByRestriction), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -118054,7 +118403,7 @@ soap_in_PointerTons1__searchSampleByRestriction(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchSampleByRestriction(
     struct soap *soap, ns1__searchSampleByRestriction *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchSampleByRestriction);
   if (soap_out_PointerTons1__searchSampleByRestriction(
           soap, tag ? tag : "ns1:searchSampleByRestriction", id, a, type))
@@ -118068,7 +118417,7 @@ soap_get_PointerTons1__searchSampleByRestriction(
     const char *type) {
   if ((p = soap_in_PointerTons1__searchSampleByRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -118087,7 +118436,7 @@ soap_out_PointerTons1__searchDatafileByRestrictionResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatafileByRestrictionResponse *const *a, const char *type) {
   id =
-      soap_element_id(soap, tag, id, *a, NULL, 0, type,
+      soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                       SOAP_TYPE_ICat3_ns1__searchDatafileByRestrictionResponse);
   if (id < 0)
     return soap->error;
@@ -118098,22 +118447,22 @@ SOAP_FMAC3 ns1__searchDatafileByRestrictionResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByRestrictionResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByRestrictionResponse **)soap_malloc(
               soap, sizeof(ns1__searchDatafileByRestrictionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByRestrictionResponse *)
               soap_instantiate_ns1__searchDatafileByRestrictionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByRestrictionResponse **p =
         (ns1__searchDatafileByRestrictionResponse **)soap_id_lookup(
@@ -118122,7 +118471,7 @@ soap_in_PointerTons1__searchDatafileByRestrictionResponse(
             sizeof(ns1__searchDatafileByRestrictionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -118132,7 +118481,7 @@ soap_put_PointerTons1__searchDatafileByRestrictionResponse(
     struct soap *soap, ns1__searchDatafileByRestrictionResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByRestrictionResponse);
   if (soap_out_PointerTons1__searchDatafileByRestrictionResponse(
           soap, tag ? tag : "ns1:searchDatafileByRestrictionResponse", id, a,
@@ -118148,7 +118497,7 @@ soap_get_PointerTons1__searchDatafileByRestrictionResponse(
   if ((p = soap_in_PointerTons1__searchDatafileByRestrictionResponse(soap, tag,
                                                                      p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -118165,7 +118514,7 @@ soap_serialize_PointerTons1__searchDatafileByRestriction(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchDatafileByRestriction(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatafileByRestriction *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatafileByRestriction);
   if (id < 0)
     return soap->error;
@@ -118176,22 +118525,22 @@ SOAP_FMAC3 ns1__searchDatafileByRestriction **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByRestriction(
     struct soap *soap, const char *tag, ns1__searchDatafileByRestriction **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByRestriction **)soap_malloc(
               soap, sizeof(ns1__searchDatafileByRestriction *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByRestriction *)
               soap_instantiate_ns1__searchDatafileByRestriction(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByRestriction **p =
         (ns1__searchDatafileByRestriction **)soap_id_lookup(
@@ -118200,7 +118549,7 @@ soap_in_PointerTons1__searchDatafileByRestriction(
             sizeof(ns1__searchDatafileByRestriction), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -118209,7 +118558,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchDatafileByRestriction(
     struct soap *soap, ns1__searchDatafileByRestriction *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__searchDatafileByRestriction);
   if (soap_out_PointerTons1__searchDatafileByRestriction(
           soap, tag ? tag : "ns1:searchDatafileByRestriction", id, a, type))
@@ -118224,7 +118573,7 @@ soap_get_PointerTons1__searchDatafileByRestriction(
   if ((p = soap_in_PointerTons1__searchDatafileByRestriction(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -118242,7 +118591,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchDatasetByRestrictionResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatasetByRestrictionResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatasetByRestrictionResponse);
   if (id < 0)
     return soap->error;
@@ -118253,22 +118602,22 @@ SOAP_FMAC3 ns1__searchDatasetByRestrictionResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByRestrictionResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByRestrictionResponse **)soap_malloc(
               soap, sizeof(ns1__searchDatasetByRestrictionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByRestrictionResponse *)
               soap_instantiate_ns1__searchDatasetByRestrictionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByRestrictionResponse **p =
         (ns1__searchDatasetByRestrictionResponse **)soap_id_lookup(
@@ -118277,7 +118626,7 @@ soap_in_PointerTons1__searchDatasetByRestrictionResponse(
             sizeof(ns1__searchDatasetByRestrictionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -118287,7 +118636,7 @@ soap_put_PointerTons1__searchDatasetByRestrictionResponse(
     struct soap *soap, ns1__searchDatasetByRestrictionResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByRestrictionResponse);
   if (soap_out_PointerTons1__searchDatasetByRestrictionResponse(
           soap, tag ? tag : "ns1:searchDatasetByRestrictionResponse", id, a,
@@ -118303,7 +118652,7 @@ soap_get_PointerTons1__searchDatasetByRestrictionResponse(
   if ((p = soap_in_PointerTons1__searchDatasetByRestrictionResponse(soap, tag,
                                                                     p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -118320,7 +118669,7 @@ soap_serialize_PointerTons1__searchDatasetByRestriction(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchDatasetByRestriction(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatasetByRestriction *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatasetByRestriction);
   if (id < 0)
     return soap->error;
@@ -118331,22 +118680,22 @@ SOAP_FMAC3 ns1__searchDatasetByRestriction **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByRestriction(
     struct soap *soap, const char *tag, ns1__searchDatasetByRestriction **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByRestriction **)soap_malloc(
               soap, sizeof(ns1__searchDatasetByRestriction *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByRestriction *)
               soap_instantiate_ns1__searchDatasetByRestriction(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByRestriction **p =
         (ns1__searchDatasetByRestriction **)soap_id_lookup(
@@ -118355,7 +118704,7 @@ soap_in_PointerTons1__searchDatasetByRestriction(
             sizeof(ns1__searchDatasetByRestriction), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -118363,7 +118712,7 @@ soap_in_PointerTons1__searchDatasetByRestriction(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchDatasetByRestriction(
     struct soap *soap, ns1__searchDatasetByRestriction *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByRestriction);
   if (soap_out_PointerTons1__searchDatasetByRestriction(
           soap, tag ? tag : "ns1:searchDatasetByRestriction", id, a, type))
@@ -118378,7 +118727,7 @@ soap_get_PointerTons1__searchDatasetByRestriction(
   if ((p = soap_in_PointerTons1__searchDatasetByRestriction(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -118399,7 +118748,7 @@ soap_out_PointerTons1__searchInvestigationByRestrictionResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchInvestigationByRestrictionResponse *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByRestrictionResponse);
   if (id < 0)
     return soap->error;
@@ -118410,22 +118759,22 @@ SOAP_FMAC3 ns1__searchInvestigationByRestrictionResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchInvestigationByRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByRestrictionResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByRestrictionResponse **)soap_malloc(
               soap, sizeof(ns1__searchInvestigationByRestrictionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByRestrictionResponse *)
               soap_instantiate_ns1__searchInvestigationByRestrictionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByRestrictionResponse **p =
         (ns1__searchInvestigationByRestrictionResponse **)soap_id_lookup(
@@ -118434,7 +118783,7 @@ soap_in_PointerTons1__searchInvestigationByRestrictionResponse(
             sizeof(ns1__searchInvestigationByRestrictionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -118444,7 +118793,7 @@ soap_put_PointerTons1__searchInvestigationByRestrictionResponse(
     struct soap *soap, ns1__searchInvestigationByRestrictionResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByRestrictionResponse);
   if (soap_out_PointerTons1__searchInvestigationByRestrictionResponse(
           soap, tag ? tag : "ns1:searchInvestigationByRestrictionResponse", id,
@@ -118460,7 +118809,7 @@ soap_get_PointerTons1__searchInvestigationByRestrictionResponse(
   if ((p = soap_in_PointerTons1__searchInvestigationByRestrictionResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -118478,7 +118827,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchInvestigationByRestriction(
     struct soap *soap, const char *tag, int id,
     ns1__searchInvestigationByRestriction *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchInvestigationByRestriction);
   if (id < 0)
     return soap->error;
@@ -118489,22 +118838,22 @@ SOAP_FMAC3 ns1__searchInvestigationByRestriction **SOAP_FMAC4
 soap_in_PointerTons1__searchInvestigationByRestriction(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByRestriction **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByRestriction **)soap_malloc(
               soap, sizeof(ns1__searchInvestigationByRestriction *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByRestriction *)
               soap_instantiate_ns1__searchInvestigationByRestriction(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByRestriction **p =
         (ns1__searchInvestigationByRestriction **)soap_id_lookup(
@@ -118513,7 +118862,7 @@ soap_in_PointerTons1__searchInvestigationByRestriction(
             sizeof(ns1__searchInvestigationByRestriction), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -118523,7 +118872,7 @@ soap_put_PointerTons1__searchInvestigationByRestriction(
     struct soap *soap, ns1__searchInvestigationByRestriction *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByRestriction);
   if (soap_out_PointerTons1__searchInvestigationByRestriction(
           soap, tag ? tag : "ns1:searchInvestigationByRestriction", id, a,
@@ -118539,7 +118888,7 @@ soap_get_PointerTons1__searchInvestigationByRestriction(
   if ((p = soap_in_PointerTons1__searchInvestigationByRestriction(soap, tag, p,
                                                                   type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -118561,7 +118910,7 @@ soap_out_PointerTons1__searchInvestigationByParameterRestrictionResponse(
     ns1__searchInvestigationByParameterRestrictionResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterRestrictionResponse);
   if (id < 0)
     return soap->error;
@@ -118573,25 +118922,25 @@ soap_in_PointerTons1__searchInvestigationByParameterRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterRestrictionResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByParameterRestrictionResponse **)
               soap_malloc(
                   soap,
                   sizeof(
                       ns1__searchInvestigationByParameterRestrictionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByParameterRestrictionResponse *)
               soap_instantiate_ns1__searchInvestigationByParameterRestrictionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByParameterRestrictionResponse **p =
         (ns1__searchInvestigationByParameterRestrictionResponse **)soap_id_lookup(
@@ -118600,7 +118949,7 @@ soap_in_PointerTons1__searchInvestigationByParameterRestrictionResponse(
             sizeof(ns1__searchInvestigationByParameterRestrictionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -118611,7 +118960,7 @@ soap_put_PointerTons1__searchInvestigationByParameterRestrictionResponse(
     ns1__searchInvestigationByParameterRestrictionResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterRestrictionResponse);
   if (soap_out_PointerTons1__searchInvestigationByParameterRestrictionResponse(
           soap,
@@ -118629,7 +118978,7 @@ soap_get_PointerTons1__searchInvestigationByParameterRestrictionResponse(
   if ((p = soap_in_PointerTons1__searchInvestigationByParameterRestrictionResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -118651,7 +119000,7 @@ soap_out_PointerTons1__searchInvestigationByParameterRestriction(
     ns1__searchInvestigationByParameterRestriction *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterRestriction);
   if (id < 0)
     return soap->error;
@@ -118662,22 +119011,22 @@ SOAP_FMAC3 ns1__searchInvestigationByParameterRestriction **SOAP_FMAC4
 soap_in_PointerTons1__searchInvestigationByParameterRestriction(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterRestriction **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByParameterRestriction **)soap_malloc(
               soap, sizeof(ns1__searchInvestigationByParameterRestriction *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByParameterRestriction *)
               soap_instantiate_ns1__searchInvestigationByParameterRestriction(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByParameterRestriction **p =
         (ns1__searchInvestigationByParameterRestriction **)soap_id_lookup(
@@ -118686,7 +119035,7 @@ soap_in_PointerTons1__searchInvestigationByParameterRestriction(
             sizeof(ns1__searchInvestigationByParameterRestriction), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -118696,7 +119045,7 @@ soap_put_PointerTons1__searchInvestigationByParameterRestriction(
     struct soap *soap, ns1__searchInvestigationByParameterRestriction *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterRestriction);
   if (soap_out_PointerTons1__searchInvestigationByParameterRestriction(
           soap, tag ? tag : "ns1:searchInvestigationByParameterRestriction", id,
@@ -118712,7 +119061,7 @@ soap_get_PointerTons1__searchInvestigationByParameterRestriction(
   if ((p = soap_in_PointerTons1__searchInvestigationByParameterRestriction(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -118734,7 +119083,7 @@ soap_out_PointerTons1__searchDatafileByParameterRestrictionResponse(
     ns1__searchDatafileByParameterRestrictionResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterRestrictionResponse);
   if (id < 0)
     return soap->error;
@@ -118745,23 +119094,23 @@ SOAP_FMAC3 ns1__searchDatafileByParameterRestrictionResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByParameterRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterRestrictionResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByParameterRestrictionResponse **)soap_malloc(
               soap,
               sizeof(ns1__searchDatafileByParameterRestrictionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByParameterRestrictionResponse *)
               soap_instantiate_ns1__searchDatafileByParameterRestrictionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByParameterRestrictionResponse **p =
         (ns1__searchDatafileByParameterRestrictionResponse **)soap_id_lookup(
@@ -118770,7 +119119,7 @@ soap_in_PointerTons1__searchDatafileByParameterRestrictionResponse(
             sizeof(ns1__searchDatafileByParameterRestrictionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -118781,7 +119130,7 @@ soap_put_PointerTons1__searchDatafileByParameterRestrictionResponse(
     ns1__searchDatafileByParameterRestrictionResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterRestrictionResponse);
   if (soap_out_PointerTons1__searchDatafileByParameterRestrictionResponse(
           soap, tag ? tag : "ns1:searchDatafileByParameterRestrictionResponse",
@@ -118797,7 +119146,7 @@ soap_get_PointerTons1__searchDatafileByParameterRestrictionResponse(
   if ((p = soap_in_PointerTons1__searchDatafileByParameterRestrictionResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -118816,7 +119165,7 @@ soap_out_PointerTons1__searchDatafileByParameterRestriction(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatafileByParameterRestriction *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterRestriction);
   if (id < 0)
     return soap->error;
@@ -118827,22 +119176,22 @@ SOAP_FMAC3 ns1__searchDatafileByParameterRestriction **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByParameterRestriction(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterRestriction **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByParameterRestriction **)soap_malloc(
               soap, sizeof(ns1__searchDatafileByParameterRestriction *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByParameterRestriction *)
               soap_instantiate_ns1__searchDatafileByParameterRestriction(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByParameterRestriction **p =
         (ns1__searchDatafileByParameterRestriction **)soap_id_lookup(
@@ -118851,7 +119200,7 @@ soap_in_PointerTons1__searchDatafileByParameterRestriction(
             sizeof(ns1__searchDatafileByParameterRestriction), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -118861,7 +119210,7 @@ soap_put_PointerTons1__searchDatafileByParameterRestriction(
     struct soap *soap, ns1__searchDatafileByParameterRestriction *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterRestriction);
   if (soap_out_PointerTons1__searchDatafileByParameterRestriction(
           soap, tag ? tag : "ns1:searchDatafileByParameterRestriction", id, a,
@@ -118877,7 +119226,7 @@ soap_get_PointerTons1__searchDatafileByParameterRestriction(
   if ((p = soap_in_PointerTons1__searchDatafileByParameterRestriction(soap, tag,
                                                                       p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -118899,7 +119248,7 @@ soap_out_PointerTons1__searchSampleByParameterRestrictionResponse(
     ns1__searchSampleByParameterRestrictionResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchSampleByParameterRestrictionResponse);
   if (id < 0)
     return soap->error;
@@ -118910,22 +119259,22 @@ SOAP_FMAC3 ns1__searchSampleByParameterRestrictionResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByParameterRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterRestrictionResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByParameterRestrictionResponse **)soap_malloc(
               soap, sizeof(ns1__searchSampleByParameterRestrictionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByParameterRestrictionResponse *)
               soap_instantiate_ns1__searchSampleByParameterRestrictionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByParameterRestrictionResponse **p =
         (ns1__searchSampleByParameterRestrictionResponse **)soap_id_lookup(
@@ -118934,7 +119283,7 @@ soap_in_PointerTons1__searchSampleByParameterRestrictionResponse(
             sizeof(ns1__searchSampleByParameterRestrictionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -118945,7 +119294,7 @@ soap_put_PointerTons1__searchSampleByParameterRestrictionResponse(
     ns1__searchSampleByParameterRestrictionResponse *const *a, const char *tag,
     const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterRestrictionResponse);
   if (soap_out_PointerTons1__searchSampleByParameterRestrictionResponse(
           soap, tag ? tag : "ns1:searchSampleByParameterRestrictionResponse",
@@ -118961,7 +119310,7 @@ soap_get_PointerTons1__searchSampleByParameterRestrictionResponse(
   if ((p = soap_in_PointerTons1__searchSampleByParameterRestrictionResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -118979,7 +119328,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchSampleByParameterRestriction(
     struct soap *soap, const char *tag, int id,
     ns1__searchSampleByParameterRestriction *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchSampleByParameterRestriction);
   if (id < 0)
     return soap->error;
@@ -118990,22 +119339,22 @@ SOAP_FMAC3 ns1__searchSampleByParameterRestriction **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByParameterRestriction(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterRestriction **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByParameterRestriction **)soap_malloc(
               soap, sizeof(ns1__searchSampleByParameterRestriction *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByParameterRestriction *)
               soap_instantiate_ns1__searchSampleByParameterRestriction(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByParameterRestriction **p =
         (ns1__searchSampleByParameterRestriction **)soap_id_lookup(
@@ -119014,7 +119363,7 @@ soap_in_PointerTons1__searchSampleByParameterRestriction(
             sizeof(ns1__searchSampleByParameterRestriction), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -119024,7 +119373,7 @@ soap_put_PointerTons1__searchSampleByParameterRestriction(
     struct soap *soap, ns1__searchSampleByParameterRestriction *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterRestriction);
   if (soap_out_PointerTons1__searchSampleByParameterRestriction(
           soap, tag ? tag : "ns1:searchSampleByParameterRestriction", id, a,
@@ -119040,7 +119389,7 @@ soap_get_PointerTons1__searchSampleByParameterRestriction(
   if ((p = soap_in_PointerTons1__searchSampleByParameterRestriction(soap, tag,
                                                                     p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -119062,7 +119411,7 @@ soap_out_PointerTons1__searchDatasetByParameterRestrictionResponse(
     ns1__searchDatasetByParameterRestrictionResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterRestrictionResponse);
   if (id < 0)
     return soap->error;
@@ -119073,23 +119422,23 @@ SOAP_FMAC3 ns1__searchDatasetByParameterRestrictionResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByParameterRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterRestrictionResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByParameterRestrictionResponse **)soap_malloc(
               soap,
               sizeof(ns1__searchDatasetByParameterRestrictionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByParameterRestrictionResponse *)
               soap_instantiate_ns1__searchDatasetByParameterRestrictionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByParameterRestrictionResponse **p =
         (ns1__searchDatasetByParameterRestrictionResponse **)soap_id_lookup(
@@ -119098,7 +119447,7 @@ soap_in_PointerTons1__searchDatasetByParameterRestrictionResponse(
             sizeof(ns1__searchDatasetByParameterRestrictionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -119109,7 +119458,7 @@ soap_put_PointerTons1__searchDatasetByParameterRestrictionResponse(
     ns1__searchDatasetByParameterRestrictionResponse *const *a, const char *tag,
     const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterRestrictionResponse);
   if (soap_out_PointerTons1__searchDatasetByParameterRestrictionResponse(
           soap, tag ? tag : "ns1:searchDatasetByParameterRestrictionResponse",
@@ -119125,7 +119474,7 @@ soap_get_PointerTons1__searchDatasetByParameterRestrictionResponse(
   if ((p = soap_in_PointerTons1__searchDatasetByParameterRestrictionResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -119144,7 +119493,7 @@ soap_out_PointerTons1__searchDatasetByParameterRestriction(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatasetByParameterRestriction *const *a, const char *type) {
   id =
-      soap_element_id(soap, tag, id, *a, NULL, 0, type,
+      soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterRestriction);
   if (id < 0)
     return soap->error;
@@ -119155,22 +119504,22 @@ SOAP_FMAC3 ns1__searchDatasetByParameterRestriction **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByParameterRestriction(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterRestriction **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByParameterRestriction **)soap_malloc(
               soap, sizeof(ns1__searchDatasetByParameterRestriction *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByParameterRestriction *)
               soap_instantiate_ns1__searchDatasetByParameterRestriction(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByParameterRestriction **p =
         (ns1__searchDatasetByParameterRestriction **)soap_id_lookup(
@@ -119179,7 +119528,7 @@ soap_in_PointerTons1__searchDatasetByParameterRestriction(
             sizeof(ns1__searchDatasetByParameterRestriction), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -119189,7 +119538,7 @@ soap_put_PointerTons1__searchDatasetByParameterRestriction(
     struct soap *soap, ns1__searchDatasetByParameterRestriction *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterRestriction);
   if (soap_out_PointerTons1__searchDatasetByParameterRestriction(
           soap, tag ? tag : "ns1:searchDatasetByParameterRestriction", id, a,
@@ -119205,7 +119554,7 @@ soap_get_PointerTons1__searchDatasetByParameterRestriction(
   if ((p = soap_in_PointerTons1__searchDatasetByParameterRestriction(soap, tag,
                                                                      p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -119222,7 +119571,7 @@ soap_serialize_PointerTons1__getParameterByUnitsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getParameterByUnitsResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getParameterByUnitsResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getParameterByUnitsResponse);
   if (id < 0)
     return soap->error;
@@ -119233,22 +119582,22 @@ SOAP_FMAC3 ns1__getParameterByUnitsResponse **SOAP_FMAC4
 soap_in_PointerTons1__getParameterByUnitsResponse(
     struct soap *soap, const char *tag, ns1__getParameterByUnitsResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getParameterByUnitsResponse **)soap_malloc(
               soap, sizeof(ns1__getParameterByUnitsResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getParameterByUnitsResponse *)
               soap_instantiate_ns1__getParameterByUnitsResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getParameterByUnitsResponse **p =
         (ns1__getParameterByUnitsResponse **)soap_id_lookup(
@@ -119257,7 +119606,7 @@ soap_in_PointerTons1__getParameterByUnitsResponse(
             sizeof(ns1__getParameterByUnitsResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -119266,7 +119615,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getParameterByUnitsResponse(
     struct soap *soap, ns1__getParameterByUnitsResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__getParameterByUnitsResponse);
   if (soap_out_PointerTons1__getParameterByUnitsResponse(
           soap, tag ? tag : "ns1:getParameterByUnitsResponse", id, a, type))
@@ -119281,7 +119630,7 @@ soap_get_PointerTons1__getParameterByUnitsResponse(
   if ((p = soap_in_PointerTons1__getParameterByUnitsResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -119298,7 +119647,7 @@ soap_out_PointerTons1__getParameterByUnits(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__getParameterByUnits *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getParameterByUnits);
   if (id < 0)
     return soap->error;
@@ -119309,29 +119658,29 @@ SOAP_FMAC3 ns1__getParameterByUnits **SOAP_FMAC4
 soap_in_PointerTons1__getParameterByUnits(struct soap *soap, const char *tag,
                                           ns1__getParameterByUnits **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getParameterByUnits **)soap_malloc(
               soap, sizeof(ns1__getParameterByUnits *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getParameterByUnits *)
-              soap_instantiate_ns1__getParameterByUnits(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__getParameterByUnits(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getParameterByUnits **p = (ns1__getParameterByUnits **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getParameterByUnits,
         sizeof(ns1__getParameterByUnits), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -119340,7 +119689,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getParameterByUnits(struct soap *soap,
                                            ns1__getParameterByUnits *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getParameterByUnits);
   if (soap_out_PointerTons1__getParameterByUnits(
           soap, tag ? tag : "ns1:getParameterByUnits", id, a, type))
@@ -119354,7 +119703,7 @@ soap_get_PointerTons1__getParameterByUnits(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getParameterByUnits(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -119372,7 +119721,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getParameterByRestrictionResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getParameterByRestrictionResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getParameterByRestrictionResponse);
   if (id < 0)
     return soap->error;
@@ -119383,22 +119732,22 @@ SOAP_FMAC3 ns1__getParameterByRestrictionResponse **SOAP_FMAC4
 soap_in_PointerTons1__getParameterByRestrictionResponse(
     struct soap *soap, const char *tag,
     ns1__getParameterByRestrictionResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getParameterByRestrictionResponse **)soap_malloc(
               soap, sizeof(ns1__getParameterByRestrictionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getParameterByRestrictionResponse *)
               soap_instantiate_ns1__getParameterByRestrictionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getParameterByRestrictionResponse **p =
         (ns1__getParameterByRestrictionResponse **)soap_id_lookup(
@@ -119407,7 +119756,7 @@ soap_in_PointerTons1__getParameterByRestrictionResponse(
             sizeof(ns1__getParameterByRestrictionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -119417,7 +119766,7 @@ soap_put_PointerTons1__getParameterByRestrictionResponse(
     struct soap *soap, ns1__getParameterByRestrictionResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__getParameterByRestrictionResponse);
   if (soap_out_PointerTons1__getParameterByRestrictionResponse(
           soap, tag ? tag : "ns1:getParameterByRestrictionResponse", id, a,
@@ -119433,7 +119782,7 @@ soap_get_PointerTons1__getParameterByRestrictionResponse(
   if ((p = soap_in_PointerTons1__getParameterByRestrictionResponse(soap, tag, p,
                                                                    type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -119449,7 +119798,7 @@ soap_serialize_PointerTons1__getParameterByRestriction(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getParameterByRestriction(
     struct soap *soap, const char *tag, int id,
     ns1__getParameterByRestriction *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getParameterByRestriction);
   if (id < 0)
     return soap->error;
@@ -119460,22 +119809,22 @@ SOAP_FMAC3 ns1__getParameterByRestriction **SOAP_FMAC4
 soap_in_PointerTons1__getParameterByRestriction(
     struct soap *soap, const char *tag, ns1__getParameterByRestriction **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getParameterByRestriction **)soap_malloc(
               soap, sizeof(ns1__getParameterByRestriction *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getParameterByRestriction *)
               soap_instantiate_ns1__getParameterByRestriction(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getParameterByRestriction **p =
         (ns1__getParameterByRestriction **)soap_id_lookup(
@@ -119484,7 +119833,7 @@ soap_in_PointerTons1__getParameterByRestriction(
             sizeof(ns1__getParameterByRestriction), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -119492,7 +119841,7 @@ soap_in_PointerTons1__getParameterByRestriction(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getParameterByRestriction(
     struct soap *soap, ns1__getParameterByRestriction *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getParameterByRestriction);
   if (soap_out_PointerTons1__getParameterByRestriction(
           soap, tag ? tag : "ns1:getParameterByRestriction", id, a, type))
@@ -119506,7 +119855,7 @@ soap_get_PointerTons1__getParameterByRestriction(
     const char *type) {
   if ((p = soap_in_PointerTons1__getParameterByRestriction(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -119523,7 +119872,7 @@ soap_serialize_PointerTons1__getParameterByNameResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getParameterByNameResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getParameterByNameResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getParameterByNameResponse);
   if (id < 0)
     return soap->error;
@@ -119534,22 +119883,22 @@ SOAP_FMAC3 ns1__getParameterByNameResponse **SOAP_FMAC4
 soap_in_PointerTons1__getParameterByNameResponse(
     struct soap *soap, const char *tag, ns1__getParameterByNameResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getParameterByNameResponse **)soap_malloc(
               soap, sizeof(ns1__getParameterByNameResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getParameterByNameResponse *)
               soap_instantiate_ns1__getParameterByNameResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getParameterByNameResponse **p =
         (ns1__getParameterByNameResponse **)soap_id_lookup(
@@ -119558,7 +119907,7 @@ soap_in_PointerTons1__getParameterByNameResponse(
             sizeof(ns1__getParameterByNameResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -119566,7 +119915,7 @@ soap_in_PointerTons1__getParameterByNameResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getParameterByNameResponse(
     struct soap *soap, ns1__getParameterByNameResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getParameterByNameResponse);
   if (soap_out_PointerTons1__getParameterByNameResponse(
           soap, tag ? tag : "ns1:getParameterByNameResponse", id, a, type))
@@ -119581,7 +119930,7 @@ soap_get_PointerTons1__getParameterByNameResponse(
   if ((p = soap_in_PointerTons1__getParameterByNameResponse(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -119598,7 +119947,7 @@ soap_out_PointerTons1__getParameterByName(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__getParameterByName *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getParameterByName);
   if (id < 0)
     return soap->error;
@@ -119609,29 +119958,29 @@ SOAP_FMAC3 ns1__getParameterByName **SOAP_FMAC4
 soap_in_PointerTons1__getParameterByName(struct soap *soap, const char *tag,
                                          ns1__getParameterByName **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getParameterByName **)soap_malloc(
               soap, sizeof(ns1__getParameterByName *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getParameterByName *)
-              soap_instantiate_ns1__getParameterByName(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__getParameterByName(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getParameterByName **p = (ns1__getParameterByName **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getParameterByName,
         sizeof(ns1__getParameterByName), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -119640,7 +119989,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getParameterByName(struct soap *soap,
                                           ns1__getParameterByName *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getParameterByName);
   if (soap_out_PointerTons1__getParameterByName(
           soap, tag ? tag : "ns1:getParameterByName", id, a, type))
@@ -119654,7 +120003,7 @@ soap_get_PointerTons1__getParameterByName(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getParameterByName(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -119672,7 +120021,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getParameterByNameUnitsResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getParameterByNameUnitsResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getParameterByNameUnitsResponse);
   if (id < 0)
     return soap->error;
@@ -119683,22 +120032,22 @@ SOAP_FMAC3 ns1__getParameterByNameUnitsResponse **SOAP_FMAC4
 soap_in_PointerTons1__getParameterByNameUnitsResponse(
     struct soap *soap, const char *tag,
     ns1__getParameterByNameUnitsResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getParameterByNameUnitsResponse **)soap_malloc(
               soap, sizeof(ns1__getParameterByNameUnitsResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getParameterByNameUnitsResponse *)
               soap_instantiate_ns1__getParameterByNameUnitsResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getParameterByNameUnitsResponse **p =
         (ns1__getParameterByNameUnitsResponse **)soap_id_lookup(
@@ -119707,7 +120056,7 @@ soap_in_PointerTons1__getParameterByNameUnitsResponse(
             sizeof(ns1__getParameterByNameUnitsResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -119717,7 +120066,7 @@ soap_put_PointerTons1__getParameterByNameUnitsResponse(
     struct soap *soap, ns1__getParameterByNameUnitsResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__getParameterByNameUnitsResponse);
   if (soap_out_PointerTons1__getParameterByNameUnitsResponse(
           soap, tag ? tag : "ns1:getParameterByNameUnitsResponse", id, a, type))
@@ -119732,7 +120081,7 @@ soap_get_PointerTons1__getParameterByNameUnitsResponse(
   if ((p = soap_in_PointerTons1__getParameterByNameUnitsResponse(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -119747,7 +120096,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__getParameterByNameUnits(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getParameterByNameUnits(
     struct soap *soap, const char *tag, int id,
     ns1__getParameterByNameUnits *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getParameterByNameUnits);
   if (id < 0)
     return soap->error;
@@ -119759,22 +120108,22 @@ soap_in_PointerTons1__getParameterByNameUnits(struct soap *soap,
                                               const char *tag,
                                               ns1__getParameterByNameUnits **a,
                                               const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getParameterByNameUnits **)soap_malloc(
               soap, sizeof(ns1__getParameterByNameUnits *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getParameterByNameUnits *)
               soap_instantiate_ns1__getParameterByNameUnits(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getParameterByNameUnits **p =
         (ns1__getParameterByNameUnits **)soap_id_lookup(
@@ -119783,7 +120132,7 @@ soap_in_PointerTons1__getParameterByNameUnits(struct soap *soap,
             sizeof(ns1__getParameterByNameUnits), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -119791,7 +120140,7 @@ soap_in_PointerTons1__getParameterByNameUnits(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getParameterByNameUnits(
     struct soap *soap, ns1__getParameterByNameUnits *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getParameterByNameUnits);
   if (soap_out_PointerTons1__getParameterByNameUnits(
           soap, tag ? tag : "ns1:getParameterByNameUnits", id, a, type))
@@ -119806,7 +120155,7 @@ soap_get_PointerTons1__getParameterByNameUnits(struct soap *soap,
                                                const char *type) {
   if ((p = soap_in_PointerTons1__getParameterByNameUnits(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -119824,7 +120173,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchSampleByParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchSampleByParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchSampleByParameterResponse);
   if (id < 0)
     return soap->error;
@@ -119835,22 +120184,22 @@ SOAP_FMAC3 ns1__searchSampleByParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByParameterResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByParameterResponse **)soap_malloc(
               soap, sizeof(ns1__searchSampleByParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByParameterResponse *)
               soap_instantiate_ns1__searchSampleByParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByParameterResponse **p =
         (ns1__searchSampleByParameterResponse **)soap_id_lookup(
@@ -119859,7 +120208,7 @@ soap_in_PointerTons1__searchSampleByParameterResponse(
             sizeof(ns1__searchSampleByParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -119869,7 +120218,7 @@ soap_put_PointerTons1__searchSampleByParameterResponse(
     struct soap *soap, ns1__searchSampleByParameterResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterResponse);
   if (soap_out_PointerTons1__searchSampleByParameterResponse(
           soap, tag ? tag : "ns1:searchSampleByParameterResponse", id, a, type))
@@ -119884,7 +120233,7 @@ soap_get_PointerTons1__searchSampleByParameterResponse(
   if ((p = soap_in_PointerTons1__searchSampleByParameterResponse(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -119899,7 +120248,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__searchSampleByParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchSampleByParameter(
     struct soap *soap, const char *tag, int id,
     ns1__searchSampleByParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchSampleByParameter);
   if (id < 0)
     return soap->error;
@@ -119911,22 +120260,22 @@ soap_in_PointerTons1__searchSampleByParameter(struct soap *soap,
                                               const char *tag,
                                               ns1__searchSampleByParameter **a,
                                               const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByParameter **)soap_malloc(
               soap, sizeof(ns1__searchSampleByParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByParameter *)
               soap_instantiate_ns1__searchSampleByParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByParameter **p =
         (ns1__searchSampleByParameter **)soap_id_lookup(
@@ -119935,7 +120284,7 @@ soap_in_PointerTons1__searchSampleByParameter(struct soap *soap,
             sizeof(ns1__searchSampleByParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -119943,7 +120292,7 @@ soap_in_PointerTons1__searchSampleByParameter(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchSampleByParameter(
     struct soap *soap, ns1__searchSampleByParameter *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameter);
   if (soap_out_PointerTons1__searchSampleByParameter(
           soap, tag ? tag : "ns1:searchSampleByParameter", id, a, type))
@@ -119958,7 +120307,7 @@ soap_get_PointerTons1__searchSampleByParameter(struct soap *soap,
                                                const char *type) {
   if ((p = soap_in_PointerTons1__searchSampleByParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -119976,7 +120325,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchDatasetByParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatasetByParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatasetByParameterResponse);
   if (id < 0)
     return soap->error;
@@ -119987,22 +120336,22 @@ SOAP_FMAC3 ns1__searchDatasetByParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByParameterResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByParameterResponse **)soap_malloc(
               soap, sizeof(ns1__searchDatasetByParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByParameterResponse *)
               soap_instantiate_ns1__searchDatasetByParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByParameterResponse **p =
         (ns1__searchDatasetByParameterResponse **)soap_id_lookup(
@@ -120011,7 +120360,7 @@ soap_in_PointerTons1__searchDatasetByParameterResponse(
             sizeof(ns1__searchDatasetByParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -120021,7 +120370,7 @@ soap_put_PointerTons1__searchDatasetByParameterResponse(
     struct soap *soap, ns1__searchDatasetByParameterResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterResponse);
   if (soap_out_PointerTons1__searchDatasetByParameterResponse(
           soap, tag ? tag : "ns1:searchDatasetByParameterResponse", id, a,
@@ -120037,7 +120386,7 @@ soap_get_PointerTons1__searchDatasetByParameterResponse(
   if ((p = soap_in_PointerTons1__searchDatasetByParameterResponse(soap, tag, p,
                                                                   type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -120053,7 +120402,7 @@ soap_serialize_PointerTons1__searchDatasetByParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchDatasetByParameter(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatasetByParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatasetByParameter);
   if (id < 0)
     return soap->error;
@@ -120064,22 +120413,22 @@ SOAP_FMAC3 ns1__searchDatasetByParameter **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByParameter(
     struct soap *soap, const char *tag, ns1__searchDatasetByParameter **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByParameter **)soap_malloc(
               soap, sizeof(ns1__searchDatasetByParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByParameter *)
               soap_instantiate_ns1__searchDatasetByParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByParameter **p =
         (ns1__searchDatasetByParameter **)soap_id_lookup(
@@ -120088,7 +120437,7 @@ soap_in_PointerTons1__searchDatasetByParameter(
             sizeof(ns1__searchDatasetByParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -120096,7 +120445,7 @@ soap_in_PointerTons1__searchDatasetByParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchDatasetByParameter(
     struct soap *soap, ns1__searchDatasetByParameter *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameter);
   if (soap_out_PointerTons1__searchDatasetByParameter(
           soap, tag ? tag : "ns1:searchDatasetByParameter", id, a, type))
@@ -120110,7 +120459,7 @@ soap_get_PointerTons1__searchDatasetByParameter(
     const char *type) {
   if ((p = soap_in_PointerTons1__searchDatasetByParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -120128,7 +120477,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchDatafileByParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatafileByParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatafileByParameterResponse);
   if (id < 0)
     return soap->error;
@@ -120139,22 +120488,22 @@ SOAP_FMAC3 ns1__searchDatafileByParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByParameterResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByParameterResponse **)soap_malloc(
               soap, sizeof(ns1__searchDatafileByParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByParameterResponse *)
               soap_instantiate_ns1__searchDatafileByParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByParameterResponse **p =
         (ns1__searchDatafileByParameterResponse **)soap_id_lookup(
@@ -120163,7 +120512,7 @@ soap_in_PointerTons1__searchDatafileByParameterResponse(
             sizeof(ns1__searchDatafileByParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -120173,7 +120522,7 @@ soap_put_PointerTons1__searchDatafileByParameterResponse(
     struct soap *soap, ns1__searchDatafileByParameterResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterResponse);
   if (soap_out_PointerTons1__searchDatafileByParameterResponse(
           soap, tag ? tag : "ns1:searchDatafileByParameterResponse", id, a,
@@ -120189,7 +120538,7 @@ soap_get_PointerTons1__searchDatafileByParameterResponse(
   if ((p = soap_in_PointerTons1__searchDatafileByParameterResponse(soap, tag, p,
                                                                    type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -120205,7 +120554,7 @@ soap_serialize_PointerTons1__searchDatafileByParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchDatafileByParameter(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatafileByParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatafileByParameter);
   if (id < 0)
     return soap->error;
@@ -120216,22 +120565,22 @@ SOAP_FMAC3 ns1__searchDatafileByParameter **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByParameter(
     struct soap *soap, const char *tag, ns1__searchDatafileByParameter **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByParameter **)soap_malloc(
               soap, sizeof(ns1__searchDatafileByParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByParameter *)
               soap_instantiate_ns1__searchDatafileByParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByParameter **p =
         (ns1__searchDatafileByParameter **)soap_id_lookup(
@@ -120240,7 +120589,7 @@ soap_in_PointerTons1__searchDatafileByParameter(
             sizeof(ns1__searchDatafileByParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -120248,7 +120597,7 @@ soap_in_PointerTons1__searchDatafileByParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchDatafileByParameter(
     struct soap *soap, ns1__searchDatafileByParameter *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameter);
   if (soap_out_PointerTons1__searchDatafileByParameter(
           soap, tag ? tag : "ns1:searchDatafileByParameter", id, a, type))
@@ -120262,7 +120611,7 @@ soap_get_PointerTons1__searchDatafileByParameter(
     const char *type) {
   if ((p = soap_in_PointerTons1__searchDatafileByParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -120282,7 +120631,7 @@ soap_out_PointerTons1__searchInvestigationByParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchInvestigationByParameterResponse *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterResponse);
   if (id < 0)
     return soap->error;
@@ -120293,22 +120642,22 @@ SOAP_FMAC3 ns1__searchInvestigationByParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchInvestigationByParameterResponse(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByParameterResponse **)soap_malloc(
               soap, sizeof(ns1__searchInvestigationByParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByParameterResponse *)
               soap_instantiate_ns1__searchInvestigationByParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByParameterResponse **p =
         (ns1__searchInvestigationByParameterResponse **)soap_id_lookup(
@@ -120317,7 +120666,7 @@ soap_in_PointerTons1__searchInvestigationByParameterResponse(
             sizeof(ns1__searchInvestigationByParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -120327,7 +120676,7 @@ soap_put_PointerTons1__searchInvestigationByParameterResponse(
     struct soap *soap, ns1__searchInvestigationByParameterResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterResponse);
   if (soap_out_PointerTons1__searchInvestigationByParameterResponse(
           soap, tag ? tag : "ns1:searchInvestigationByParameterResponse", id, a,
@@ -120343,7 +120692,7 @@ soap_get_PointerTons1__searchInvestigationByParameterResponse(
   if ((p = soap_in_PointerTons1__searchInvestigationByParameterResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -120360,7 +120709,7 @@ soap_serialize_PointerTons1__searchInvestigationByParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchInvestigationByParameter(
     struct soap *soap, const char *tag, int id,
     ns1__searchInvestigationByParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchInvestigationByParameter);
   if (id < 0)
     return soap->error;
@@ -120371,22 +120720,22 @@ SOAP_FMAC3 ns1__searchInvestigationByParameter **SOAP_FMAC4
 soap_in_PointerTons1__searchInvestigationByParameter(
     struct soap *soap, const char *tag, ns1__searchInvestigationByParameter **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByParameter **)soap_malloc(
               soap, sizeof(ns1__searchInvestigationByParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByParameter *)
               soap_instantiate_ns1__searchInvestigationByParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByParameter **p =
         (ns1__searchInvestigationByParameter **)soap_id_lookup(
@@ -120395,7 +120744,7 @@ soap_in_PointerTons1__searchInvestigationByParameter(
             sizeof(ns1__searchInvestigationByParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -120404,7 +120753,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchInvestigationByParameter(
     struct soap *soap, ns1__searchInvestigationByParameter *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameter);
   if (soap_out_PointerTons1__searchInvestigationByParameter(
           soap, tag ? tag : "ns1:searchInvestigationByParameter", id, a, type))
@@ -120419,7 +120768,7 @@ soap_get_PointerTons1__searchInvestigationByParameter(
   if ((p = soap_in_PointerTons1__searchInvestigationByParameter(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -120441,7 +120790,7 @@ soap_out_PointerTons1__searchSampleByParameterComparisonResponse(
     ns1__searchSampleByParameterComparisonResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchSampleByParameterComparisonResponse);
   if (id < 0)
     return soap->error;
@@ -120452,22 +120801,22 @@ SOAP_FMAC3 ns1__searchSampleByParameterComparisonResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByParameterComparisonResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterComparisonResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByParameterComparisonResponse **)soap_malloc(
               soap, sizeof(ns1__searchSampleByParameterComparisonResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByParameterComparisonResponse *)
               soap_instantiate_ns1__searchSampleByParameterComparisonResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByParameterComparisonResponse **p =
         (ns1__searchSampleByParameterComparisonResponse **)soap_id_lookup(
@@ -120476,7 +120825,7 @@ soap_in_PointerTons1__searchSampleByParameterComparisonResponse(
             sizeof(ns1__searchSampleByParameterComparisonResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -120486,7 +120835,7 @@ soap_put_PointerTons1__searchSampleByParameterComparisonResponse(
     struct soap *soap, ns1__searchSampleByParameterComparisonResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterComparisonResponse);
   if (soap_out_PointerTons1__searchSampleByParameterComparisonResponse(
           soap, tag ? tag : "ns1:searchSampleByParameterComparisonResponse", id,
@@ -120502,7 +120851,7 @@ soap_get_PointerTons1__searchSampleByParameterComparisonResponse(
   if ((p = soap_in_PointerTons1__searchSampleByParameterComparisonResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -120520,7 +120869,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchSampleByParameterComparison(
     struct soap *soap, const char *tag, int id,
     ns1__searchSampleByParameterComparison *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchSampleByParameterComparison);
   if (id < 0)
     return soap->error;
@@ -120531,22 +120880,22 @@ SOAP_FMAC3 ns1__searchSampleByParameterComparison **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByParameterComparison(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterComparison **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByParameterComparison **)soap_malloc(
               soap, sizeof(ns1__searchSampleByParameterComparison *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByParameterComparison *)
               soap_instantiate_ns1__searchSampleByParameterComparison(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByParameterComparison **p =
         (ns1__searchSampleByParameterComparison **)soap_id_lookup(
@@ -120555,7 +120904,7 @@ soap_in_PointerTons1__searchSampleByParameterComparison(
             sizeof(ns1__searchSampleByParameterComparison), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -120565,7 +120914,7 @@ soap_put_PointerTons1__searchSampleByParameterComparison(
     struct soap *soap, ns1__searchSampleByParameterComparison *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterComparison);
   if (soap_out_PointerTons1__searchSampleByParameterComparison(
           soap, tag ? tag : "ns1:searchSampleByParameterComparison", id, a,
@@ -120581,7 +120930,7 @@ soap_get_PointerTons1__searchSampleByParameterComparison(
   if ((p = soap_in_PointerTons1__searchSampleByParameterComparison(soap, tag, p,
                                                                    type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -120603,7 +120952,7 @@ soap_out_PointerTons1__searchDatasetByParameterComparisonResponse(
     ns1__searchDatasetByParameterComparisonResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterComparisonResponse);
   if (id < 0)
     return soap->error;
@@ -120614,22 +120963,22 @@ SOAP_FMAC3 ns1__searchDatasetByParameterComparisonResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByParameterComparisonResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterComparisonResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByParameterComparisonResponse **)soap_malloc(
               soap, sizeof(ns1__searchDatasetByParameterComparisonResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByParameterComparisonResponse *)
               soap_instantiate_ns1__searchDatasetByParameterComparisonResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByParameterComparisonResponse **p =
         (ns1__searchDatasetByParameterComparisonResponse **)soap_id_lookup(
@@ -120638,7 +120987,7 @@ soap_in_PointerTons1__searchDatasetByParameterComparisonResponse(
             sizeof(ns1__searchDatasetByParameterComparisonResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -120649,7 +120998,7 @@ soap_put_PointerTons1__searchDatasetByParameterComparisonResponse(
     ns1__searchDatasetByParameterComparisonResponse *const *a, const char *tag,
     const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterComparisonResponse);
   if (soap_out_PointerTons1__searchDatasetByParameterComparisonResponse(
           soap, tag ? tag : "ns1:searchDatasetByParameterComparisonResponse",
@@ -120665,7 +121014,7 @@ soap_get_PointerTons1__searchDatasetByParameterComparisonResponse(
   if ((p = soap_in_PointerTons1__searchDatasetByParameterComparisonResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -120683,7 +121032,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchDatasetByParameterComparison(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatasetByParameterComparison *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatasetByParameterComparison);
   if (id < 0)
     return soap->error;
@@ -120694,22 +121043,22 @@ SOAP_FMAC3 ns1__searchDatasetByParameterComparison **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByParameterComparison(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterComparison **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByParameterComparison **)soap_malloc(
               soap, sizeof(ns1__searchDatasetByParameterComparison *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByParameterComparison *)
               soap_instantiate_ns1__searchDatasetByParameterComparison(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByParameterComparison **p =
         (ns1__searchDatasetByParameterComparison **)soap_id_lookup(
@@ -120718,7 +121067,7 @@ soap_in_PointerTons1__searchDatasetByParameterComparison(
             sizeof(ns1__searchDatasetByParameterComparison), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -120728,7 +121077,7 @@ soap_put_PointerTons1__searchDatasetByParameterComparison(
     struct soap *soap, ns1__searchDatasetByParameterComparison *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterComparison);
   if (soap_out_PointerTons1__searchDatasetByParameterComparison(
           soap, tag ? tag : "ns1:searchDatasetByParameterComparison", id, a,
@@ -120744,7 +121093,7 @@ soap_get_PointerTons1__searchDatasetByParameterComparison(
   if ((p = soap_in_PointerTons1__searchDatasetByParameterComparison(soap, tag,
                                                                     p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -120766,7 +121115,7 @@ soap_out_PointerTons1__searchDatafileByParameterComparisonResponse(
     ns1__searchDatafileByParameterComparisonResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterComparisonResponse);
   if (id < 0)
     return soap->error;
@@ -120777,23 +121126,23 @@ SOAP_FMAC3 ns1__searchDatafileByParameterComparisonResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByParameterComparisonResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterComparisonResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByParameterComparisonResponse **)soap_malloc(
               soap,
               sizeof(ns1__searchDatafileByParameterComparisonResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByParameterComparisonResponse *)
               soap_instantiate_ns1__searchDatafileByParameterComparisonResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByParameterComparisonResponse **p =
         (ns1__searchDatafileByParameterComparisonResponse **)soap_id_lookup(
@@ -120802,7 +121151,7 @@ soap_in_PointerTons1__searchDatafileByParameterComparisonResponse(
             sizeof(ns1__searchDatafileByParameterComparisonResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -120813,7 +121162,7 @@ soap_put_PointerTons1__searchDatafileByParameterComparisonResponse(
     ns1__searchDatafileByParameterComparisonResponse *const *a, const char *tag,
     const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterComparisonResponse);
   if (soap_out_PointerTons1__searchDatafileByParameterComparisonResponse(
           soap, tag ? tag : "ns1:searchDatafileByParameterComparisonResponse",
@@ -120829,7 +121178,7 @@ soap_get_PointerTons1__searchDatafileByParameterComparisonResponse(
   if ((p = soap_in_PointerTons1__searchDatafileByParameterComparisonResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -120848,7 +121197,7 @@ soap_out_PointerTons1__searchDatafileByParameterComparison(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatafileByParameterComparison *const *a, const char *type) {
   id =
-      soap_element_id(soap, tag, id, *a, NULL, 0, type,
+      soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterComparison);
   if (id < 0)
     return soap->error;
@@ -120859,22 +121208,22 @@ SOAP_FMAC3 ns1__searchDatafileByParameterComparison **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByParameterComparison(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterComparison **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByParameterComparison **)soap_malloc(
               soap, sizeof(ns1__searchDatafileByParameterComparison *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByParameterComparison *)
               soap_instantiate_ns1__searchDatafileByParameterComparison(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByParameterComparison **p =
         (ns1__searchDatafileByParameterComparison **)soap_id_lookup(
@@ -120883,7 +121232,7 @@ soap_in_PointerTons1__searchDatafileByParameterComparison(
             sizeof(ns1__searchDatafileByParameterComparison), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -120893,7 +121242,7 @@ soap_put_PointerTons1__searchDatafileByParameterComparison(
     struct soap *soap, ns1__searchDatafileByParameterComparison *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterComparison);
   if (soap_out_PointerTons1__searchDatafileByParameterComparison(
           soap, tag ? tag : "ns1:searchDatafileByParameterComparison", id, a,
@@ -120909,7 +121258,7 @@ soap_get_PointerTons1__searchDatafileByParameterComparison(
   if ((p = soap_in_PointerTons1__searchDatafileByParameterComparison(soap, tag,
                                                                      p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -120931,7 +121280,7 @@ soap_out_PointerTons1__searchInvestigationByParameterComparisonResponse(
     ns1__searchInvestigationByParameterComparisonResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterComparisonResponse);
   if (id < 0)
     return soap->error;
@@ -120943,25 +121292,25 @@ soap_in_PointerTons1__searchInvestigationByParameterComparisonResponse(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterComparisonResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByParameterComparisonResponse **)
               soap_malloc(
                   soap,
                   sizeof(
                       ns1__searchInvestigationByParameterComparisonResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByParameterComparisonResponse *)
               soap_instantiate_ns1__searchInvestigationByParameterComparisonResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByParameterComparisonResponse **p =
         (ns1__searchInvestigationByParameterComparisonResponse **)soap_id_lookup(
@@ -120970,7 +121319,7 @@ soap_in_PointerTons1__searchInvestigationByParameterComparisonResponse(
             sizeof(ns1__searchInvestigationByParameterComparisonResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -120981,7 +121330,7 @@ soap_put_PointerTons1__searchInvestigationByParameterComparisonResponse(
     ns1__searchInvestigationByParameterComparisonResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterComparisonResponse);
   if (soap_out_PointerTons1__searchInvestigationByParameterComparisonResponse(
           soap,
@@ -120999,7 +121348,7 @@ soap_get_PointerTons1__searchInvestigationByParameterComparisonResponse(
   if ((p = soap_in_PointerTons1__searchInvestigationByParameterComparisonResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -121020,7 +121369,7 @@ soap_out_PointerTons1__searchInvestigationByParameterComparison(
     struct soap *soap, const char *tag, int id,
     ns1__searchInvestigationByParameterComparison *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterComparison);
   if (id < 0)
     return soap->error;
@@ -121031,22 +121380,22 @@ SOAP_FMAC3 ns1__searchInvestigationByParameterComparison **SOAP_FMAC4
 soap_in_PointerTons1__searchInvestigationByParameterComparison(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterComparison **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByParameterComparison **)soap_malloc(
               soap, sizeof(ns1__searchInvestigationByParameterComparison *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByParameterComparison *)
               soap_instantiate_ns1__searchInvestigationByParameterComparison(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByParameterComparison **p =
         (ns1__searchInvestigationByParameterComparison **)soap_id_lookup(
@@ -121055,7 +121404,7 @@ soap_in_PointerTons1__searchInvestigationByParameterComparison(
             sizeof(ns1__searchInvestigationByParameterComparison), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -121065,7 +121414,7 @@ soap_put_PointerTons1__searchInvestigationByParameterComparison(
     struct soap *soap, ns1__searchInvestigationByParameterComparison *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterComparison);
   if (soap_out_PointerTons1__searchInvestigationByParameterComparison(
           soap, tag ? tag : "ns1:searchInvestigationByParameterComparison", id,
@@ -121081,7 +121430,7 @@ soap_get_PointerTons1__searchInvestigationByParameterComparison(
   if ((p = soap_in_PointerTons1__searchInvestigationByParameterComparison(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -121102,7 +121451,7 @@ soap_out_PointerTons1__searchSampleByParameterConditionResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchSampleByParameterConditionResponse *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchSampleByParameterConditionResponse);
   if (id < 0)
     return soap->error;
@@ -121113,22 +121462,22 @@ SOAP_FMAC3 ns1__searchSampleByParameterConditionResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByParameterConditionResponse(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterConditionResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByParameterConditionResponse **)soap_malloc(
               soap, sizeof(ns1__searchSampleByParameterConditionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByParameterConditionResponse *)
               soap_instantiate_ns1__searchSampleByParameterConditionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByParameterConditionResponse **p =
         (ns1__searchSampleByParameterConditionResponse **)soap_id_lookup(
@@ -121137,7 +121486,7 @@ soap_in_PointerTons1__searchSampleByParameterConditionResponse(
             sizeof(ns1__searchSampleByParameterConditionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -121147,7 +121496,7 @@ soap_put_PointerTons1__searchSampleByParameterConditionResponse(
     struct soap *soap, ns1__searchSampleByParameterConditionResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterConditionResponse);
   if (soap_out_PointerTons1__searchSampleByParameterConditionResponse(
           soap, tag ? tag : "ns1:searchSampleByParameterConditionResponse", id,
@@ -121163,7 +121512,7 @@ soap_get_PointerTons1__searchSampleByParameterConditionResponse(
   if ((p = soap_in_PointerTons1__searchSampleByParameterConditionResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -121181,7 +121530,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchSampleByParameterCondition(
     struct soap *soap, const char *tag, int id,
     ns1__searchSampleByParameterCondition *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchSampleByParameterCondition);
   if (id < 0)
     return soap->error;
@@ -121192,22 +121541,22 @@ SOAP_FMAC3 ns1__searchSampleByParameterCondition **SOAP_FMAC4
 soap_in_PointerTons1__searchSampleByParameterCondition(
     struct soap *soap, const char *tag,
     ns1__searchSampleByParameterCondition **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSampleByParameterCondition **)soap_malloc(
               soap, sizeof(ns1__searchSampleByParameterCondition *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSampleByParameterCondition *)
               soap_instantiate_ns1__searchSampleByParameterCondition(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSampleByParameterCondition **p =
         (ns1__searchSampleByParameterCondition **)soap_id_lookup(
@@ -121216,7 +121565,7 @@ soap_in_PointerTons1__searchSampleByParameterCondition(
             sizeof(ns1__searchSampleByParameterCondition), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -121226,7 +121575,7 @@ soap_put_PointerTons1__searchSampleByParameterCondition(
     struct soap *soap, ns1__searchSampleByParameterCondition *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchSampleByParameterCondition);
   if (soap_out_PointerTons1__searchSampleByParameterCondition(
           soap, tag ? tag : "ns1:searchSampleByParameterCondition", id, a,
@@ -121242,7 +121591,7 @@ soap_get_PointerTons1__searchSampleByParameterCondition(
   if ((p = soap_in_PointerTons1__searchSampleByParameterCondition(soap, tag, p,
                                                                   type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -121264,7 +121613,7 @@ soap_out_PointerTons1__searchDatasetByParameterConditionResponse(
     ns1__searchDatasetByParameterConditionResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatasetByParameterConditionResponse);
   if (id < 0)
     return soap->error;
@@ -121275,22 +121624,22 @@ SOAP_FMAC3 ns1__searchDatasetByParameterConditionResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByParameterConditionResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterConditionResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByParameterConditionResponse **)soap_malloc(
               soap, sizeof(ns1__searchDatasetByParameterConditionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByParameterConditionResponse *)
               soap_instantiate_ns1__searchDatasetByParameterConditionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByParameterConditionResponse **p =
         (ns1__searchDatasetByParameterConditionResponse **)soap_id_lookup(
@@ -121299,7 +121648,7 @@ soap_in_PointerTons1__searchDatasetByParameterConditionResponse(
             sizeof(ns1__searchDatasetByParameterConditionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -121309,7 +121658,7 @@ soap_put_PointerTons1__searchDatasetByParameterConditionResponse(
     struct soap *soap, ns1__searchDatasetByParameterConditionResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterConditionResponse);
   if (soap_out_PointerTons1__searchDatasetByParameterConditionResponse(
           soap, tag ? tag : "ns1:searchDatasetByParameterConditionResponse", id,
@@ -121325,7 +121674,7 @@ soap_get_PointerTons1__searchDatasetByParameterConditionResponse(
   if ((p = soap_in_PointerTons1__searchDatasetByParameterConditionResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -121343,7 +121692,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchDatasetByParameterCondition(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatasetByParameterCondition *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatasetByParameterCondition);
   if (id < 0)
     return soap->error;
@@ -121354,22 +121703,22 @@ SOAP_FMAC3 ns1__searchDatasetByParameterCondition **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetByParameterCondition(
     struct soap *soap, const char *tag,
     ns1__searchDatasetByParameterCondition **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetByParameterCondition **)soap_malloc(
               soap, sizeof(ns1__searchDatasetByParameterCondition *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetByParameterCondition *)
               soap_instantiate_ns1__searchDatasetByParameterCondition(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetByParameterCondition **p =
         (ns1__searchDatasetByParameterCondition **)soap_id_lookup(
@@ -121378,7 +121727,7 @@ soap_in_PointerTons1__searchDatasetByParameterCondition(
             sizeof(ns1__searchDatasetByParameterCondition), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -121388,7 +121737,7 @@ soap_put_PointerTons1__searchDatasetByParameterCondition(
     struct soap *soap, ns1__searchDatasetByParameterCondition *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatasetByParameterCondition);
   if (soap_out_PointerTons1__searchDatasetByParameterCondition(
           soap, tag ? tag : "ns1:searchDatasetByParameterCondition", id, a,
@@ -121404,7 +121753,7 @@ soap_get_PointerTons1__searchDatasetByParameterCondition(
   if ((p = soap_in_PointerTons1__searchDatasetByParameterCondition(soap, tag, p,
                                                                    type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -121426,7 +121775,7 @@ soap_out_PointerTons1__searchDatafileByParameterConditionResponse(
     ns1__searchDatafileByParameterConditionResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchDatafileByParameterConditionResponse);
   if (id < 0)
     return soap->error;
@@ -121437,22 +121786,22 @@ SOAP_FMAC3 ns1__searchDatafileByParameterConditionResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByParameterConditionResponse(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterConditionResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByParameterConditionResponse **)soap_malloc(
               soap, sizeof(ns1__searchDatafileByParameterConditionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByParameterConditionResponse *)
               soap_instantiate_ns1__searchDatafileByParameterConditionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByParameterConditionResponse **p =
         (ns1__searchDatafileByParameterConditionResponse **)soap_id_lookup(
@@ -121461,7 +121810,7 @@ soap_in_PointerTons1__searchDatafileByParameterConditionResponse(
             sizeof(ns1__searchDatafileByParameterConditionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -121472,7 +121821,7 @@ soap_put_PointerTons1__searchDatafileByParameterConditionResponse(
     ns1__searchDatafileByParameterConditionResponse *const *a, const char *tag,
     const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterConditionResponse);
   if (soap_out_PointerTons1__searchDatafileByParameterConditionResponse(
           soap, tag ? tag : "ns1:searchDatafileByParameterConditionResponse",
@@ -121488,7 +121837,7 @@ soap_get_PointerTons1__searchDatafileByParameterConditionResponse(
   if ((p = soap_in_PointerTons1__searchDatafileByParameterConditionResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -121506,7 +121855,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchDatafileByParameterCondition(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatafileByParameterCondition *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatafileByParameterCondition);
   if (id < 0)
     return soap->error;
@@ -121517,22 +121866,22 @@ SOAP_FMAC3 ns1__searchDatafileByParameterCondition **SOAP_FMAC4
 soap_in_PointerTons1__searchDatafileByParameterCondition(
     struct soap *soap, const char *tag,
     ns1__searchDatafileByParameterCondition **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatafileByParameterCondition **)soap_malloc(
               soap, sizeof(ns1__searchDatafileByParameterCondition *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatafileByParameterCondition *)
               soap_instantiate_ns1__searchDatafileByParameterCondition(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatafileByParameterCondition **p =
         (ns1__searchDatafileByParameterCondition **)soap_id_lookup(
@@ -121541,7 +121890,7 @@ soap_in_PointerTons1__searchDatafileByParameterCondition(
             sizeof(ns1__searchDatafileByParameterCondition), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -121551,7 +121900,7 @@ soap_put_PointerTons1__searchDatafileByParameterCondition(
     struct soap *soap, ns1__searchDatafileByParameterCondition *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchDatafileByParameterCondition);
   if (soap_out_PointerTons1__searchDatafileByParameterCondition(
           soap, tag ? tag : "ns1:searchDatafileByParameterCondition", id, a,
@@ -121567,7 +121916,7 @@ soap_get_PointerTons1__searchDatafileByParameterCondition(
   if ((p = soap_in_PointerTons1__searchDatafileByParameterCondition(soap, tag,
                                                                     p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -121589,7 +121938,7 @@ soap_out_PointerTons1__searchInvestigationByParameterConditionResponse(
     ns1__searchInvestigationByParameterConditionResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterConditionResponse);
   if (id < 0)
     return soap->error;
@@ -121601,25 +121950,25 @@ soap_in_PointerTons1__searchInvestigationByParameterConditionResponse(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterConditionResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByParameterConditionResponse **)
               soap_malloc(
                   soap,
                   sizeof(
                       ns1__searchInvestigationByParameterConditionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByParameterConditionResponse *)
               soap_instantiate_ns1__searchInvestigationByParameterConditionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByParameterConditionResponse **p =
         (ns1__searchInvestigationByParameterConditionResponse **)soap_id_lookup(
@@ -121628,7 +121977,7 @@ soap_in_PointerTons1__searchInvestigationByParameterConditionResponse(
             sizeof(ns1__searchInvestigationByParameterConditionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -121639,7 +121988,7 @@ soap_put_PointerTons1__searchInvestigationByParameterConditionResponse(
     ns1__searchInvestigationByParameterConditionResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterConditionResponse);
   if (soap_out_PointerTons1__searchInvestigationByParameterConditionResponse(
           soap,
@@ -121656,7 +122005,7 @@ soap_get_PointerTons1__searchInvestigationByParameterConditionResponse(
   if ((p = soap_in_PointerTons1__searchInvestigationByParameterConditionResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -121676,7 +122025,7 @@ soap_out_PointerTons1__searchInvestigationByParameterCondition(
     struct soap *soap, const char *tag, int id,
     ns1__searchInvestigationByParameterCondition *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchInvestigationByParameterCondition);
   if (id < 0)
     return soap->error;
@@ -121687,22 +122036,22 @@ SOAP_FMAC3 ns1__searchInvestigationByParameterCondition **SOAP_FMAC4
 soap_in_PointerTons1__searchInvestigationByParameterCondition(
     struct soap *soap, const char *tag,
     ns1__searchInvestigationByParameterCondition **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchInvestigationByParameterCondition **)soap_malloc(
               soap, sizeof(ns1__searchInvestigationByParameterCondition *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchInvestigationByParameterCondition *)
               soap_instantiate_ns1__searchInvestigationByParameterCondition(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchInvestigationByParameterCondition **p =
         (ns1__searchInvestigationByParameterCondition **)soap_id_lookup(
@@ -121711,7 +122060,7 @@ soap_in_PointerTons1__searchInvestigationByParameterCondition(
             sizeof(ns1__searchInvestigationByParameterCondition), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -121721,7 +122070,7 @@ soap_put_PointerTons1__searchInvestigationByParameterCondition(
     struct soap *soap, ns1__searchInvestigationByParameterCondition *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchInvestigationByParameterCondition);
   if (soap_out_PointerTons1__searchInvestigationByParameterCondition(
           soap, tag ? tag : "ns1:searchInvestigationByParameterCondition", id,
@@ -121737,7 +122086,7 @@ soap_get_PointerTons1__searchInvestigationByParameterCondition(
   if ((p = soap_in_PointerTons1__searchInvestigationByParameterCondition(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -121755,7 +122104,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getFacilityUserByFederalIdResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getFacilityUserByFederalIdResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalIdResponse);
   if (id < 0)
     return soap->error;
@@ -121766,22 +122115,22 @@ SOAP_FMAC3 ns1__getFacilityUserByFederalIdResponse **SOAP_FMAC4
 soap_in_PointerTons1__getFacilityUserByFederalIdResponse(
     struct soap *soap, const char *tag,
     ns1__getFacilityUserByFederalIdResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getFacilityUserByFederalIdResponse **)soap_malloc(
               soap, sizeof(ns1__getFacilityUserByFederalIdResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getFacilityUserByFederalIdResponse *)
               soap_instantiate_ns1__getFacilityUserByFederalIdResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getFacilityUserByFederalIdResponse **p =
         (ns1__getFacilityUserByFederalIdResponse **)soap_id_lookup(
@@ -121790,7 +122139,7 @@ soap_in_PointerTons1__getFacilityUserByFederalIdResponse(
             sizeof(ns1__getFacilityUserByFederalIdResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -121800,7 +122149,7 @@ soap_put_PointerTons1__getFacilityUserByFederalIdResponse(
     struct soap *soap, ns1__getFacilityUserByFederalIdResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__getFacilityUserByFederalIdResponse);
   if (soap_out_PointerTons1__getFacilityUserByFederalIdResponse(
           soap, tag ? tag : "ns1:getFacilityUserByFederalIdResponse", id, a,
@@ -121816,7 +122165,7 @@ soap_get_PointerTons1__getFacilityUserByFederalIdResponse(
   if ((p = soap_in_PointerTons1__getFacilityUserByFederalIdResponse(soap, tag,
                                                                     p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -121833,7 +122182,7 @@ soap_serialize_PointerTons1__getFacilityUserByFederalId(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getFacilityUserByFederalId(
     struct soap *soap, const char *tag, int id,
     ns1__getFacilityUserByFederalId *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getFacilityUserByFederalId);
   if (id < 0)
     return soap->error;
@@ -121844,22 +122193,22 @@ SOAP_FMAC3 ns1__getFacilityUserByFederalId **SOAP_FMAC4
 soap_in_PointerTons1__getFacilityUserByFederalId(
     struct soap *soap, const char *tag, ns1__getFacilityUserByFederalId **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getFacilityUserByFederalId **)soap_malloc(
               soap, sizeof(ns1__getFacilityUserByFederalId *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getFacilityUserByFederalId *)
               soap_instantiate_ns1__getFacilityUserByFederalId(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getFacilityUserByFederalId **p =
         (ns1__getFacilityUserByFederalId **)soap_id_lookup(
@@ -121868,7 +122217,7 @@ soap_in_PointerTons1__getFacilityUserByFederalId(
             sizeof(ns1__getFacilityUserByFederalId), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -121876,7 +122225,7 @@ soap_in_PointerTons1__getFacilityUserByFederalId(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getFacilityUserByFederalId(
     struct soap *soap, ns1__getFacilityUserByFederalId *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getFacilityUserByFederalId);
   if (soap_out_PointerTons1__getFacilityUserByFederalId(
           soap, tag ? tag : "ns1:getFacilityUserByFederalId", id, a, type))
@@ -121891,7 +122240,7 @@ soap_get_PointerTons1__getFacilityUserByFederalId(
   if ((p = soap_in_PointerTons1__getFacilityUserByFederalId(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -121911,7 +122260,7 @@ soap_out_PointerTons1__getFacilityUserByFacilityUserIdResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getFacilityUserByFacilityUserIdResponse *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__getFacilityUserByFacilityUserIdResponse);
   if (id < 0)
     return soap->error;
@@ -121922,22 +122271,22 @@ SOAP_FMAC3 ns1__getFacilityUserByFacilityUserIdResponse **SOAP_FMAC4
 soap_in_PointerTons1__getFacilityUserByFacilityUserIdResponse(
     struct soap *soap, const char *tag,
     ns1__getFacilityUserByFacilityUserIdResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getFacilityUserByFacilityUserIdResponse **)soap_malloc(
               soap, sizeof(ns1__getFacilityUserByFacilityUserIdResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getFacilityUserByFacilityUserIdResponse *)
               soap_instantiate_ns1__getFacilityUserByFacilityUserIdResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getFacilityUserByFacilityUserIdResponse **p =
         (ns1__getFacilityUserByFacilityUserIdResponse **)soap_id_lookup(
@@ -121946,7 +122295,7 @@ soap_in_PointerTons1__getFacilityUserByFacilityUserIdResponse(
             sizeof(ns1__getFacilityUserByFacilityUserIdResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -121956,7 +122305,7 @@ soap_put_PointerTons1__getFacilityUserByFacilityUserIdResponse(
     struct soap *soap, ns1__getFacilityUserByFacilityUserIdResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__getFacilityUserByFacilityUserIdResponse);
   if (soap_out_PointerTons1__getFacilityUserByFacilityUserIdResponse(
           soap, tag ? tag : "ns1:getFacilityUserByFacilityUserIdResponse", id,
@@ -121972,7 +122321,7 @@ soap_get_PointerTons1__getFacilityUserByFacilityUserIdResponse(
   if ((p = soap_in_PointerTons1__getFacilityUserByFacilityUserIdResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -121990,7 +122339,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getFacilityUserByFacilityUserId(
     struct soap *soap, const char *tag, int id,
     ns1__getFacilityUserByFacilityUserId *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getFacilityUserByFacilityUserId);
   if (id < 0)
     return soap->error;
@@ -122001,22 +122350,22 @@ SOAP_FMAC3 ns1__getFacilityUserByFacilityUserId **SOAP_FMAC4
 soap_in_PointerTons1__getFacilityUserByFacilityUserId(
     struct soap *soap, const char *tag,
     ns1__getFacilityUserByFacilityUserId **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getFacilityUserByFacilityUserId **)soap_malloc(
               soap, sizeof(ns1__getFacilityUserByFacilityUserId *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getFacilityUserByFacilityUserId *)
               soap_instantiate_ns1__getFacilityUserByFacilityUserId(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getFacilityUserByFacilityUserId **p =
         (ns1__getFacilityUserByFacilityUserId **)soap_id_lookup(
@@ -122025,7 +122374,7 @@ soap_in_PointerTons1__getFacilityUserByFacilityUserId(
             sizeof(ns1__getFacilityUserByFacilityUserId), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -122035,7 +122384,7 @@ soap_put_PointerTons1__getFacilityUserByFacilityUserId(
     struct soap *soap, ns1__getFacilityUserByFacilityUserId *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__getFacilityUserByFacilityUserId);
   if (soap_out_PointerTons1__getFacilityUserByFacilityUserId(
           soap, tag ? tag : "ns1:getFacilityUserByFacilityUserId", id, a, type))
@@ -122050,7 +122399,7 @@ soap_get_PointerTons1__getFacilityUserByFacilityUserId(
   if ((p = soap_in_PointerTons1__getFacilityUserByFacilityUserId(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -122066,7 +122415,7 @@ soap_serialize_PointerTons1__getICATAPIVersionResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getICATAPIVersionResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getICATAPIVersionResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getICATAPIVersionResponse);
   if (id < 0)
     return soap->error;
@@ -122077,22 +122426,22 @@ SOAP_FMAC3 ns1__getICATAPIVersionResponse **SOAP_FMAC4
 soap_in_PointerTons1__getICATAPIVersionResponse(
     struct soap *soap, const char *tag, ns1__getICATAPIVersionResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getICATAPIVersionResponse **)soap_malloc(
               soap, sizeof(ns1__getICATAPIVersionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getICATAPIVersionResponse *)
               soap_instantiate_ns1__getICATAPIVersionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getICATAPIVersionResponse **p =
         (ns1__getICATAPIVersionResponse **)soap_id_lookup(
@@ -122101,7 +122450,7 @@ soap_in_PointerTons1__getICATAPIVersionResponse(
             sizeof(ns1__getICATAPIVersionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -122109,7 +122458,7 @@ soap_in_PointerTons1__getICATAPIVersionResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getICATAPIVersionResponse(
     struct soap *soap, ns1__getICATAPIVersionResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getICATAPIVersionResponse);
   if (soap_out_PointerTons1__getICATAPIVersionResponse(
           soap, tag ? tag : "ns1:getICATAPIVersionResponse", id, a, type))
@@ -122123,7 +122472,7 @@ soap_get_PointerTons1__getICATAPIVersionResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__getICATAPIVersionResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -122140,7 +122489,7 @@ soap_out_PointerTons1__getICATAPIVersion(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__getICATAPIVersion *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getICATAPIVersion);
   if (id < 0)
     return soap->error;
@@ -122151,29 +122500,29 @@ SOAP_FMAC3 ns1__getICATAPIVersion **SOAP_FMAC4
 soap_in_PointerTons1__getICATAPIVersion(struct soap *soap, const char *tag,
                                         ns1__getICATAPIVersion **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getICATAPIVersion **)soap_malloc(
               soap, sizeof(ns1__getICATAPIVersion *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__getICATAPIVersion *)soap_instantiate_ns1__getICATAPIVersion(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getICATAPIVersion **p = (ns1__getICATAPIVersion **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getICATAPIVersion,
         sizeof(ns1__getICATAPIVersion), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -122182,7 +122531,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getICATAPIVersion(struct soap *soap,
                                          ns1__getICATAPIVersion *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getICATAPIVersion);
   if (soap_out_PointerTons1__getICATAPIVersion(
           soap, tag ? tag : "ns1:getICATAPIVersion", id, a, type))
@@ -122196,7 +122545,7 @@ soap_get_PointerTons1__getICATAPIVersion(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getICATAPIVersion(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -122214,7 +122563,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__checkDatasetDownloadAccessResponse(
     struct soap *soap, const char *tag, int id,
     ns1__checkDatasetDownloadAccessResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccessResponse);
   if (id < 0)
     return soap->error;
@@ -122225,22 +122574,22 @@ SOAP_FMAC3 ns1__checkDatasetDownloadAccessResponse **SOAP_FMAC4
 soap_in_PointerTons1__checkDatasetDownloadAccessResponse(
     struct soap *soap, const char *tag,
     ns1__checkDatasetDownloadAccessResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__checkDatasetDownloadAccessResponse **)soap_malloc(
               soap, sizeof(ns1__checkDatasetDownloadAccessResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__checkDatasetDownloadAccessResponse *)
               soap_instantiate_ns1__checkDatasetDownloadAccessResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__checkDatasetDownloadAccessResponse **p =
         (ns1__checkDatasetDownloadAccessResponse **)soap_id_lookup(
@@ -122249,7 +122598,7 @@ soap_in_PointerTons1__checkDatasetDownloadAccessResponse(
             sizeof(ns1__checkDatasetDownloadAccessResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -122259,7 +122608,7 @@ soap_put_PointerTons1__checkDatasetDownloadAccessResponse(
     struct soap *soap, ns1__checkDatasetDownloadAccessResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__checkDatasetDownloadAccessResponse);
   if (soap_out_PointerTons1__checkDatasetDownloadAccessResponse(
           soap, tag ? tag : "ns1:checkDatasetDownloadAccessResponse", id, a,
@@ -122275,7 +122624,7 @@ soap_get_PointerTons1__checkDatasetDownloadAccessResponse(
   if ((p = soap_in_PointerTons1__checkDatasetDownloadAccessResponse(soap, tag,
                                                                     p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -122292,7 +122641,7 @@ soap_serialize_PointerTons1__checkDatasetDownloadAccess(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__checkDatasetDownloadAccess(
     struct soap *soap, const char *tag, int id,
     ns1__checkDatasetDownloadAccess *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__checkDatasetDownloadAccess);
   if (id < 0)
     return soap->error;
@@ -122303,22 +122652,22 @@ SOAP_FMAC3 ns1__checkDatasetDownloadAccess **SOAP_FMAC4
 soap_in_PointerTons1__checkDatasetDownloadAccess(
     struct soap *soap, const char *tag, ns1__checkDatasetDownloadAccess **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__checkDatasetDownloadAccess **)soap_malloc(
               soap, sizeof(ns1__checkDatasetDownloadAccess *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__checkDatasetDownloadAccess *)
               soap_instantiate_ns1__checkDatasetDownloadAccess(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__checkDatasetDownloadAccess **p =
         (ns1__checkDatasetDownloadAccess **)soap_id_lookup(
@@ -122327,7 +122676,7 @@ soap_in_PointerTons1__checkDatasetDownloadAccess(
             sizeof(ns1__checkDatasetDownloadAccess), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -122335,7 +122684,7 @@ soap_in_PointerTons1__checkDatasetDownloadAccess(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__checkDatasetDownloadAccess(
     struct soap *soap, ns1__checkDatasetDownloadAccess *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__checkDatasetDownloadAccess);
   if (soap_out_PointerTons1__checkDatasetDownloadAccess(
           soap, tag ? tag : "ns1:checkDatasetDownloadAccess", id, a, type))
@@ -122350,7 +122699,7 @@ soap_get_PointerTons1__checkDatasetDownloadAccess(
   if ((p = soap_in_PointerTons1__checkDatasetDownloadAccess(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -122369,7 +122718,7 @@ soap_out_PointerTons1__checkDatafileDownloadAccessResponse(
     struct soap *soap, const char *tag, int id,
     ns1__checkDatafileDownloadAccessResponse *const *a, const char *type) {
   id =
-      soap_element_id(soap, tag, id, *a, NULL, 0, type,
+      soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                       SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccessResponse);
   if (id < 0)
     return soap->error;
@@ -122380,22 +122729,22 @@ SOAP_FMAC3 ns1__checkDatafileDownloadAccessResponse **SOAP_FMAC4
 soap_in_PointerTons1__checkDatafileDownloadAccessResponse(
     struct soap *soap, const char *tag,
     ns1__checkDatafileDownloadAccessResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__checkDatafileDownloadAccessResponse **)soap_malloc(
               soap, sizeof(ns1__checkDatafileDownloadAccessResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__checkDatafileDownloadAccessResponse *)
               soap_instantiate_ns1__checkDatafileDownloadAccessResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__checkDatafileDownloadAccessResponse **p =
         (ns1__checkDatafileDownloadAccessResponse **)soap_id_lookup(
@@ -122404,7 +122753,7 @@ soap_in_PointerTons1__checkDatafileDownloadAccessResponse(
             sizeof(ns1__checkDatafileDownloadAccessResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -122414,7 +122763,7 @@ soap_put_PointerTons1__checkDatafileDownloadAccessResponse(
     struct soap *soap, ns1__checkDatafileDownloadAccessResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__checkDatafileDownloadAccessResponse);
   if (soap_out_PointerTons1__checkDatafileDownloadAccessResponse(
           soap, tag ? tag : "ns1:checkDatafileDownloadAccessResponse", id, a,
@@ -122430,7 +122779,7 @@ soap_get_PointerTons1__checkDatafileDownloadAccessResponse(
   if ((p = soap_in_PointerTons1__checkDatafileDownloadAccessResponse(soap, tag,
                                                                      p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -122447,7 +122796,7 @@ soap_serialize_PointerTons1__checkDatafileDownloadAccess(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__checkDatafileDownloadAccess(
     struct soap *soap, const char *tag, int id,
     ns1__checkDatafileDownloadAccess *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__checkDatafileDownloadAccess);
   if (id < 0)
     return soap->error;
@@ -122458,22 +122807,22 @@ SOAP_FMAC3 ns1__checkDatafileDownloadAccess **SOAP_FMAC4
 soap_in_PointerTons1__checkDatafileDownloadAccess(
     struct soap *soap, const char *tag, ns1__checkDatafileDownloadAccess **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__checkDatafileDownloadAccess **)soap_malloc(
               soap, sizeof(ns1__checkDatafileDownloadAccess *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__checkDatafileDownloadAccess *)
               soap_instantiate_ns1__checkDatafileDownloadAccess(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__checkDatafileDownloadAccess **p =
         (ns1__checkDatafileDownloadAccess **)soap_id_lookup(
@@ -122482,7 +122831,7 @@ soap_in_PointerTons1__checkDatafileDownloadAccess(
             sizeof(ns1__checkDatafileDownloadAccess), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -122491,7 +122840,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__checkDatafileDownloadAccess(
     struct soap *soap, ns1__checkDatafileDownloadAccess *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__checkDatafileDownloadAccess);
   if (soap_out_PointerTons1__checkDatafileDownloadAccess(
           soap, tag ? tag : "ns1:checkDatafileDownloadAccess", id, a, type))
@@ -122506,7 +122855,7 @@ soap_get_PointerTons1__checkDatafileDownloadAccess(
   if ((p = soap_in_PointerTons1__checkDatafileDownloadAccess(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -122522,7 +122871,7 @@ soap_serialize_PointerTons1__downloadDatafilesResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__downloadDatafilesResponse(
     struct soap *soap, const char *tag, int id,
     ns1__downloadDatafilesResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__downloadDatafilesResponse);
   if (id < 0)
     return soap->error;
@@ -122533,22 +122882,22 @@ SOAP_FMAC3 ns1__downloadDatafilesResponse **SOAP_FMAC4
 soap_in_PointerTons1__downloadDatafilesResponse(
     struct soap *soap, const char *tag, ns1__downloadDatafilesResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__downloadDatafilesResponse **)soap_malloc(
               soap, sizeof(ns1__downloadDatafilesResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__downloadDatafilesResponse *)
               soap_instantiate_ns1__downloadDatafilesResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__downloadDatafilesResponse **p =
         (ns1__downloadDatafilesResponse **)soap_id_lookup(
@@ -122557,7 +122906,7 @@ soap_in_PointerTons1__downloadDatafilesResponse(
             sizeof(ns1__downloadDatafilesResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -122565,7 +122914,7 @@ soap_in_PointerTons1__downloadDatafilesResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__downloadDatafilesResponse(
     struct soap *soap, ns1__downloadDatafilesResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__downloadDatafilesResponse);
   if (soap_out_PointerTons1__downloadDatafilesResponse(
           soap, tag ? tag : "ns1:downloadDatafilesResponse", id, a, type))
@@ -122579,7 +122928,7 @@ soap_get_PointerTons1__downloadDatafilesResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__downloadDatafilesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -122596,7 +122945,7 @@ soap_out_PointerTons1__downloadDatafiles(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__downloadDatafiles *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__downloadDatafiles);
   if (id < 0)
     return soap->error;
@@ -122607,29 +122956,29 @@ SOAP_FMAC3 ns1__downloadDatafiles **SOAP_FMAC4
 soap_in_PointerTons1__downloadDatafiles(struct soap *soap, const char *tag,
                                         ns1__downloadDatafiles **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__downloadDatafiles **)soap_malloc(
               soap, sizeof(ns1__downloadDatafiles *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__downloadDatafiles *)soap_instantiate_ns1__downloadDatafiles(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__downloadDatafiles **p = (ns1__downloadDatafiles **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__downloadDatafiles,
         sizeof(ns1__downloadDatafiles), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -122638,7 +122987,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__downloadDatafiles(struct soap *soap,
                                          ns1__downloadDatafiles *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__downloadDatafiles);
   if (soap_out_PointerTons1__downloadDatafiles(
           soap, tag ? tag : "ns1:downloadDatafiles", id, a, type))
@@ -122652,7 +123001,7 @@ soap_get_PointerTons1__downloadDatafiles(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__downloadDatafiles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -122667,7 +123016,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__downloadDatasetResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__downloadDatasetResponse(
     struct soap *soap, const char *tag, int id,
     ns1__downloadDatasetResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__downloadDatasetResponse);
   if (id < 0)
     return soap->error;
@@ -122679,22 +123028,22 @@ soap_in_PointerTons1__downloadDatasetResponse(struct soap *soap,
                                               const char *tag,
                                               ns1__downloadDatasetResponse **a,
                                               const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__downloadDatasetResponse **)soap_malloc(
               soap, sizeof(ns1__downloadDatasetResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__downloadDatasetResponse *)
               soap_instantiate_ns1__downloadDatasetResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__downloadDatasetResponse **p =
         (ns1__downloadDatasetResponse **)soap_id_lookup(
@@ -122703,7 +123052,7 @@ soap_in_PointerTons1__downloadDatasetResponse(struct soap *soap,
             sizeof(ns1__downloadDatasetResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -122711,7 +123060,7 @@ soap_in_PointerTons1__downloadDatasetResponse(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__downloadDatasetResponse(
     struct soap *soap, ns1__downloadDatasetResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__downloadDatasetResponse);
   if (soap_out_PointerTons1__downloadDatasetResponse(
           soap, tag ? tag : "ns1:downloadDatasetResponse", id, a, type))
@@ -122726,7 +123075,7 @@ soap_get_PointerTons1__downloadDatasetResponse(struct soap *soap,
                                                const char *type) {
   if ((p = soap_in_PointerTons1__downloadDatasetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -122743,7 +123092,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__downloadDataset(struct soap *soap, const char *tag,
                                        int id, ns1__downloadDataset *const *a,
                                        const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__downloadDataset);
   if (id < 0)
     return soap->error;
@@ -122754,28 +123103,28 @@ SOAP_FMAC3 ns1__downloadDataset **SOAP_FMAC4
 soap_in_PointerTons1__downloadDataset(struct soap *soap, const char *tag,
                                       ns1__downloadDataset **a,
                                       const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__downloadDataset **)soap_malloc(
               soap, sizeof(ns1__downloadDataset *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__downloadDataset *)soap_instantiate_ns1__downloadDataset(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__downloadDataset **p = (ns1__downloadDataset **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__downloadDataset,
         sizeof(ns1__downloadDataset), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -122784,7 +123133,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__downloadDataset(struct soap *soap,
                                        ns1__downloadDataset *const *a,
                                        const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__downloadDataset);
   if (soap_out_PointerTons1__downloadDataset(
           soap, tag ? tag : "ns1:downloadDataset", id, a, type))
@@ -122798,7 +123147,7 @@ soap_get_PointerTons1__downloadDataset(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__downloadDataset(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -122814,7 +123163,7 @@ soap_serialize_PointerTons1__downloadDatafileResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__downloadDatafileResponse(
     struct soap *soap, const char *tag, int id,
     ns1__downloadDatafileResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__downloadDatafileResponse);
   if (id < 0)
     return soap->error;
@@ -122825,22 +123174,22 @@ SOAP_FMAC3 ns1__downloadDatafileResponse **SOAP_FMAC4
 soap_in_PointerTons1__downloadDatafileResponse(
     struct soap *soap, const char *tag, ns1__downloadDatafileResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__downloadDatafileResponse **)soap_malloc(
               soap, sizeof(ns1__downloadDatafileResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__downloadDatafileResponse *)
               soap_instantiate_ns1__downloadDatafileResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__downloadDatafileResponse **p =
         (ns1__downloadDatafileResponse **)soap_id_lookup(
@@ -122849,7 +123198,7 @@ soap_in_PointerTons1__downloadDatafileResponse(
             sizeof(ns1__downloadDatafileResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -122857,7 +123206,7 @@ soap_in_PointerTons1__downloadDatafileResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__downloadDatafileResponse(
     struct soap *soap, ns1__downloadDatafileResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__downloadDatafileResponse);
   if (soap_out_PointerTons1__downloadDatafileResponse(
           soap, tag ? tag : "ns1:downloadDatafileResponse", id, a, type))
@@ -122871,7 +123220,7 @@ soap_get_PointerTons1__downloadDatafileResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__downloadDatafileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -122888,7 +123237,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__downloadDatafile(struct soap *soap, const char *tag,
                                         int id, ns1__downloadDatafile *const *a,
                                         const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__downloadDatafile);
   if (id < 0)
     return soap->error;
@@ -122899,28 +123248,28 @@ SOAP_FMAC3 ns1__downloadDatafile **SOAP_FMAC4
 soap_in_PointerTons1__downloadDatafile(struct soap *soap, const char *tag,
                                        ns1__downloadDatafile **a,
                                        const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__downloadDatafile **)soap_malloc(
               soap, sizeof(ns1__downloadDatafile *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__downloadDatafile *)soap_instantiate_ns1__downloadDatafile(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__downloadDatafile **p = (ns1__downloadDatafile **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__downloadDatafile,
         sizeof(ns1__downloadDatafile), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -122929,7 +123278,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__downloadDatafile(struct soap *soap,
                                         ns1__downloadDatafile *const *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__downloadDatafile);
   if (soap_out_PointerTons1__downloadDatafile(
           soap, tag ? tag : "ns1:downloadDatafile", id, a, type))
@@ -122943,7 +123292,7 @@ soap_get_PointerTons1__downloadDatafile(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__downloadDatafile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -122958,7 +123307,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__ingestMetadataResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__ingestMetadataResponse(
     struct soap *soap, const char *tag, int id,
     ns1__ingestMetadataResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__ingestMetadataResponse);
   if (id < 0)
     return soap->error;
@@ -122969,22 +123318,22 @@ SOAP_FMAC3 ns1__ingestMetadataResponse **SOAP_FMAC4
 soap_in_PointerTons1__ingestMetadataResponse(struct soap *soap, const char *tag,
                                              ns1__ingestMetadataResponse **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__ingestMetadataResponse **)soap_malloc(
               soap, sizeof(ns1__ingestMetadataResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__ingestMetadataResponse *)
               soap_instantiate_ns1__ingestMetadataResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__ingestMetadataResponse **p =
         (ns1__ingestMetadataResponse **)soap_id_lookup(
@@ -122993,7 +123342,7 @@ soap_in_PointerTons1__ingestMetadataResponse(struct soap *soap, const char *tag,
             sizeof(ns1__ingestMetadataResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -123001,7 +123350,7 @@ soap_in_PointerTons1__ingestMetadataResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__ingestMetadataResponse(
     struct soap *soap, ns1__ingestMetadataResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__ingestMetadataResponse);
   if (soap_out_PointerTons1__ingestMetadataResponse(
           soap, tag ? tag : "ns1:ingestMetadataResponse", id, a, type))
@@ -123016,7 +123365,7 @@ soap_get_PointerTons1__ingestMetadataResponse(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__ingestMetadataResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -123033,7 +123382,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__ingestMetadata(struct soap *soap, const char *tag,
                                       int id, ns1__ingestMetadata *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__ingestMetadata);
   if (id < 0)
     return soap->error;
@@ -123044,28 +123393,28 @@ SOAP_FMAC3 ns1__ingestMetadata **SOAP_FMAC4
 soap_in_PointerTons1__ingestMetadata(struct soap *soap, const char *tag,
                                      ns1__ingestMetadata **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__ingestMetadata **)soap_malloc(
               soap, sizeof(ns1__ingestMetadata *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__ingestMetadata *)soap_instantiate_ns1__ingestMetadata(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__ingestMetadata **p = (ns1__ingestMetadata **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__ingestMetadata,
         sizeof(ns1__ingestMetadata), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -123074,7 +123423,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__ingestMetadata(struct soap *soap,
                                       ns1__ingestMetadata *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__ingestMetadata);
   if (soap_out_PointerTons1__ingestMetadata(
           soap, tag ? tag : "ns1:ingestMetadata", id, a, type))
@@ -123088,7 +123437,7 @@ soap_get_PointerTons1__ingestMetadata(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__ingestMetadata(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -123105,7 +123454,7 @@ soap_serialize_PointerTons1__updateAuthorisationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__updateAuthorisationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__updateAuthorisationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__updateAuthorisationResponse);
   if (id < 0)
     return soap->error;
@@ -123116,22 +123465,22 @@ SOAP_FMAC3 ns1__updateAuthorisationResponse **SOAP_FMAC4
 soap_in_PointerTons1__updateAuthorisationResponse(
     struct soap *soap, const char *tag, ns1__updateAuthorisationResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__updateAuthorisationResponse **)soap_malloc(
               soap, sizeof(ns1__updateAuthorisationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__updateAuthorisationResponse *)
               soap_instantiate_ns1__updateAuthorisationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__updateAuthorisationResponse **p =
         (ns1__updateAuthorisationResponse **)soap_id_lookup(
@@ -123140,7 +123489,7 @@ soap_in_PointerTons1__updateAuthorisationResponse(
             sizeof(ns1__updateAuthorisationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -123149,7 +123498,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__updateAuthorisationResponse(
     struct soap *soap, ns1__updateAuthorisationResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__updateAuthorisationResponse);
   if (soap_out_PointerTons1__updateAuthorisationResponse(
           soap, tag ? tag : "ns1:updateAuthorisationResponse", id, a, type))
@@ -123164,7 +123513,7 @@ soap_get_PointerTons1__updateAuthorisationResponse(
   if ((p = soap_in_PointerTons1__updateAuthorisationResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -123181,7 +123530,7 @@ soap_out_PointerTons1__updateAuthorisation(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__updateAuthorisation *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__updateAuthorisation);
   if (id < 0)
     return soap->error;
@@ -123192,29 +123541,29 @@ SOAP_FMAC3 ns1__updateAuthorisation **SOAP_FMAC4
 soap_in_PointerTons1__updateAuthorisation(struct soap *soap, const char *tag,
                                           ns1__updateAuthorisation **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__updateAuthorisation **)soap_malloc(
               soap, sizeof(ns1__updateAuthorisation *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__updateAuthorisation *)
-              soap_instantiate_ns1__updateAuthorisation(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__updateAuthorisation(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__updateAuthorisation **p = (ns1__updateAuthorisation **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__updateAuthorisation,
         sizeof(ns1__updateAuthorisation), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -123223,7 +123572,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__updateAuthorisation(struct soap *soap,
                                            ns1__updateAuthorisation *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__updateAuthorisation);
   if (soap_out_PointerTons1__updateAuthorisation(
           soap, tag ? tag : "ns1:updateAuthorisation", id, a, type))
@@ -123237,7 +123586,7 @@ soap_get_PointerTons1__updateAuthorisation(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__updateAuthorisation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -123254,7 +123603,7 @@ soap_serialize_PointerTons1__removeAuthorisationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__removeAuthorisationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__removeAuthorisationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeAuthorisationResponse);
   if (id < 0)
     return soap->error;
@@ -123265,22 +123614,22 @@ SOAP_FMAC3 ns1__removeAuthorisationResponse **SOAP_FMAC4
 soap_in_PointerTons1__removeAuthorisationResponse(
     struct soap *soap, const char *tag, ns1__removeAuthorisationResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeAuthorisationResponse **)soap_malloc(
               soap, sizeof(ns1__removeAuthorisationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeAuthorisationResponse *)
               soap_instantiate_ns1__removeAuthorisationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeAuthorisationResponse **p =
         (ns1__removeAuthorisationResponse **)soap_id_lookup(
@@ -123289,7 +123638,7 @@ soap_in_PointerTons1__removeAuthorisationResponse(
             sizeof(ns1__removeAuthorisationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -123298,7 +123647,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__removeAuthorisationResponse(
     struct soap *soap, ns1__removeAuthorisationResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__removeAuthorisationResponse);
   if (soap_out_PointerTons1__removeAuthorisationResponse(
           soap, tag ? tag : "ns1:removeAuthorisationResponse", id, a, type))
@@ -123313,7 +123662,7 @@ soap_get_PointerTons1__removeAuthorisationResponse(
   if ((p = soap_in_PointerTons1__removeAuthorisationResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -123330,7 +123679,7 @@ soap_out_PointerTons1__removeAuthorisation(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__removeAuthorisation *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeAuthorisation);
   if (id < 0)
     return soap->error;
@@ -123341,29 +123690,29 @@ SOAP_FMAC3 ns1__removeAuthorisation **SOAP_FMAC4
 soap_in_PointerTons1__removeAuthorisation(struct soap *soap, const char *tag,
                                           ns1__removeAuthorisation **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeAuthorisation **)soap_malloc(
               soap, sizeof(ns1__removeAuthorisation *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeAuthorisation *)
-              soap_instantiate_ns1__removeAuthorisation(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__removeAuthorisation(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeAuthorisation **p = (ns1__removeAuthorisation **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__removeAuthorisation,
         sizeof(ns1__removeAuthorisation), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -123372,7 +123721,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__removeAuthorisation(struct soap *soap,
                                            ns1__removeAuthorisation *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeAuthorisation);
   if (soap_out_PointerTons1__removeAuthorisation(
           soap, tag ? tag : "ns1:removeAuthorisation", id, a, type))
@@ -123386,7 +123735,7 @@ soap_get_PointerTons1__removeAuthorisation(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__removeAuthorisation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -123403,7 +123752,7 @@ soap_serialize_PointerTons1__deleteAuthorisationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__deleteAuthorisationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__deleteAuthorisationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteAuthorisationResponse);
   if (id < 0)
     return soap->error;
@@ -123414,22 +123763,22 @@ SOAP_FMAC3 ns1__deleteAuthorisationResponse **SOAP_FMAC4
 soap_in_PointerTons1__deleteAuthorisationResponse(
     struct soap *soap, const char *tag, ns1__deleteAuthorisationResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteAuthorisationResponse **)soap_malloc(
               soap, sizeof(ns1__deleteAuthorisationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteAuthorisationResponse *)
               soap_instantiate_ns1__deleteAuthorisationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteAuthorisationResponse **p =
         (ns1__deleteAuthorisationResponse **)soap_id_lookup(
@@ -123438,7 +123787,7 @@ soap_in_PointerTons1__deleteAuthorisationResponse(
             sizeof(ns1__deleteAuthorisationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -123447,7 +123796,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__deleteAuthorisationResponse(
     struct soap *soap, ns1__deleteAuthorisationResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__deleteAuthorisationResponse);
   if (soap_out_PointerTons1__deleteAuthorisationResponse(
           soap, tag ? tag : "ns1:deleteAuthorisationResponse", id, a, type))
@@ -123462,7 +123811,7 @@ soap_get_PointerTons1__deleteAuthorisationResponse(
   if ((p = soap_in_PointerTons1__deleteAuthorisationResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -123479,7 +123828,7 @@ soap_out_PointerTons1__deleteAuthorisation(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__deleteAuthorisation *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteAuthorisation);
   if (id < 0)
     return soap->error;
@@ -123490,29 +123839,29 @@ SOAP_FMAC3 ns1__deleteAuthorisation **SOAP_FMAC4
 soap_in_PointerTons1__deleteAuthorisation(struct soap *soap, const char *tag,
                                           ns1__deleteAuthorisation **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteAuthorisation **)soap_malloc(
               soap, sizeof(ns1__deleteAuthorisation *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteAuthorisation *)
-              soap_instantiate_ns1__deleteAuthorisation(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__deleteAuthorisation(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteAuthorisation **p = (ns1__deleteAuthorisation **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__deleteAuthorisation,
         sizeof(ns1__deleteAuthorisation), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -123521,7 +123870,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__deleteAuthorisation(struct soap *soap,
                                            ns1__deleteAuthorisation *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteAuthorisation);
   if (soap_out_PointerTons1__deleteAuthorisation(
           soap, tag ? tag : "ns1:deleteAuthorisation", id, a, type))
@@ -123535,7 +123884,7 @@ soap_get_PointerTons1__deleteAuthorisation(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__deleteAuthorisation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -123551,7 +123900,7 @@ soap_serialize_PointerTons1__addAuthorisationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__addAuthorisationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__addAuthorisationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addAuthorisationResponse);
   if (id < 0)
     return soap->error;
@@ -123562,22 +123911,22 @@ SOAP_FMAC3 ns1__addAuthorisationResponse **SOAP_FMAC4
 soap_in_PointerTons1__addAuthorisationResponse(
     struct soap *soap, const char *tag, ns1__addAuthorisationResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addAuthorisationResponse **)soap_malloc(
               soap, sizeof(ns1__addAuthorisationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addAuthorisationResponse *)
               soap_instantiate_ns1__addAuthorisationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addAuthorisationResponse **p =
         (ns1__addAuthorisationResponse **)soap_id_lookup(
@@ -123586,7 +123935,7 @@ soap_in_PointerTons1__addAuthorisationResponse(
             sizeof(ns1__addAuthorisationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -123594,7 +123943,7 @@ soap_in_PointerTons1__addAuthorisationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__addAuthorisationResponse(
     struct soap *soap, ns1__addAuthorisationResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addAuthorisationResponse);
   if (soap_out_PointerTons1__addAuthorisationResponse(
           soap, tag ? tag : "ns1:addAuthorisationResponse", id, a, type))
@@ -123608,7 +123957,7 @@ soap_get_PointerTons1__addAuthorisationResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__addAuthorisationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -123625,7 +123974,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__addAuthorisation(struct soap *soap, const char *tag,
                                         int id, ns1__addAuthorisation *const *a,
                                         const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addAuthorisation);
   if (id < 0)
     return soap->error;
@@ -123636,28 +123985,28 @@ SOAP_FMAC3 ns1__addAuthorisation **SOAP_FMAC4
 soap_in_PointerTons1__addAuthorisation(struct soap *soap, const char *tag,
                                        ns1__addAuthorisation **a,
                                        const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addAuthorisation **)soap_malloc(
               soap, sizeof(ns1__addAuthorisation *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addAuthorisation *)soap_instantiate_ns1__addAuthorisation(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addAuthorisation **p = (ns1__addAuthorisation **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__addAuthorisation,
         sizeof(ns1__addAuthorisation), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -123666,7 +124015,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__addAuthorisation(struct soap *soap,
                                         ns1__addAuthorisation *const *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addAuthorisation);
   if (soap_out_PointerTons1__addAuthorisation(
           soap, tag ? tag : "ns1:addAuthorisation", id, a, type))
@@ -123680,7 +124029,7 @@ soap_get_PointerTons1__addAuthorisation(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__addAuthorisation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -123696,7 +124045,7 @@ soap_serialize_PointerTons1__getAuthorisationsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getAuthorisationsResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getAuthorisationsResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getAuthorisationsResponse);
   if (id < 0)
     return soap->error;
@@ -123707,22 +124056,22 @@ SOAP_FMAC3 ns1__getAuthorisationsResponse **SOAP_FMAC4
 soap_in_PointerTons1__getAuthorisationsResponse(
     struct soap *soap, const char *tag, ns1__getAuthorisationsResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getAuthorisationsResponse **)soap_malloc(
               soap, sizeof(ns1__getAuthorisationsResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getAuthorisationsResponse *)
               soap_instantiate_ns1__getAuthorisationsResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getAuthorisationsResponse **p =
         (ns1__getAuthorisationsResponse **)soap_id_lookup(
@@ -123731,7 +124080,7 @@ soap_in_PointerTons1__getAuthorisationsResponse(
             sizeof(ns1__getAuthorisationsResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -123739,7 +124088,7 @@ soap_in_PointerTons1__getAuthorisationsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getAuthorisationsResponse(
     struct soap *soap, ns1__getAuthorisationsResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getAuthorisationsResponse);
   if (soap_out_PointerTons1__getAuthorisationsResponse(
           soap, tag ? tag : "ns1:getAuthorisationsResponse", id, a, type))
@@ -123753,7 +124102,7 @@ soap_get_PointerTons1__getAuthorisationsResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__getAuthorisationsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -123770,7 +124119,7 @@ soap_out_PointerTons1__getAuthorisations(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__getAuthorisations *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getAuthorisations);
   if (id < 0)
     return soap->error;
@@ -123781,29 +124130,29 @@ SOAP_FMAC3 ns1__getAuthorisations **SOAP_FMAC4
 soap_in_PointerTons1__getAuthorisations(struct soap *soap, const char *tag,
                                         ns1__getAuthorisations **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getAuthorisations **)soap_malloc(
               soap, sizeof(ns1__getAuthorisations *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__getAuthorisations *)soap_instantiate_ns1__getAuthorisations(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getAuthorisations **p = (ns1__getAuthorisations **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getAuthorisations,
         sizeof(ns1__getAuthorisations), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -123812,7 +124161,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getAuthorisations(struct soap *soap,
                                          ns1__getAuthorisations *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getAuthorisations);
   if (soap_out_PointerTons1__getAuthorisations(
           soap, tag ? tag : "ns1:getAuthorisations", id, a, type))
@@ -123826,7 +124175,7 @@ soap_get_PointerTons1__getAuthorisations(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getAuthorisations(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -123844,7 +124193,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__removeDataFileParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__removeDataFileParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeDataFileParameterResponse);
   if (id < 0)
     return soap->error;
@@ -123855,22 +124204,22 @@ SOAP_FMAC3 ns1__removeDataFileParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__removeDataFileParameterResponse(
     struct soap *soap, const char *tag,
     ns1__removeDataFileParameterResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeDataFileParameterResponse **)soap_malloc(
               soap, sizeof(ns1__removeDataFileParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeDataFileParameterResponse *)
               soap_instantiate_ns1__removeDataFileParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeDataFileParameterResponse **p =
         (ns1__removeDataFileParameterResponse **)soap_id_lookup(
@@ -123879,7 +124228,7 @@ soap_in_PointerTons1__removeDataFileParameterResponse(
             sizeof(ns1__removeDataFileParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -123889,7 +124238,7 @@ soap_put_PointerTons1__removeDataFileParameterResponse(
     struct soap *soap, ns1__removeDataFileParameterResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__removeDataFileParameterResponse);
   if (soap_out_PointerTons1__removeDataFileParameterResponse(
           soap, tag ? tag : "ns1:removeDataFileParameterResponse", id, a, type))
@@ -123904,7 +124253,7 @@ soap_get_PointerTons1__removeDataFileParameterResponse(
   if ((p = soap_in_PointerTons1__removeDataFileParameterResponse(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -123919,7 +124268,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__removeDataFileParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__removeDataFileParameter(
     struct soap *soap, const char *tag, int id,
     ns1__removeDataFileParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeDataFileParameter);
   if (id < 0)
     return soap->error;
@@ -123931,22 +124280,22 @@ soap_in_PointerTons1__removeDataFileParameter(struct soap *soap,
                                               const char *tag,
                                               ns1__removeDataFileParameter **a,
                                               const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeDataFileParameter **)soap_malloc(
               soap, sizeof(ns1__removeDataFileParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeDataFileParameter *)
               soap_instantiate_ns1__removeDataFileParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeDataFileParameter **p =
         (ns1__removeDataFileParameter **)soap_id_lookup(
@@ -123955,7 +124304,7 @@ soap_in_PointerTons1__removeDataFileParameter(struct soap *soap,
             sizeof(ns1__removeDataFileParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -123963,7 +124312,7 @@ soap_in_PointerTons1__removeDataFileParameter(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__removeDataFileParameter(
     struct soap *soap, ns1__removeDataFileParameter *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeDataFileParameter);
   if (soap_out_PointerTons1__removeDataFileParameter(
           soap, tag ? tag : "ns1:removeDataFileParameter", id, a, type))
@@ -123978,7 +124327,7 @@ soap_get_PointerTons1__removeDataFileParameter(struct soap *soap,
                                                const char *type) {
   if ((p = soap_in_PointerTons1__removeDataFileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -123993,7 +124342,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__removeDataFileResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__removeDataFileResponse(
     struct soap *soap, const char *tag, int id,
     ns1__removeDataFileResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeDataFileResponse);
   if (id < 0)
     return soap->error;
@@ -124004,22 +124353,22 @@ SOAP_FMAC3 ns1__removeDataFileResponse **SOAP_FMAC4
 soap_in_PointerTons1__removeDataFileResponse(struct soap *soap, const char *tag,
                                              ns1__removeDataFileResponse **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeDataFileResponse **)soap_malloc(
               soap, sizeof(ns1__removeDataFileResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeDataFileResponse *)
               soap_instantiate_ns1__removeDataFileResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeDataFileResponse **p =
         (ns1__removeDataFileResponse **)soap_id_lookup(
@@ -124028,7 +124377,7 @@ soap_in_PointerTons1__removeDataFileResponse(struct soap *soap, const char *tag,
             sizeof(ns1__removeDataFileResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -124036,7 +124385,7 @@ soap_in_PointerTons1__removeDataFileResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__removeDataFileResponse(
     struct soap *soap, ns1__removeDataFileResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeDataFileResponse);
   if (soap_out_PointerTons1__removeDataFileResponse(
           soap, tag ? tag : "ns1:removeDataFileResponse", id, a, type))
@@ -124051,7 +124400,7 @@ soap_get_PointerTons1__removeDataFileResponse(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__removeDataFileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -124068,7 +124417,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__removeDataFile(struct soap *soap, const char *tag,
                                       int id, ns1__removeDataFile *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeDataFile);
   if (id < 0)
     return soap->error;
@@ -124079,28 +124428,28 @@ SOAP_FMAC3 ns1__removeDataFile **SOAP_FMAC4
 soap_in_PointerTons1__removeDataFile(struct soap *soap, const char *tag,
                                      ns1__removeDataFile **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeDataFile **)soap_malloc(
               soap, sizeof(ns1__removeDataFile *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeDataFile *)soap_instantiate_ns1__removeDataFile(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeDataFile **p = (ns1__removeDataFile **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__removeDataFile,
         sizeof(ns1__removeDataFile), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -124109,7 +124458,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__removeDataFile(struct soap *soap,
                                       ns1__removeDataFile *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeDataFile);
   if (soap_out_PointerTons1__removeDataFile(
           soap, tag ? tag : "ns1:removeDataFile", id, a, type))
@@ -124123,7 +124472,7 @@ soap_get_PointerTons1__removeDataFile(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__removeDataFile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -124141,7 +124490,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__deleteDataFileParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__deleteDataFileParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteDataFileParameterResponse);
   if (id < 0)
     return soap->error;
@@ -124152,22 +124501,22 @@ SOAP_FMAC3 ns1__deleteDataFileParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__deleteDataFileParameterResponse(
     struct soap *soap, const char *tag,
     ns1__deleteDataFileParameterResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteDataFileParameterResponse **)soap_malloc(
               soap, sizeof(ns1__deleteDataFileParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteDataFileParameterResponse *)
               soap_instantiate_ns1__deleteDataFileParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteDataFileParameterResponse **p =
         (ns1__deleteDataFileParameterResponse **)soap_id_lookup(
@@ -124176,7 +124525,7 @@ soap_in_PointerTons1__deleteDataFileParameterResponse(
             sizeof(ns1__deleteDataFileParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -124186,7 +124535,7 @@ soap_put_PointerTons1__deleteDataFileParameterResponse(
     struct soap *soap, ns1__deleteDataFileParameterResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__deleteDataFileParameterResponse);
   if (soap_out_PointerTons1__deleteDataFileParameterResponse(
           soap, tag ? tag : "ns1:deleteDataFileParameterResponse", id, a, type))
@@ -124201,7 +124550,7 @@ soap_get_PointerTons1__deleteDataFileParameterResponse(
   if ((p = soap_in_PointerTons1__deleteDataFileParameterResponse(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -124216,7 +124565,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__deleteDataFileParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__deleteDataFileParameter(
     struct soap *soap, const char *tag, int id,
     ns1__deleteDataFileParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteDataFileParameter);
   if (id < 0)
     return soap->error;
@@ -124228,22 +124577,22 @@ soap_in_PointerTons1__deleteDataFileParameter(struct soap *soap,
                                               const char *tag,
                                               ns1__deleteDataFileParameter **a,
                                               const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteDataFileParameter **)soap_malloc(
               soap, sizeof(ns1__deleteDataFileParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteDataFileParameter *)
               soap_instantiate_ns1__deleteDataFileParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteDataFileParameter **p =
         (ns1__deleteDataFileParameter **)soap_id_lookup(
@@ -124252,7 +124601,7 @@ soap_in_PointerTons1__deleteDataFileParameter(struct soap *soap,
             sizeof(ns1__deleteDataFileParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -124260,7 +124609,7 @@ soap_in_PointerTons1__deleteDataFileParameter(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__deleteDataFileParameter(
     struct soap *soap, ns1__deleteDataFileParameter *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteDataFileParameter);
   if (soap_out_PointerTons1__deleteDataFileParameter(
           soap, tag ? tag : "ns1:deleteDataFileParameter", id, a, type))
@@ -124275,7 +124624,7 @@ soap_get_PointerTons1__deleteDataFileParameter(struct soap *soap,
                                                const char *type) {
   if ((p = soap_in_PointerTons1__deleteDataFileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -124293,7 +124642,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__modifyDataFileParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__modifyDataFileParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifyDataFileParameterResponse);
   if (id < 0)
     return soap->error;
@@ -124304,22 +124653,22 @@ SOAP_FMAC3 ns1__modifyDataFileParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__modifyDataFileParameterResponse(
     struct soap *soap, const char *tag,
     ns1__modifyDataFileParameterResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifyDataFileParameterResponse **)soap_malloc(
               soap, sizeof(ns1__modifyDataFileParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifyDataFileParameterResponse *)
               soap_instantiate_ns1__modifyDataFileParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifyDataFileParameterResponse **p =
         (ns1__modifyDataFileParameterResponse **)soap_id_lookup(
@@ -124328,7 +124677,7 @@ soap_in_PointerTons1__modifyDataFileParameterResponse(
             sizeof(ns1__modifyDataFileParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -124338,7 +124687,7 @@ soap_put_PointerTons1__modifyDataFileParameterResponse(
     struct soap *soap, ns1__modifyDataFileParameterResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__modifyDataFileParameterResponse);
   if (soap_out_PointerTons1__modifyDataFileParameterResponse(
           soap, tag ? tag : "ns1:modifyDataFileParameterResponse", id, a, type))
@@ -124353,7 +124702,7 @@ soap_get_PointerTons1__modifyDataFileParameterResponse(
   if ((p = soap_in_PointerTons1__modifyDataFileParameterResponse(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -124368,7 +124717,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__modifyDataFileParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__modifyDataFileParameter(
     struct soap *soap, const char *tag, int id,
     ns1__modifyDataFileParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifyDataFileParameter);
   if (id < 0)
     return soap->error;
@@ -124380,22 +124729,22 @@ soap_in_PointerTons1__modifyDataFileParameter(struct soap *soap,
                                               const char *tag,
                                               ns1__modifyDataFileParameter **a,
                                               const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifyDataFileParameter **)soap_malloc(
               soap, sizeof(ns1__modifyDataFileParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifyDataFileParameter *)
               soap_instantiate_ns1__modifyDataFileParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifyDataFileParameter **p =
         (ns1__modifyDataFileParameter **)soap_id_lookup(
@@ -124404,7 +124753,7 @@ soap_in_PointerTons1__modifyDataFileParameter(struct soap *soap,
             sizeof(ns1__modifyDataFileParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -124412,7 +124761,7 @@ soap_in_PointerTons1__modifyDataFileParameter(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__modifyDataFileParameter(
     struct soap *soap, ns1__modifyDataFileParameter *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__modifyDataFileParameter);
   if (soap_out_PointerTons1__modifyDataFileParameter(
           soap, tag ? tag : "ns1:modifyDataFileParameter", id, a, type))
@@ -124427,7 +124776,7 @@ soap_get_PointerTons1__modifyDataFileParameter(struct soap *soap,
                                                const char *type) {
   if ((p = soap_in_PointerTons1__modifyDataFileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -124444,7 +124793,7 @@ soap_serialize_PointerTons1__addDataFileParametersResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__addDataFileParametersResponse(
     struct soap *soap, const char *tag, int id,
     ns1__addDataFileParametersResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addDataFileParametersResponse);
   if (id < 0)
     return soap->error;
@@ -124455,22 +124804,22 @@ SOAP_FMAC3 ns1__addDataFileParametersResponse **SOAP_FMAC4
 soap_in_PointerTons1__addDataFileParametersResponse(
     struct soap *soap, const char *tag, ns1__addDataFileParametersResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addDataFileParametersResponse **)soap_malloc(
               soap, sizeof(ns1__addDataFileParametersResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addDataFileParametersResponse *)
               soap_instantiate_ns1__addDataFileParametersResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addDataFileParametersResponse **p =
         (ns1__addDataFileParametersResponse **)soap_id_lookup(
@@ -124479,7 +124828,7 @@ soap_in_PointerTons1__addDataFileParametersResponse(
             sizeof(ns1__addDataFileParametersResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -124488,7 +124837,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__addDataFileParametersResponse(
     struct soap *soap, ns1__addDataFileParametersResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__addDataFileParametersResponse);
   if (soap_out_PointerTons1__addDataFileParametersResponse(
           soap, tag ? tag : "ns1:addDataFileParametersResponse", id, a, type))
@@ -124503,7 +124852,7 @@ soap_get_PointerTons1__addDataFileParametersResponse(
   if ((p = soap_in_PointerTons1__addDataFileParametersResponse(soap, tag, p,
                                                                type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -124518,7 +124867,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__addDataFileParameters(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__addDataFileParameters(
     struct soap *soap, const char *tag, int id,
     ns1__addDataFileParameters *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addDataFileParameters);
   if (id < 0)
     return soap->error;
@@ -124529,22 +124878,22 @@ SOAP_FMAC3 ns1__addDataFileParameters **SOAP_FMAC4
 soap_in_PointerTons1__addDataFileParameters(struct soap *soap, const char *tag,
                                             ns1__addDataFileParameters **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addDataFileParameters **)soap_malloc(
               soap, sizeof(ns1__addDataFileParameters *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addDataFileParameters *)
               soap_instantiate_ns1__addDataFileParameters(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addDataFileParameters **p =
         (ns1__addDataFileParameters **)soap_id_lookup(
@@ -124553,7 +124902,7 @@ soap_in_PointerTons1__addDataFileParameters(struct soap *soap, const char *tag,
             sizeof(ns1__addDataFileParameters), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -124561,7 +124910,7 @@ soap_in_PointerTons1__addDataFileParameters(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__addDataFileParameters(
     struct soap *soap, ns1__addDataFileParameters *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addDataFileParameters);
   if (soap_out_PointerTons1__addDataFileParameters(
           soap, tag ? tag : "ns1:addDataFileParameters", id, a, type))
@@ -124576,7 +124925,7 @@ soap_get_PointerTons1__addDataFileParameters(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__addDataFileParameters(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -124593,7 +124942,7 @@ soap_serialize_PointerTons1__addDataFileParameterResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__addDataFileParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__addDataFileParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addDataFileParameterResponse);
   if (id < 0)
     return soap->error;
@@ -124604,22 +124953,22 @@ SOAP_FMAC3 ns1__addDataFileParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__addDataFileParameterResponse(
     struct soap *soap, const char *tag, ns1__addDataFileParameterResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addDataFileParameterResponse **)soap_malloc(
               soap, sizeof(ns1__addDataFileParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addDataFileParameterResponse *)
               soap_instantiate_ns1__addDataFileParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addDataFileParameterResponse **p =
         (ns1__addDataFileParameterResponse **)soap_id_lookup(
@@ -124628,7 +124977,7 @@ soap_in_PointerTons1__addDataFileParameterResponse(
             sizeof(ns1__addDataFileParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -124637,7 +124986,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__addDataFileParameterResponse(
     struct soap *soap, ns1__addDataFileParameterResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__addDataFileParameterResponse);
   if (soap_out_PointerTons1__addDataFileParameterResponse(
           soap, tag ? tag : "ns1:addDataFileParameterResponse", id, a, type))
@@ -124652,7 +125001,7 @@ soap_get_PointerTons1__addDataFileParameterResponse(
   if ((p = soap_in_PointerTons1__addDataFileParameterResponse(soap, tag, p,
                                                               type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -124669,7 +125018,7 @@ soap_out_PointerTons1__addDataFileParameter(struct soap *soap, const char *tag,
                                             int id,
                                             ns1__addDataFileParameter *const *a,
                                             const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addDataFileParameter);
   if (id < 0)
     return soap->error;
@@ -124680,22 +125029,22 @@ SOAP_FMAC3 ns1__addDataFileParameter **SOAP_FMAC4
 soap_in_PointerTons1__addDataFileParameter(struct soap *soap, const char *tag,
                                            ns1__addDataFileParameter **a,
                                            const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addDataFileParameter **)soap_malloc(
               soap, sizeof(ns1__addDataFileParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addDataFileParameter *)
               soap_instantiate_ns1__addDataFileParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addDataFileParameter **p =
         (ns1__addDataFileParameter **)soap_id_lookup(
@@ -124704,7 +125053,7 @@ soap_in_PointerTons1__addDataFileParameter(struct soap *soap, const char *tag,
             sizeof(ns1__addDataFileParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -124713,7 +125062,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__addDataFileParameter(struct soap *soap,
                                             ns1__addDataFileParameter *const *a,
                                             const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addDataFileParameter);
   if (soap_out_PointerTons1__addDataFileParameter(
           soap, tag ? tag : "ns1:addDataFileParameter", id, a, type))
@@ -124727,7 +125076,7 @@ soap_get_PointerTons1__addDataFileParameter(struct soap *soap,
                                             const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__addDataFileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -124742,7 +125091,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__modifyDataFileResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__modifyDataFileResponse(
     struct soap *soap, const char *tag, int id,
     ns1__modifyDataFileResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifyDataFileResponse);
   if (id < 0)
     return soap->error;
@@ -124753,22 +125102,22 @@ SOAP_FMAC3 ns1__modifyDataFileResponse **SOAP_FMAC4
 soap_in_PointerTons1__modifyDataFileResponse(struct soap *soap, const char *tag,
                                              ns1__modifyDataFileResponse **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifyDataFileResponse **)soap_malloc(
               soap, sizeof(ns1__modifyDataFileResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifyDataFileResponse *)
               soap_instantiate_ns1__modifyDataFileResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifyDataFileResponse **p =
         (ns1__modifyDataFileResponse **)soap_id_lookup(
@@ -124777,7 +125126,7 @@ soap_in_PointerTons1__modifyDataFileResponse(struct soap *soap, const char *tag,
             sizeof(ns1__modifyDataFileResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -124785,7 +125134,7 @@ soap_in_PointerTons1__modifyDataFileResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__modifyDataFileResponse(
     struct soap *soap, ns1__modifyDataFileResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__modifyDataFileResponse);
   if (soap_out_PointerTons1__modifyDataFileResponse(
           soap, tag ? tag : "ns1:modifyDataFileResponse", id, a, type))
@@ -124800,7 +125149,7 @@ soap_get_PointerTons1__modifyDataFileResponse(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__modifyDataFileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -124817,7 +125166,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__modifyDataFile(struct soap *soap, const char *tag,
                                       int id, ns1__modifyDataFile *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifyDataFile);
   if (id < 0)
     return soap->error;
@@ -124828,28 +125177,28 @@ SOAP_FMAC3 ns1__modifyDataFile **SOAP_FMAC4
 soap_in_PointerTons1__modifyDataFile(struct soap *soap, const char *tag,
                                      ns1__modifyDataFile **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifyDataFile **)soap_malloc(
               soap, sizeof(ns1__modifyDataFile *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifyDataFile *)soap_instantiate_ns1__modifyDataFile(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifyDataFile **p = (ns1__modifyDataFile **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__modifyDataFile,
         sizeof(ns1__modifyDataFile), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -124858,7 +125207,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__modifyDataFile(struct soap *soap,
                                       ns1__modifyDataFile *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__modifyDataFile);
   if (soap_out_PointerTons1__modifyDataFile(
           soap, tag ? tag : "ns1:modifyDataFile", id, a, type))
@@ -124872,7 +125221,7 @@ soap_get_PointerTons1__modifyDataFile(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__modifyDataFile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -124887,7 +125236,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__deleteDataFileResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__deleteDataFileResponse(
     struct soap *soap, const char *tag, int id,
     ns1__deleteDataFileResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteDataFileResponse);
   if (id < 0)
     return soap->error;
@@ -124898,22 +125247,22 @@ SOAP_FMAC3 ns1__deleteDataFileResponse **SOAP_FMAC4
 soap_in_PointerTons1__deleteDataFileResponse(struct soap *soap, const char *tag,
                                              ns1__deleteDataFileResponse **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteDataFileResponse **)soap_malloc(
               soap, sizeof(ns1__deleteDataFileResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteDataFileResponse *)
               soap_instantiate_ns1__deleteDataFileResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteDataFileResponse **p =
         (ns1__deleteDataFileResponse **)soap_id_lookup(
@@ -124922,7 +125271,7 @@ soap_in_PointerTons1__deleteDataFileResponse(struct soap *soap, const char *tag,
             sizeof(ns1__deleteDataFileResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -124930,7 +125279,7 @@ soap_in_PointerTons1__deleteDataFileResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__deleteDataFileResponse(
     struct soap *soap, ns1__deleteDataFileResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteDataFileResponse);
   if (soap_out_PointerTons1__deleteDataFileResponse(
           soap, tag ? tag : "ns1:deleteDataFileResponse", id, a, type))
@@ -124945,7 +125294,7 @@ soap_get_PointerTons1__deleteDataFileResponse(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__deleteDataFileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -124962,7 +125311,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__deleteDataFile(struct soap *soap, const char *tag,
                                       int id, ns1__deleteDataFile *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteDataFile);
   if (id < 0)
     return soap->error;
@@ -124973,28 +125322,28 @@ SOAP_FMAC3 ns1__deleteDataFile **SOAP_FMAC4
 soap_in_PointerTons1__deleteDataFile(struct soap *soap, const char *tag,
                                      ns1__deleteDataFile **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteDataFile **)soap_malloc(
               soap, sizeof(ns1__deleteDataFile *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteDataFile *)soap_instantiate_ns1__deleteDataFile(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteDataFile **p = (ns1__deleteDataFile **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__deleteDataFile,
         sizeof(ns1__deleteDataFile), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -125003,7 +125352,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__deleteDataFile(struct soap *soap,
                                       ns1__deleteDataFile *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteDataFile);
   if (soap_out_PointerTons1__deleteDataFile(
           soap, tag ? tag : "ns1:deleteDataFile", id, a, type))
@@ -125017,7 +125366,7 @@ soap_get_PointerTons1__deleteDataFile(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__deleteDataFile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -125032,7 +125381,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__createDataFilesResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__createDataFilesResponse(
     struct soap *soap, const char *tag, int id,
     ns1__createDataFilesResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__createDataFilesResponse);
   if (id < 0)
     return soap->error;
@@ -125044,22 +125393,22 @@ soap_in_PointerTons1__createDataFilesResponse(struct soap *soap,
                                               const char *tag,
                                               ns1__createDataFilesResponse **a,
                                               const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__createDataFilesResponse **)soap_malloc(
               soap, sizeof(ns1__createDataFilesResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__createDataFilesResponse *)
               soap_instantiate_ns1__createDataFilesResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__createDataFilesResponse **p =
         (ns1__createDataFilesResponse **)soap_id_lookup(
@@ -125068,7 +125417,7 @@ soap_in_PointerTons1__createDataFilesResponse(struct soap *soap,
             sizeof(ns1__createDataFilesResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -125076,7 +125425,7 @@ soap_in_PointerTons1__createDataFilesResponse(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__createDataFilesResponse(
     struct soap *soap, ns1__createDataFilesResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__createDataFilesResponse);
   if (soap_out_PointerTons1__createDataFilesResponse(
           soap, tag ? tag : "ns1:createDataFilesResponse", id, a, type))
@@ -125091,7 +125440,7 @@ soap_get_PointerTons1__createDataFilesResponse(struct soap *soap,
                                                const char *type) {
   if ((p = soap_in_PointerTons1__createDataFilesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -125108,7 +125457,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__createDataFiles(struct soap *soap, const char *tag,
                                        int id, ns1__createDataFiles *const *a,
                                        const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__createDataFiles);
   if (id < 0)
     return soap->error;
@@ -125119,28 +125468,28 @@ SOAP_FMAC3 ns1__createDataFiles **SOAP_FMAC4
 soap_in_PointerTons1__createDataFiles(struct soap *soap, const char *tag,
                                       ns1__createDataFiles **a,
                                       const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__createDataFiles **)soap_malloc(
               soap, sizeof(ns1__createDataFiles *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__createDataFiles *)soap_instantiate_ns1__createDataFiles(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__createDataFiles **p = (ns1__createDataFiles **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__createDataFiles,
         sizeof(ns1__createDataFiles), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -125149,7 +125498,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__createDataFiles(struct soap *soap,
                                        ns1__createDataFiles *const *a,
                                        const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__createDataFiles);
   if (soap_out_PointerTons1__createDataFiles(
           soap, tag ? tag : "ns1:createDataFiles", id, a, type))
@@ -125163,7 +125512,7 @@ soap_get_PointerTons1__createDataFiles(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__createDataFiles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -125178,7 +125527,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__createDataFileResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__createDataFileResponse(
     struct soap *soap, const char *tag, int id,
     ns1__createDataFileResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__createDataFileResponse);
   if (id < 0)
     return soap->error;
@@ -125189,22 +125538,22 @@ SOAP_FMAC3 ns1__createDataFileResponse **SOAP_FMAC4
 soap_in_PointerTons1__createDataFileResponse(struct soap *soap, const char *tag,
                                              ns1__createDataFileResponse **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__createDataFileResponse **)soap_malloc(
               soap, sizeof(ns1__createDataFileResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__createDataFileResponse *)
               soap_instantiate_ns1__createDataFileResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__createDataFileResponse **p =
         (ns1__createDataFileResponse **)soap_id_lookup(
@@ -125213,7 +125562,7 @@ soap_in_PointerTons1__createDataFileResponse(struct soap *soap, const char *tag,
             sizeof(ns1__createDataFileResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -125221,7 +125570,7 @@ soap_in_PointerTons1__createDataFileResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__createDataFileResponse(
     struct soap *soap, ns1__createDataFileResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__createDataFileResponse);
   if (soap_out_PointerTons1__createDataFileResponse(
           soap, tag ? tag : "ns1:createDataFileResponse", id, a, type))
@@ -125236,7 +125585,7 @@ soap_get_PointerTons1__createDataFileResponse(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__createDataFileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -125253,7 +125602,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__createDataFile(struct soap *soap, const char *tag,
                                       int id, ns1__createDataFile *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__createDataFile);
   if (id < 0)
     return soap->error;
@@ -125264,28 +125613,28 @@ SOAP_FMAC3 ns1__createDataFile **SOAP_FMAC4
 soap_in_PointerTons1__createDataFile(struct soap *soap, const char *tag,
                                      ns1__createDataFile **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__createDataFile **)soap_malloc(
               soap, sizeof(ns1__createDataFile *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__createDataFile *)soap_instantiate_ns1__createDataFile(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__createDataFile **p = (ns1__createDataFile **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__createDataFile,
         sizeof(ns1__createDataFile), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -125294,7 +125643,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__createDataFile(struct soap *soap,
                                       ns1__createDataFile *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__createDataFile);
   if (soap_out_PointerTons1__createDataFile(
           soap, tag ? tag : "ns1:createDataFile", id, a, type))
@@ -125308,7 +125657,7 @@ soap_get_PointerTons1__createDataFile(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__createDataFile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -125325,7 +125674,7 @@ soap_out_PointerTons1__getDatafilesResponse(struct soap *soap, const char *tag,
                                             int id,
                                             ns1__getDatafilesResponse *const *a,
                                             const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getDatafilesResponse);
   if (id < 0)
     return soap->error;
@@ -125336,22 +125685,22 @@ SOAP_FMAC3 ns1__getDatafilesResponse **SOAP_FMAC4
 soap_in_PointerTons1__getDatafilesResponse(struct soap *soap, const char *tag,
                                            ns1__getDatafilesResponse **a,
                                            const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getDatafilesResponse **)soap_malloc(
               soap, sizeof(ns1__getDatafilesResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getDatafilesResponse *)
               soap_instantiate_ns1__getDatafilesResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getDatafilesResponse **p =
         (ns1__getDatafilesResponse **)soap_id_lookup(
@@ -125360,7 +125709,7 @@ soap_in_PointerTons1__getDatafilesResponse(struct soap *soap, const char *tag,
             sizeof(ns1__getDatafilesResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -125369,7 +125718,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getDatafilesResponse(struct soap *soap,
                                             ns1__getDatafilesResponse *const *a,
                                             const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getDatafilesResponse);
   if (soap_out_PointerTons1__getDatafilesResponse(
           soap, tag ? tag : "ns1:getDatafilesResponse", id, a, type))
@@ -125383,7 +125732,7 @@ soap_get_PointerTons1__getDatafilesResponse(struct soap *soap,
                                             const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getDatafilesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -125400,7 +125749,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getDatafiles(struct soap *soap, const char *tag, int id,
                                     ns1__getDatafiles *const *a,
                                     const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getDatafiles);
   if (id < 0)
     return soap->error;
@@ -125410,28 +125759,28 @@ soap_out_PointerTons1__getDatafiles(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__getDatafiles **SOAP_FMAC4
 soap_in_PointerTons1__getDatafiles(struct soap *soap, const char *tag,
                                    ns1__getDatafiles **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getDatafiles **)soap_malloc(soap,
                                                 sizeof(ns1__getDatafiles *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getDatafiles *)soap_instantiate_ns1__getDatafiles(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getDatafiles **p = (ns1__getDatafiles **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getDatafiles,
         sizeof(ns1__getDatafiles), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -125440,7 +125789,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getDatafiles(struct soap *soap,
                                     ns1__getDatafiles *const *a,
                                     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getDatafiles);
   if (soap_out_PointerTons1__getDatafiles(soap, tag ? tag : "ns1:getDatafiles",
                                           id, a, type))
@@ -125453,7 +125802,7 @@ soap_get_PointerTons1__getDatafiles(struct soap *soap, ns1__getDatafiles **p,
                                     const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getDatafiles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -125470,7 +125819,7 @@ soap_out_PointerTons1__getDatafileResponse(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__getDatafileResponse *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getDatafileResponse);
   if (id < 0)
     return soap->error;
@@ -125481,29 +125830,29 @@ SOAP_FMAC3 ns1__getDatafileResponse **SOAP_FMAC4
 soap_in_PointerTons1__getDatafileResponse(struct soap *soap, const char *tag,
                                           ns1__getDatafileResponse **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getDatafileResponse **)soap_malloc(
               soap, sizeof(ns1__getDatafileResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getDatafileResponse *)
-              soap_instantiate_ns1__getDatafileResponse(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__getDatafileResponse(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getDatafileResponse **p = (ns1__getDatafileResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getDatafileResponse,
         sizeof(ns1__getDatafileResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -125512,7 +125861,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getDatafileResponse(struct soap *soap,
                                            ns1__getDatafileResponse *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getDatafileResponse);
   if (soap_out_PointerTons1__getDatafileResponse(
           soap, tag ? tag : "ns1:getDatafileResponse", id, a, type))
@@ -125526,7 +125875,7 @@ soap_get_PointerTons1__getDatafileResponse(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getDatafileResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -125543,7 +125892,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getDatafile(struct soap *soap, const char *tag, int id,
                                    ns1__getDatafile *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getDatafile);
   if (id < 0)
     return soap->error;
@@ -125553,28 +125902,28 @@ soap_out_PointerTons1__getDatafile(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__getDatafile **SOAP_FMAC4
 soap_in_PointerTons1__getDatafile(struct soap *soap, const char *tag,
                                   ns1__getDatafile **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getDatafile **)soap_malloc(soap,
                                                sizeof(ns1__getDatafile *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getDatafile *)soap_instantiate_ns1__getDatafile(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getDatafile **p = (ns1__getDatafile **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getDatafile,
         sizeof(ns1__getDatafile), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -125583,7 +125932,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getDatafile(struct soap *soap,
                                    ns1__getDatafile *const *a, const char *tag,
                                    const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getDatafile);
   if (soap_out_PointerTons1__getDatafile(soap, tag ? tag : "ns1:getDatafile",
                                          id, a, type))
@@ -125596,7 +125945,7 @@ soap_get_PointerTons1__getDatafile(struct soap *soap, ns1__getDatafile **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getDatafile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -125613,7 +125962,7 @@ soap_serialize_PointerTons1__removeDataSetParameterResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__removeDataSetParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__removeDataSetParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeDataSetParameterResponse);
   if (id < 0)
     return soap->error;
@@ -125624,22 +125973,22 @@ SOAP_FMAC3 ns1__removeDataSetParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__removeDataSetParameterResponse(
     struct soap *soap, const char *tag, ns1__removeDataSetParameterResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeDataSetParameterResponse **)soap_malloc(
               soap, sizeof(ns1__removeDataSetParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeDataSetParameterResponse *)
               soap_instantiate_ns1__removeDataSetParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeDataSetParameterResponse **p =
         (ns1__removeDataSetParameterResponse **)soap_id_lookup(
@@ -125648,7 +125997,7 @@ soap_in_PointerTons1__removeDataSetParameterResponse(
             sizeof(ns1__removeDataSetParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -125657,7 +126006,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__removeDataSetParameterResponse(
     struct soap *soap, ns1__removeDataSetParameterResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__removeDataSetParameterResponse);
   if (soap_out_PointerTons1__removeDataSetParameterResponse(
           soap, tag ? tag : "ns1:removeDataSetParameterResponse", id, a, type))
@@ -125672,7 +126021,7 @@ soap_get_PointerTons1__removeDataSetParameterResponse(
   if ((p = soap_in_PointerTons1__removeDataSetParameterResponse(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -125687,7 +126036,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__removeDataSetParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__removeDataSetParameter(
     struct soap *soap, const char *tag, int id,
     ns1__removeDataSetParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeDataSetParameter);
   if (id < 0)
     return soap->error;
@@ -125698,22 +126047,22 @@ SOAP_FMAC3 ns1__removeDataSetParameter **SOAP_FMAC4
 soap_in_PointerTons1__removeDataSetParameter(struct soap *soap, const char *tag,
                                              ns1__removeDataSetParameter **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeDataSetParameter **)soap_malloc(
               soap, sizeof(ns1__removeDataSetParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeDataSetParameter *)
               soap_instantiate_ns1__removeDataSetParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeDataSetParameter **p =
         (ns1__removeDataSetParameter **)soap_id_lookup(
@@ -125722,7 +126071,7 @@ soap_in_PointerTons1__removeDataSetParameter(struct soap *soap, const char *tag,
             sizeof(ns1__removeDataSetParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -125730,7 +126079,7 @@ soap_in_PointerTons1__removeDataSetParameter(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__removeDataSetParameter(
     struct soap *soap, ns1__removeDataSetParameter *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeDataSetParameter);
   if (soap_out_PointerTons1__removeDataSetParameter(
           soap, tag ? tag : "ns1:removeDataSetParameter", id, a, type))
@@ -125745,7 +126094,7 @@ soap_get_PointerTons1__removeDataSetParameter(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__removeDataSetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -125760,7 +126109,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__removeDataSetResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__removeDataSetResponse(
     struct soap *soap, const char *tag, int id,
     ns1__removeDataSetResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeDataSetResponse);
   if (id < 0)
     return soap->error;
@@ -125771,22 +126120,22 @@ SOAP_FMAC3 ns1__removeDataSetResponse **SOAP_FMAC4
 soap_in_PointerTons1__removeDataSetResponse(struct soap *soap, const char *tag,
                                             ns1__removeDataSetResponse **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeDataSetResponse **)soap_malloc(
               soap, sizeof(ns1__removeDataSetResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeDataSetResponse *)
               soap_instantiate_ns1__removeDataSetResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeDataSetResponse **p =
         (ns1__removeDataSetResponse **)soap_id_lookup(
@@ -125795,7 +126144,7 @@ soap_in_PointerTons1__removeDataSetResponse(struct soap *soap, const char *tag,
             sizeof(ns1__removeDataSetResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -125803,7 +126152,7 @@ soap_in_PointerTons1__removeDataSetResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__removeDataSetResponse(
     struct soap *soap, ns1__removeDataSetResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeDataSetResponse);
   if (soap_out_PointerTons1__removeDataSetResponse(
           soap, tag ? tag : "ns1:removeDataSetResponse", id, a, type))
@@ -125818,7 +126167,7 @@ soap_get_PointerTons1__removeDataSetResponse(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__removeDataSetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -125835,7 +126184,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__removeDataSet(struct soap *soap, const char *tag, int id,
                                      ns1__removeDataSet *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeDataSet);
   if (id < 0)
     return soap->error;
@@ -125845,28 +126194,28 @@ soap_out_PointerTons1__removeDataSet(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__removeDataSet **SOAP_FMAC4
 soap_in_PointerTons1__removeDataSet(struct soap *soap, const char *tag,
                                     ns1__removeDataSet **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeDataSet **)soap_malloc(soap,
                                                  sizeof(ns1__removeDataSet *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeDataSet *)soap_instantiate_ns1__removeDataSet(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeDataSet **p = (ns1__removeDataSet **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__removeDataSet,
         sizeof(ns1__removeDataSet), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -125875,7 +126224,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__removeDataSet(struct soap *soap,
                                      ns1__removeDataSet *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeDataSet);
   if (soap_out_PointerTons1__removeDataSet(
           soap, tag ? tag : "ns1:removeDataSet", id, a, type))
@@ -125888,7 +126237,7 @@ soap_get_PointerTons1__removeDataSet(struct soap *soap, ns1__removeDataSet **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__removeDataSet(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -125905,7 +126254,7 @@ soap_serialize_PointerTons1__addDataSetParametersResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__addDataSetParametersResponse(
     struct soap *soap, const char *tag, int id,
     ns1__addDataSetParametersResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addDataSetParametersResponse);
   if (id < 0)
     return soap->error;
@@ -125916,22 +126265,22 @@ SOAP_FMAC3 ns1__addDataSetParametersResponse **SOAP_FMAC4
 soap_in_PointerTons1__addDataSetParametersResponse(
     struct soap *soap, const char *tag, ns1__addDataSetParametersResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addDataSetParametersResponse **)soap_malloc(
               soap, sizeof(ns1__addDataSetParametersResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addDataSetParametersResponse *)
               soap_instantiate_ns1__addDataSetParametersResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addDataSetParametersResponse **p =
         (ns1__addDataSetParametersResponse **)soap_id_lookup(
@@ -125940,7 +126289,7 @@ soap_in_PointerTons1__addDataSetParametersResponse(
             sizeof(ns1__addDataSetParametersResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -125949,7 +126298,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__addDataSetParametersResponse(
     struct soap *soap, ns1__addDataSetParametersResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__addDataSetParametersResponse);
   if (soap_out_PointerTons1__addDataSetParametersResponse(
           soap, tag ? tag : "ns1:addDataSetParametersResponse", id, a, type))
@@ -125964,7 +126313,7 @@ soap_get_PointerTons1__addDataSetParametersResponse(
   if ((p = soap_in_PointerTons1__addDataSetParametersResponse(soap, tag, p,
                                                               type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -125981,7 +126330,7 @@ soap_out_PointerTons1__addDataSetParameters(struct soap *soap, const char *tag,
                                             int id,
                                             ns1__addDataSetParameters *const *a,
                                             const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addDataSetParameters);
   if (id < 0)
     return soap->error;
@@ -125992,22 +126341,22 @@ SOAP_FMAC3 ns1__addDataSetParameters **SOAP_FMAC4
 soap_in_PointerTons1__addDataSetParameters(struct soap *soap, const char *tag,
                                            ns1__addDataSetParameters **a,
                                            const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addDataSetParameters **)soap_malloc(
               soap, sizeof(ns1__addDataSetParameters *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addDataSetParameters *)
               soap_instantiate_ns1__addDataSetParameters(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addDataSetParameters **p =
         (ns1__addDataSetParameters **)soap_id_lookup(
@@ -126016,7 +126365,7 @@ soap_in_PointerTons1__addDataSetParameters(struct soap *soap, const char *tag,
             sizeof(ns1__addDataSetParameters), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -126025,7 +126374,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__addDataSetParameters(struct soap *soap,
                                             ns1__addDataSetParameters *const *a,
                                             const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addDataSetParameters);
   if (soap_out_PointerTons1__addDataSetParameters(
           soap, tag ? tag : "ns1:addDataSetParameters", id, a, type))
@@ -126039,7 +126388,7 @@ soap_get_PointerTons1__addDataSetParameters(struct soap *soap,
                                             const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__addDataSetParameters(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -126056,7 +126405,7 @@ soap_serialize_PointerTons1__addDataSetParameterResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__addDataSetParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__addDataSetParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addDataSetParameterResponse);
   if (id < 0)
     return soap->error;
@@ -126067,22 +126416,22 @@ SOAP_FMAC3 ns1__addDataSetParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__addDataSetParameterResponse(
     struct soap *soap, const char *tag, ns1__addDataSetParameterResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addDataSetParameterResponse **)soap_malloc(
               soap, sizeof(ns1__addDataSetParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addDataSetParameterResponse *)
               soap_instantiate_ns1__addDataSetParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addDataSetParameterResponse **p =
         (ns1__addDataSetParameterResponse **)soap_id_lookup(
@@ -126091,7 +126440,7 @@ soap_in_PointerTons1__addDataSetParameterResponse(
             sizeof(ns1__addDataSetParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -126100,7 +126449,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__addDataSetParameterResponse(
     struct soap *soap, ns1__addDataSetParameterResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__addDataSetParameterResponse);
   if (soap_out_PointerTons1__addDataSetParameterResponse(
           soap, tag ? tag : "ns1:addDataSetParameterResponse", id, a, type))
@@ -126115,7 +126464,7 @@ soap_get_PointerTons1__addDataSetParameterResponse(
   if ((p = soap_in_PointerTons1__addDataSetParameterResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -126132,7 +126481,7 @@ soap_out_PointerTons1__addDataSetParameter(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__addDataSetParameter *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addDataSetParameter);
   if (id < 0)
     return soap->error;
@@ -126143,29 +126492,29 @@ SOAP_FMAC3 ns1__addDataSetParameter **SOAP_FMAC4
 soap_in_PointerTons1__addDataSetParameter(struct soap *soap, const char *tag,
                                           ns1__addDataSetParameter **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addDataSetParameter **)soap_malloc(
               soap, sizeof(ns1__addDataSetParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addDataSetParameter *)
-              soap_instantiate_ns1__addDataSetParameter(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__addDataSetParameter(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addDataSetParameter **p = (ns1__addDataSetParameter **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__addDataSetParameter,
         sizeof(ns1__addDataSetParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -126174,7 +126523,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__addDataSetParameter(struct soap *soap,
                                            ns1__addDataSetParameter *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addDataSetParameter);
   if (soap_out_PointerTons1__addDataSetParameter(
           soap, tag ? tag : "ns1:addDataSetParameter", id, a, type))
@@ -126188,7 +126537,7 @@ soap_get_PointerTons1__addDataSetParameter(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__addDataSetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -126204,7 +126553,7 @@ soap_serialize_PointerTons1__setDataSetSampleResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__setDataSetSampleResponse(
     struct soap *soap, const char *tag, int id,
     ns1__setDataSetSampleResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__setDataSetSampleResponse);
   if (id < 0)
     return soap->error;
@@ -126215,22 +126564,22 @@ SOAP_FMAC3 ns1__setDataSetSampleResponse **SOAP_FMAC4
 soap_in_PointerTons1__setDataSetSampleResponse(
     struct soap *soap, const char *tag, ns1__setDataSetSampleResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__setDataSetSampleResponse **)soap_malloc(
               soap, sizeof(ns1__setDataSetSampleResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__setDataSetSampleResponse *)
               soap_instantiate_ns1__setDataSetSampleResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__setDataSetSampleResponse **p =
         (ns1__setDataSetSampleResponse **)soap_id_lookup(
@@ -126239,7 +126588,7 @@ soap_in_PointerTons1__setDataSetSampleResponse(
             sizeof(ns1__setDataSetSampleResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -126247,7 +126596,7 @@ soap_in_PointerTons1__setDataSetSampleResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__setDataSetSampleResponse(
     struct soap *soap, ns1__setDataSetSampleResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__setDataSetSampleResponse);
   if (soap_out_PointerTons1__setDataSetSampleResponse(
           soap, tag ? tag : "ns1:setDataSetSampleResponse", id, a, type))
@@ -126261,7 +126610,7 @@ soap_get_PointerTons1__setDataSetSampleResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__setDataSetSampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -126278,7 +126627,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__setDataSetSample(struct soap *soap, const char *tag,
                                         int id, ns1__setDataSetSample *const *a,
                                         const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__setDataSetSample);
   if (id < 0)
     return soap->error;
@@ -126289,28 +126638,28 @@ SOAP_FMAC3 ns1__setDataSetSample **SOAP_FMAC4
 soap_in_PointerTons1__setDataSetSample(struct soap *soap, const char *tag,
                                        ns1__setDataSetSample **a,
                                        const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__setDataSetSample **)soap_malloc(
               soap, sizeof(ns1__setDataSetSample *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__setDataSetSample *)soap_instantiate_ns1__setDataSetSample(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__setDataSetSample **p = (ns1__setDataSetSample **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__setDataSetSample,
         sizeof(ns1__setDataSetSample), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -126319,7 +126668,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__setDataSetSample(struct soap *soap,
                                         ns1__setDataSetSample *const *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__setDataSetSample);
   if (soap_out_PointerTons1__setDataSetSample(
           soap, tag ? tag : "ns1:setDataSetSample", id, a, type))
@@ -126333,7 +126682,7 @@ soap_get_PointerTons1__setDataSetSample(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__setDataSetSample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -126350,7 +126699,7 @@ soap_serialize_PointerTons1__modifyDataSetParameterResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__modifyDataSetParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__modifyDataSetParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifyDataSetParameterResponse);
   if (id < 0)
     return soap->error;
@@ -126361,22 +126710,22 @@ SOAP_FMAC3 ns1__modifyDataSetParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__modifyDataSetParameterResponse(
     struct soap *soap, const char *tag, ns1__modifyDataSetParameterResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifyDataSetParameterResponse **)soap_malloc(
               soap, sizeof(ns1__modifyDataSetParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifyDataSetParameterResponse *)
               soap_instantiate_ns1__modifyDataSetParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifyDataSetParameterResponse **p =
         (ns1__modifyDataSetParameterResponse **)soap_id_lookup(
@@ -126385,7 +126734,7 @@ soap_in_PointerTons1__modifyDataSetParameterResponse(
             sizeof(ns1__modifyDataSetParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -126394,7 +126743,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__modifyDataSetParameterResponse(
     struct soap *soap, ns1__modifyDataSetParameterResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__modifyDataSetParameterResponse);
   if (soap_out_PointerTons1__modifyDataSetParameterResponse(
           soap, tag ? tag : "ns1:modifyDataSetParameterResponse", id, a, type))
@@ -126409,7 +126758,7 @@ soap_get_PointerTons1__modifyDataSetParameterResponse(
   if ((p = soap_in_PointerTons1__modifyDataSetParameterResponse(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -126424,7 +126773,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__modifyDataSetParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__modifyDataSetParameter(
     struct soap *soap, const char *tag, int id,
     ns1__modifyDataSetParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifyDataSetParameter);
   if (id < 0)
     return soap->error;
@@ -126435,22 +126784,22 @@ SOAP_FMAC3 ns1__modifyDataSetParameter **SOAP_FMAC4
 soap_in_PointerTons1__modifyDataSetParameter(struct soap *soap, const char *tag,
                                              ns1__modifyDataSetParameter **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifyDataSetParameter **)soap_malloc(
               soap, sizeof(ns1__modifyDataSetParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifyDataSetParameter *)
               soap_instantiate_ns1__modifyDataSetParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifyDataSetParameter **p =
         (ns1__modifyDataSetParameter **)soap_id_lookup(
@@ -126459,7 +126808,7 @@ soap_in_PointerTons1__modifyDataSetParameter(struct soap *soap, const char *tag,
             sizeof(ns1__modifyDataSetParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -126467,7 +126816,7 @@ soap_in_PointerTons1__modifyDataSetParameter(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__modifyDataSetParameter(
     struct soap *soap, ns1__modifyDataSetParameter *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__modifyDataSetParameter);
   if (soap_out_PointerTons1__modifyDataSetParameter(
           soap, tag ? tag : "ns1:modifyDataSetParameter", id, a, type))
@@ -126482,7 +126831,7 @@ soap_get_PointerTons1__modifyDataSetParameter(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__modifyDataSetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -126497,7 +126846,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__modifyDataSetResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__modifyDataSetResponse(
     struct soap *soap, const char *tag, int id,
     ns1__modifyDataSetResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifyDataSetResponse);
   if (id < 0)
     return soap->error;
@@ -126508,22 +126857,22 @@ SOAP_FMAC3 ns1__modifyDataSetResponse **SOAP_FMAC4
 soap_in_PointerTons1__modifyDataSetResponse(struct soap *soap, const char *tag,
                                             ns1__modifyDataSetResponse **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifyDataSetResponse **)soap_malloc(
               soap, sizeof(ns1__modifyDataSetResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifyDataSetResponse *)
               soap_instantiate_ns1__modifyDataSetResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifyDataSetResponse **p =
         (ns1__modifyDataSetResponse **)soap_id_lookup(
@@ -126532,7 +126881,7 @@ soap_in_PointerTons1__modifyDataSetResponse(struct soap *soap, const char *tag,
             sizeof(ns1__modifyDataSetResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -126540,7 +126889,7 @@ soap_in_PointerTons1__modifyDataSetResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__modifyDataSetResponse(
     struct soap *soap, ns1__modifyDataSetResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__modifyDataSetResponse);
   if (soap_out_PointerTons1__modifyDataSetResponse(
           soap, tag ? tag : "ns1:modifyDataSetResponse", id, a, type))
@@ -126555,7 +126904,7 @@ soap_get_PointerTons1__modifyDataSetResponse(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__modifyDataSetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -126572,7 +126921,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__modifyDataSet(struct soap *soap, const char *tag, int id,
                                      ns1__modifyDataSet *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifyDataSet);
   if (id < 0)
     return soap->error;
@@ -126582,28 +126931,28 @@ soap_out_PointerTons1__modifyDataSet(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__modifyDataSet **SOAP_FMAC4
 soap_in_PointerTons1__modifyDataSet(struct soap *soap, const char *tag,
                                     ns1__modifyDataSet **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifyDataSet **)soap_malloc(soap,
                                                  sizeof(ns1__modifyDataSet *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifyDataSet *)soap_instantiate_ns1__modifyDataSet(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifyDataSet **p = (ns1__modifyDataSet **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__modifyDataSet,
         sizeof(ns1__modifyDataSet), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -126612,7 +126961,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__modifyDataSet(struct soap *soap,
                                      ns1__modifyDataSet *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__modifyDataSet);
   if (soap_out_PointerTons1__modifyDataSet(
           soap, tag ? tag : "ns1:modifyDataSet", id, a, type))
@@ -126625,7 +126974,7 @@ soap_get_PointerTons1__modifyDataSet(struct soap *soap, ns1__modifyDataSet **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__modifyDataSet(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -126642,7 +126991,7 @@ soap_serialize_PointerTons1__deleteDataSetParameterResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__deleteDataSetParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__deleteDataSetParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteDataSetParameterResponse);
   if (id < 0)
     return soap->error;
@@ -126653,22 +127002,22 @@ SOAP_FMAC3 ns1__deleteDataSetParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__deleteDataSetParameterResponse(
     struct soap *soap, const char *tag, ns1__deleteDataSetParameterResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteDataSetParameterResponse **)soap_malloc(
               soap, sizeof(ns1__deleteDataSetParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteDataSetParameterResponse *)
               soap_instantiate_ns1__deleteDataSetParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteDataSetParameterResponse **p =
         (ns1__deleteDataSetParameterResponse **)soap_id_lookup(
@@ -126677,7 +127026,7 @@ soap_in_PointerTons1__deleteDataSetParameterResponse(
             sizeof(ns1__deleteDataSetParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -126686,7 +127035,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__deleteDataSetParameterResponse(
     struct soap *soap, ns1__deleteDataSetParameterResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__deleteDataSetParameterResponse);
   if (soap_out_PointerTons1__deleteDataSetParameterResponse(
           soap, tag ? tag : "ns1:deleteDataSetParameterResponse", id, a, type))
@@ -126701,7 +127050,7 @@ soap_get_PointerTons1__deleteDataSetParameterResponse(
   if ((p = soap_in_PointerTons1__deleteDataSetParameterResponse(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -126716,7 +127065,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__deleteDataSetParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__deleteDataSetParameter(
     struct soap *soap, const char *tag, int id,
     ns1__deleteDataSetParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteDataSetParameter);
   if (id < 0)
     return soap->error;
@@ -126727,22 +127076,22 @@ SOAP_FMAC3 ns1__deleteDataSetParameter **SOAP_FMAC4
 soap_in_PointerTons1__deleteDataSetParameter(struct soap *soap, const char *tag,
                                              ns1__deleteDataSetParameter **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteDataSetParameter **)soap_malloc(
               soap, sizeof(ns1__deleteDataSetParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteDataSetParameter *)
               soap_instantiate_ns1__deleteDataSetParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteDataSetParameter **p =
         (ns1__deleteDataSetParameter **)soap_id_lookup(
@@ -126751,7 +127100,7 @@ soap_in_PointerTons1__deleteDataSetParameter(struct soap *soap, const char *tag,
             sizeof(ns1__deleteDataSetParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -126759,7 +127108,7 @@ soap_in_PointerTons1__deleteDataSetParameter(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__deleteDataSetParameter(
     struct soap *soap, ns1__deleteDataSetParameter *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteDataSetParameter);
   if (soap_out_PointerTons1__deleteDataSetParameter(
           soap, tag ? tag : "ns1:deleteDataSetParameter", id, a, type))
@@ -126774,7 +127123,7 @@ soap_get_PointerTons1__deleteDataSetParameter(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__deleteDataSetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -126789,7 +127138,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__deleteDataSetResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__deleteDataSetResponse(
     struct soap *soap, const char *tag, int id,
     ns1__deleteDataSetResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteDataSetResponse);
   if (id < 0)
     return soap->error;
@@ -126800,22 +127149,22 @@ SOAP_FMAC3 ns1__deleteDataSetResponse **SOAP_FMAC4
 soap_in_PointerTons1__deleteDataSetResponse(struct soap *soap, const char *tag,
                                             ns1__deleteDataSetResponse **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteDataSetResponse **)soap_malloc(
               soap, sizeof(ns1__deleteDataSetResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteDataSetResponse *)
               soap_instantiate_ns1__deleteDataSetResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteDataSetResponse **p =
         (ns1__deleteDataSetResponse **)soap_id_lookup(
@@ -126824,7 +127173,7 @@ soap_in_PointerTons1__deleteDataSetResponse(struct soap *soap, const char *tag,
             sizeof(ns1__deleteDataSetResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -126832,7 +127181,7 @@ soap_in_PointerTons1__deleteDataSetResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__deleteDataSetResponse(
     struct soap *soap, ns1__deleteDataSetResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteDataSetResponse);
   if (soap_out_PointerTons1__deleteDataSetResponse(
           soap, tag ? tag : "ns1:deleteDataSetResponse", id, a, type))
@@ -126847,7 +127196,7 @@ soap_get_PointerTons1__deleteDataSetResponse(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__deleteDataSetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -126864,7 +127213,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__deleteDataSet(struct soap *soap, const char *tag, int id,
                                      ns1__deleteDataSet *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteDataSet);
   if (id < 0)
     return soap->error;
@@ -126874,28 +127223,28 @@ soap_out_PointerTons1__deleteDataSet(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__deleteDataSet **SOAP_FMAC4
 soap_in_PointerTons1__deleteDataSet(struct soap *soap, const char *tag,
                                     ns1__deleteDataSet **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteDataSet **)soap_malloc(soap,
                                                  sizeof(ns1__deleteDataSet *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteDataSet *)soap_instantiate_ns1__deleteDataSet(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteDataSet **p = (ns1__deleteDataSet **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__deleteDataSet,
         sizeof(ns1__deleteDataSet), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -126904,7 +127253,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__deleteDataSet(struct soap *soap,
                                      ns1__deleteDataSet *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteDataSet);
   if (soap_out_PointerTons1__deleteDataSet(
           soap, tag ? tag : "ns1:deleteDataSet", id, a, type))
@@ -126917,7 +127266,7 @@ soap_get_PointerTons1__deleteDataSet(struct soap *soap, ns1__deleteDataSet **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__deleteDataSet(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -126932,7 +127281,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__createDataSetsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__createDataSetsResponse(
     struct soap *soap, const char *tag, int id,
     ns1__createDataSetsResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__createDataSetsResponse);
   if (id < 0)
     return soap->error;
@@ -126943,22 +127292,22 @@ SOAP_FMAC3 ns1__createDataSetsResponse **SOAP_FMAC4
 soap_in_PointerTons1__createDataSetsResponse(struct soap *soap, const char *tag,
                                              ns1__createDataSetsResponse **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__createDataSetsResponse **)soap_malloc(
               soap, sizeof(ns1__createDataSetsResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__createDataSetsResponse *)
               soap_instantiate_ns1__createDataSetsResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__createDataSetsResponse **p =
         (ns1__createDataSetsResponse **)soap_id_lookup(
@@ -126967,7 +127316,7 @@ soap_in_PointerTons1__createDataSetsResponse(struct soap *soap, const char *tag,
             sizeof(ns1__createDataSetsResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -126975,7 +127324,7 @@ soap_in_PointerTons1__createDataSetsResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__createDataSetsResponse(
     struct soap *soap, ns1__createDataSetsResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__createDataSetsResponse);
   if (soap_out_PointerTons1__createDataSetsResponse(
           soap, tag ? tag : "ns1:createDataSetsResponse", id, a, type))
@@ -126990,7 +127339,7 @@ soap_get_PointerTons1__createDataSetsResponse(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__createDataSetsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -127007,7 +127356,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__createDataSets(struct soap *soap, const char *tag,
                                       int id, ns1__createDataSets *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__createDataSets);
   if (id < 0)
     return soap->error;
@@ -127018,28 +127367,28 @@ SOAP_FMAC3 ns1__createDataSets **SOAP_FMAC4
 soap_in_PointerTons1__createDataSets(struct soap *soap, const char *tag,
                                      ns1__createDataSets **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__createDataSets **)soap_malloc(
               soap, sizeof(ns1__createDataSets *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__createDataSets *)soap_instantiate_ns1__createDataSets(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__createDataSets **p = (ns1__createDataSets **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__createDataSets,
         sizeof(ns1__createDataSets), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -127048,7 +127397,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__createDataSets(struct soap *soap,
                                       ns1__createDataSets *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__createDataSets);
   if (soap_out_PointerTons1__createDataSets(
           soap, tag ? tag : "ns1:createDataSets", id, a, type))
@@ -127062,7 +127411,7 @@ soap_get_PointerTons1__createDataSets(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__createDataSets(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -127077,7 +127426,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__createDataSetResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__createDataSetResponse(
     struct soap *soap, const char *tag, int id,
     ns1__createDataSetResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__createDataSetResponse);
   if (id < 0)
     return soap->error;
@@ -127088,22 +127437,22 @@ SOAP_FMAC3 ns1__createDataSetResponse **SOAP_FMAC4
 soap_in_PointerTons1__createDataSetResponse(struct soap *soap, const char *tag,
                                             ns1__createDataSetResponse **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__createDataSetResponse **)soap_malloc(
               soap, sizeof(ns1__createDataSetResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__createDataSetResponse *)
               soap_instantiate_ns1__createDataSetResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__createDataSetResponse **p =
         (ns1__createDataSetResponse **)soap_id_lookup(
@@ -127112,7 +127461,7 @@ soap_in_PointerTons1__createDataSetResponse(struct soap *soap, const char *tag,
             sizeof(ns1__createDataSetResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -127120,7 +127469,7 @@ soap_in_PointerTons1__createDataSetResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__createDataSetResponse(
     struct soap *soap, ns1__createDataSetResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__createDataSetResponse);
   if (soap_out_PointerTons1__createDataSetResponse(
           soap, tag ? tag : "ns1:createDataSetResponse", id, a, type))
@@ -127135,7 +127484,7 @@ soap_get_PointerTons1__createDataSetResponse(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__createDataSetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -127152,7 +127501,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__createDataSet(struct soap *soap, const char *tag, int id,
                                      ns1__createDataSet *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__createDataSet);
   if (id < 0)
     return soap->error;
@@ -127162,28 +127511,28 @@ soap_out_PointerTons1__createDataSet(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__createDataSet **SOAP_FMAC4
 soap_in_PointerTons1__createDataSet(struct soap *soap, const char *tag,
                                     ns1__createDataSet **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__createDataSet **)soap_malloc(soap,
                                                  sizeof(ns1__createDataSet *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__createDataSet *)soap_instantiate_ns1__createDataSet(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__createDataSet **p = (ns1__createDataSet **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__createDataSet,
         sizeof(ns1__createDataSet), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -127192,7 +127541,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__createDataSet(struct soap *soap,
                                      ns1__createDataSet *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__createDataSet);
   if (soap_out_PointerTons1__createDataSet(
           soap, tag ? tag : "ns1:createDataSet", id, a, type))
@@ -127205,7 +127554,7 @@ soap_get_PointerTons1__createDataSet(struct soap *soap, ns1__createDataSet **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__createDataSet(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -127222,7 +127571,7 @@ soap_out_PointerTons1__getDatasetsResponse(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__getDatasetsResponse *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getDatasetsResponse);
   if (id < 0)
     return soap->error;
@@ -127233,29 +127582,29 @@ SOAP_FMAC3 ns1__getDatasetsResponse **SOAP_FMAC4
 soap_in_PointerTons1__getDatasetsResponse(struct soap *soap, const char *tag,
                                           ns1__getDatasetsResponse **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getDatasetsResponse **)soap_malloc(
               soap, sizeof(ns1__getDatasetsResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getDatasetsResponse *)
-              soap_instantiate_ns1__getDatasetsResponse(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__getDatasetsResponse(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getDatasetsResponse **p = (ns1__getDatasetsResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getDatasetsResponse,
         sizeof(ns1__getDatasetsResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -127264,7 +127613,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getDatasetsResponse(struct soap *soap,
                                            ns1__getDatasetsResponse *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getDatasetsResponse);
   if (soap_out_PointerTons1__getDatasetsResponse(
           soap, tag ? tag : "ns1:getDatasetsResponse", id, a, type))
@@ -127278,7 +127627,7 @@ soap_get_PointerTons1__getDatasetsResponse(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getDatasetsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -127295,7 +127644,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getDatasets(struct soap *soap, const char *tag, int id,
                                    ns1__getDatasets *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getDatasets);
   if (id < 0)
     return soap->error;
@@ -127305,28 +127654,28 @@ soap_out_PointerTons1__getDatasets(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__getDatasets **SOAP_FMAC4
 soap_in_PointerTons1__getDatasets(struct soap *soap, const char *tag,
                                   ns1__getDatasets **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getDatasets **)soap_malloc(soap,
                                                sizeof(ns1__getDatasets *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getDatasets *)soap_instantiate_ns1__getDatasets(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getDatasets **p = (ns1__getDatasets **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getDatasets,
         sizeof(ns1__getDatasets), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -127335,7 +127684,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getDatasets(struct soap *soap,
                                    ns1__getDatasets *const *a, const char *tag,
                                    const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getDatasets);
   if (soap_out_PointerTons1__getDatasets(soap, tag ? tag : "ns1:getDatasets",
                                          id, a, type))
@@ -127348,7 +127697,7 @@ soap_get_PointerTons1__getDatasets(struct soap *soap, ns1__getDatasets **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getDatasets(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -127365,7 +127714,7 @@ soap_serialize_PointerTons1__getDatasetIncludesResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getDatasetIncludesResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getDatasetIncludesResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getDatasetIncludesResponse);
   if (id < 0)
     return soap->error;
@@ -127376,22 +127725,22 @@ SOAP_FMAC3 ns1__getDatasetIncludesResponse **SOAP_FMAC4
 soap_in_PointerTons1__getDatasetIncludesResponse(
     struct soap *soap, const char *tag, ns1__getDatasetIncludesResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getDatasetIncludesResponse **)soap_malloc(
               soap, sizeof(ns1__getDatasetIncludesResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getDatasetIncludesResponse *)
               soap_instantiate_ns1__getDatasetIncludesResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getDatasetIncludesResponse **p =
         (ns1__getDatasetIncludesResponse **)soap_id_lookup(
@@ -127400,7 +127749,7 @@ soap_in_PointerTons1__getDatasetIncludesResponse(
             sizeof(ns1__getDatasetIncludesResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -127408,7 +127757,7 @@ soap_in_PointerTons1__getDatasetIncludesResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getDatasetIncludesResponse(
     struct soap *soap, ns1__getDatasetIncludesResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getDatasetIncludesResponse);
   if (soap_out_PointerTons1__getDatasetIncludesResponse(
           soap, tag ? tag : "ns1:getDatasetIncludesResponse", id, a, type))
@@ -127423,7 +127772,7 @@ soap_get_PointerTons1__getDatasetIncludesResponse(
   if ((p = soap_in_PointerTons1__getDatasetIncludesResponse(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -127440,7 +127789,7 @@ soap_out_PointerTons1__getDatasetIncludes(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__getDatasetIncludes *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getDatasetIncludes);
   if (id < 0)
     return soap->error;
@@ -127451,29 +127800,29 @@ SOAP_FMAC3 ns1__getDatasetIncludes **SOAP_FMAC4
 soap_in_PointerTons1__getDatasetIncludes(struct soap *soap, const char *tag,
                                          ns1__getDatasetIncludes **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getDatasetIncludes **)soap_malloc(
               soap, sizeof(ns1__getDatasetIncludes *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getDatasetIncludes *)
-              soap_instantiate_ns1__getDatasetIncludes(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__getDatasetIncludes(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getDatasetIncludes **p = (ns1__getDatasetIncludes **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getDatasetIncludes,
         sizeof(ns1__getDatasetIncludes), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -127482,7 +127831,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getDatasetIncludes(struct soap *soap,
                                           ns1__getDatasetIncludes *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getDatasetIncludes);
   if (soap_out_PointerTons1__getDatasetIncludes(
           soap, tag ? tag : "ns1:getDatasetIncludes", id, a, type))
@@ -127496,7 +127845,7 @@ soap_get_PointerTons1__getDatasetIncludes(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getDatasetIncludes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -127513,7 +127862,7 @@ soap_out_PointerTons1__getDatasetResponse(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__getDatasetResponse *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getDatasetResponse);
   if (id < 0)
     return soap->error;
@@ -127524,29 +127873,29 @@ SOAP_FMAC3 ns1__getDatasetResponse **SOAP_FMAC4
 soap_in_PointerTons1__getDatasetResponse(struct soap *soap, const char *tag,
                                          ns1__getDatasetResponse **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getDatasetResponse **)soap_malloc(
               soap, sizeof(ns1__getDatasetResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getDatasetResponse *)
-              soap_instantiate_ns1__getDatasetResponse(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__getDatasetResponse(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getDatasetResponse **p = (ns1__getDatasetResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getDatasetResponse,
         sizeof(ns1__getDatasetResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -127555,7 +127904,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getDatasetResponse(struct soap *soap,
                                           ns1__getDatasetResponse *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getDatasetResponse);
   if (soap_out_PointerTons1__getDatasetResponse(
           soap, tag ? tag : "ns1:getDatasetResponse", id, a, type))
@@ -127569,7 +127918,7 @@ soap_get_PointerTons1__getDatasetResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getDatasetResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -127585,7 +127934,7 @@ soap_serialize_PointerTons1__getDataset(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getDataset(struct soap *soap, const char *tag, int id,
                                   ns1__getDataset *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getDataset);
   if (id < 0)
     return soap->error;
@@ -127595,27 +127944,27 @@ soap_out_PointerTons1__getDataset(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__getDataset **SOAP_FMAC4
 soap_in_PointerTons1__getDataset(struct soap *soap, const char *tag,
                                  ns1__getDataset **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getDataset **)soap_malloc(soap, sizeof(ns1__getDataset *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getDataset *)soap_instantiate_ns1__getDataset(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getDataset **p = (ns1__getDataset **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getDataset,
         sizeof(ns1__getDataset), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -127623,7 +127972,7 @@ soap_in_PointerTons1__getDataset(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getDataset(struct soap *soap, ns1__getDataset *const *a,
                                   const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getDataset);
   if (soap_out_PointerTons1__getDataset(soap, tag ? tag : "ns1:getDataset", id,
                                         a, type))
@@ -127636,7 +127985,7 @@ soap_get_PointerTons1__getDataset(struct soap *soap, ns1__getDataset **p,
                                   const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getDataset(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -127653,7 +128002,7 @@ soap_serialize_PointerTons1__removeSampleParameterResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__removeSampleParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__removeSampleParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeSampleParameterResponse);
   if (id < 0)
     return soap->error;
@@ -127664,22 +128013,22 @@ SOAP_FMAC3 ns1__removeSampleParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__removeSampleParameterResponse(
     struct soap *soap, const char *tag, ns1__removeSampleParameterResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeSampleParameterResponse **)soap_malloc(
               soap, sizeof(ns1__removeSampleParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeSampleParameterResponse *)
               soap_instantiate_ns1__removeSampleParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeSampleParameterResponse **p =
         (ns1__removeSampleParameterResponse **)soap_id_lookup(
@@ -127688,7 +128037,7 @@ soap_in_PointerTons1__removeSampleParameterResponse(
             sizeof(ns1__removeSampleParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -127697,7 +128046,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__removeSampleParameterResponse(
     struct soap *soap, ns1__removeSampleParameterResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__removeSampleParameterResponse);
   if (soap_out_PointerTons1__removeSampleParameterResponse(
           soap, tag ? tag : "ns1:removeSampleParameterResponse", id, a, type))
@@ -127712,7 +128061,7 @@ soap_get_PointerTons1__removeSampleParameterResponse(
   if ((p = soap_in_PointerTons1__removeSampleParameterResponse(soap, tag, p,
                                                                type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -127727,7 +128076,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__removeSampleParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__removeSampleParameter(
     struct soap *soap, const char *tag, int id,
     ns1__removeSampleParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeSampleParameter);
   if (id < 0)
     return soap->error;
@@ -127738,22 +128087,22 @@ SOAP_FMAC3 ns1__removeSampleParameter **SOAP_FMAC4
 soap_in_PointerTons1__removeSampleParameter(struct soap *soap, const char *tag,
                                             ns1__removeSampleParameter **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeSampleParameter **)soap_malloc(
               soap, sizeof(ns1__removeSampleParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeSampleParameter *)
               soap_instantiate_ns1__removeSampleParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeSampleParameter **p =
         (ns1__removeSampleParameter **)soap_id_lookup(
@@ -127762,7 +128111,7 @@ soap_in_PointerTons1__removeSampleParameter(struct soap *soap, const char *tag,
             sizeof(ns1__removeSampleParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -127770,7 +128119,7 @@ soap_in_PointerTons1__removeSampleParameter(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__removeSampleParameter(
     struct soap *soap, ns1__removeSampleParameter *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeSampleParameter);
   if (soap_out_PointerTons1__removeSampleParameter(
           soap, tag ? tag : "ns1:removeSampleParameter", id, a, type))
@@ -127785,7 +128134,7 @@ soap_get_PointerTons1__removeSampleParameter(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__removeSampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -127802,7 +128151,7 @@ soap_out_PointerTons1__removeSampleResponse(struct soap *soap, const char *tag,
                                             int id,
                                             ns1__removeSampleResponse *const *a,
                                             const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeSampleResponse);
   if (id < 0)
     return soap->error;
@@ -127813,22 +128162,22 @@ SOAP_FMAC3 ns1__removeSampleResponse **SOAP_FMAC4
 soap_in_PointerTons1__removeSampleResponse(struct soap *soap, const char *tag,
                                            ns1__removeSampleResponse **a,
                                            const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeSampleResponse **)soap_malloc(
               soap, sizeof(ns1__removeSampleResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeSampleResponse *)
               soap_instantiate_ns1__removeSampleResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeSampleResponse **p =
         (ns1__removeSampleResponse **)soap_id_lookup(
@@ -127837,7 +128186,7 @@ soap_in_PointerTons1__removeSampleResponse(struct soap *soap, const char *tag,
             sizeof(ns1__removeSampleResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -127846,7 +128195,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__removeSampleResponse(struct soap *soap,
                                             ns1__removeSampleResponse *const *a,
                                             const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeSampleResponse);
   if (soap_out_PointerTons1__removeSampleResponse(
           soap, tag ? tag : "ns1:removeSampleResponse", id, a, type))
@@ -127860,7 +128209,7 @@ soap_get_PointerTons1__removeSampleResponse(struct soap *soap,
                                             const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__removeSampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -127877,7 +128226,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__removeSample(struct soap *soap, const char *tag, int id,
                                     ns1__removeSample *const *a,
                                     const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeSample);
   if (id < 0)
     return soap->error;
@@ -127887,28 +128236,28 @@ soap_out_PointerTons1__removeSample(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__removeSample **SOAP_FMAC4
 soap_in_PointerTons1__removeSample(struct soap *soap, const char *tag,
                                    ns1__removeSample **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeSample **)soap_malloc(soap,
                                                 sizeof(ns1__removeSample *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeSample *)soap_instantiate_ns1__removeSample(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeSample **p = (ns1__removeSample **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__removeSample,
         sizeof(ns1__removeSample), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -127917,7 +128266,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__removeSample(struct soap *soap,
                                     ns1__removeSample *const *a,
                                     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeSample);
   if (soap_out_PointerTons1__removeSample(soap, tag ? tag : "ns1:removeSample",
                                           id, a, type))
@@ -127930,7 +128279,7 @@ soap_get_PointerTons1__removeSample(struct soap *soap, ns1__removeSample **p,
                                     const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__removeSample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -127946,7 +128295,7 @@ soap_serialize_PointerTons1__removePublicationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__removePublicationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__removePublicationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removePublicationResponse);
   if (id < 0)
     return soap->error;
@@ -127957,22 +128306,22 @@ SOAP_FMAC3 ns1__removePublicationResponse **SOAP_FMAC4
 soap_in_PointerTons1__removePublicationResponse(
     struct soap *soap, const char *tag, ns1__removePublicationResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removePublicationResponse **)soap_malloc(
               soap, sizeof(ns1__removePublicationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removePublicationResponse *)
               soap_instantiate_ns1__removePublicationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removePublicationResponse **p =
         (ns1__removePublicationResponse **)soap_id_lookup(
@@ -127981,7 +128330,7 @@ soap_in_PointerTons1__removePublicationResponse(
             sizeof(ns1__removePublicationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -127989,7 +128338,7 @@ soap_in_PointerTons1__removePublicationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__removePublicationResponse(
     struct soap *soap, ns1__removePublicationResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removePublicationResponse);
   if (soap_out_PointerTons1__removePublicationResponse(
           soap, tag ? tag : "ns1:removePublicationResponse", id, a, type))
@@ -128003,7 +128352,7 @@ soap_get_PointerTons1__removePublicationResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__removePublicationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -128020,7 +128369,7 @@ soap_out_PointerTons1__removePublication(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__removePublication *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removePublication);
   if (id < 0)
     return soap->error;
@@ -128031,29 +128380,29 @@ SOAP_FMAC3 ns1__removePublication **SOAP_FMAC4
 soap_in_PointerTons1__removePublication(struct soap *soap, const char *tag,
                                         ns1__removePublication **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removePublication **)soap_malloc(
               soap, sizeof(ns1__removePublication *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__removePublication *)soap_instantiate_ns1__removePublication(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removePublication **p = (ns1__removePublication **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__removePublication,
         sizeof(ns1__removePublication), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -128062,7 +128411,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__removePublication(struct soap *soap,
                                          ns1__removePublication *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removePublication);
   if (soap_out_PointerTons1__removePublication(
           soap, tag ? tag : "ns1:removePublication", id, a, type))
@@ -128076,7 +128425,7 @@ soap_get_PointerTons1__removePublication(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__removePublication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -128093,7 +128442,7 @@ soap_serialize_PointerTons1__removeInvestigatorResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__removeInvestigatorResponse(
     struct soap *soap, const char *tag, int id,
     ns1__removeInvestigatorResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeInvestigatorResponse);
   if (id < 0)
     return soap->error;
@@ -128104,22 +128453,22 @@ SOAP_FMAC3 ns1__removeInvestigatorResponse **SOAP_FMAC4
 soap_in_PointerTons1__removeInvestigatorResponse(
     struct soap *soap, const char *tag, ns1__removeInvestigatorResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeInvestigatorResponse **)soap_malloc(
               soap, sizeof(ns1__removeInvestigatorResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeInvestigatorResponse *)
               soap_instantiate_ns1__removeInvestigatorResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeInvestigatorResponse **p =
         (ns1__removeInvestigatorResponse **)soap_id_lookup(
@@ -128128,7 +128477,7 @@ soap_in_PointerTons1__removeInvestigatorResponse(
             sizeof(ns1__removeInvestigatorResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -128136,7 +128485,7 @@ soap_in_PointerTons1__removeInvestigatorResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__removeInvestigatorResponse(
     struct soap *soap, ns1__removeInvestigatorResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeInvestigatorResponse);
   if (soap_out_PointerTons1__removeInvestigatorResponse(
           soap, tag ? tag : "ns1:removeInvestigatorResponse", id, a, type))
@@ -128151,7 +128500,7 @@ soap_get_PointerTons1__removeInvestigatorResponse(
   if ((p = soap_in_PointerTons1__removeInvestigatorResponse(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -128168,7 +128517,7 @@ soap_out_PointerTons1__removeInvestigator(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__removeInvestigator *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeInvestigator);
   if (id < 0)
     return soap->error;
@@ -128179,29 +128528,29 @@ SOAP_FMAC3 ns1__removeInvestigator **SOAP_FMAC4
 soap_in_PointerTons1__removeInvestigator(struct soap *soap, const char *tag,
                                          ns1__removeInvestigator **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeInvestigator **)soap_malloc(
               soap, sizeof(ns1__removeInvestigator *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeInvestigator *)
-              soap_instantiate_ns1__removeInvestigator(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__removeInvestigator(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeInvestigator **p = (ns1__removeInvestigator **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__removeInvestigator,
         sizeof(ns1__removeInvestigator), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -128210,7 +128559,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__removeInvestigator(struct soap *soap,
                                           ns1__removeInvestigator *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeInvestigator);
   if (soap_out_PointerTons1__removeInvestigator(
           soap, tag ? tag : "ns1:removeInvestigator", id, a, type))
@@ -128224,7 +128573,7 @@ soap_get_PointerTons1__removeInvestigator(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__removeInvestigator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -128239,7 +128588,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__removeKeywordResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__removeKeywordResponse(
     struct soap *soap, const char *tag, int id,
     ns1__removeKeywordResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeKeywordResponse);
   if (id < 0)
     return soap->error;
@@ -128250,22 +128599,22 @@ SOAP_FMAC3 ns1__removeKeywordResponse **SOAP_FMAC4
 soap_in_PointerTons1__removeKeywordResponse(struct soap *soap, const char *tag,
                                             ns1__removeKeywordResponse **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeKeywordResponse **)soap_malloc(
               soap, sizeof(ns1__removeKeywordResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeKeywordResponse *)
               soap_instantiate_ns1__removeKeywordResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeKeywordResponse **p =
         (ns1__removeKeywordResponse **)soap_id_lookup(
@@ -128274,7 +128623,7 @@ soap_in_PointerTons1__removeKeywordResponse(struct soap *soap, const char *tag,
             sizeof(ns1__removeKeywordResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -128282,7 +128631,7 @@ soap_in_PointerTons1__removeKeywordResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__removeKeywordResponse(
     struct soap *soap, ns1__removeKeywordResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeKeywordResponse);
   if (soap_out_PointerTons1__removeKeywordResponse(
           soap, tag ? tag : "ns1:removeKeywordResponse", id, a, type))
@@ -128297,7 +128646,7 @@ soap_get_PointerTons1__removeKeywordResponse(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__removeKeywordResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -128314,7 +128663,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__removeKeyword(struct soap *soap, const char *tag, int id,
                                      ns1__removeKeyword *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeKeyword);
   if (id < 0)
     return soap->error;
@@ -128324,28 +128673,28 @@ soap_out_PointerTons1__removeKeyword(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__removeKeyword **SOAP_FMAC4
 soap_in_PointerTons1__removeKeyword(struct soap *soap, const char *tag,
                                     ns1__removeKeyword **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeKeyword **)soap_malloc(soap,
                                                  sizeof(ns1__removeKeyword *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeKeyword *)soap_instantiate_ns1__removeKeyword(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeKeyword **p = (ns1__removeKeyword **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__removeKeyword,
         sizeof(ns1__removeKeyword), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -128354,7 +128703,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__removeKeyword(struct soap *soap,
                                      ns1__removeKeyword *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeKeyword);
   if (soap_out_PointerTons1__removeKeyword(
           soap, tag ? tag : "ns1:removeKeyword", id, a, type))
@@ -128367,7 +128716,7 @@ soap_get_PointerTons1__removeKeyword(struct soap *soap, ns1__removeKeyword **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__removeKeyword(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -128384,7 +128733,7 @@ soap_serialize_PointerTons1__modifySampleParameterResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__modifySampleParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__modifySampleParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifySampleParameterResponse);
   if (id < 0)
     return soap->error;
@@ -128395,22 +128744,22 @@ SOAP_FMAC3 ns1__modifySampleParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__modifySampleParameterResponse(
     struct soap *soap, const char *tag, ns1__modifySampleParameterResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifySampleParameterResponse **)soap_malloc(
               soap, sizeof(ns1__modifySampleParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifySampleParameterResponse *)
               soap_instantiate_ns1__modifySampleParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifySampleParameterResponse **p =
         (ns1__modifySampleParameterResponse **)soap_id_lookup(
@@ -128419,7 +128768,7 @@ soap_in_PointerTons1__modifySampleParameterResponse(
             sizeof(ns1__modifySampleParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -128428,7 +128777,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__modifySampleParameterResponse(
     struct soap *soap, ns1__modifySampleParameterResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__modifySampleParameterResponse);
   if (soap_out_PointerTons1__modifySampleParameterResponse(
           soap, tag ? tag : "ns1:modifySampleParameterResponse", id, a, type))
@@ -128443,7 +128792,7 @@ soap_get_PointerTons1__modifySampleParameterResponse(
   if ((p = soap_in_PointerTons1__modifySampleParameterResponse(soap, tag, p,
                                                                type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -128458,7 +128807,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__modifySampleParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__modifySampleParameter(
     struct soap *soap, const char *tag, int id,
     ns1__modifySampleParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifySampleParameter);
   if (id < 0)
     return soap->error;
@@ -128469,22 +128818,22 @@ SOAP_FMAC3 ns1__modifySampleParameter **SOAP_FMAC4
 soap_in_PointerTons1__modifySampleParameter(struct soap *soap, const char *tag,
                                             ns1__modifySampleParameter **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifySampleParameter **)soap_malloc(
               soap, sizeof(ns1__modifySampleParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifySampleParameter *)
               soap_instantiate_ns1__modifySampleParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifySampleParameter **p =
         (ns1__modifySampleParameter **)soap_id_lookup(
@@ -128493,7 +128842,7 @@ soap_in_PointerTons1__modifySampleParameter(struct soap *soap, const char *tag,
             sizeof(ns1__modifySampleParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -128501,7 +128850,7 @@ soap_in_PointerTons1__modifySampleParameter(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__modifySampleParameter(
     struct soap *soap, ns1__modifySampleParameter *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__modifySampleParameter);
   if (soap_out_PointerTons1__modifySampleParameter(
           soap, tag ? tag : "ns1:modifySampleParameter", id, a, type))
@@ -128516,7 +128865,7 @@ soap_get_PointerTons1__modifySampleParameter(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__modifySampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -128532,7 +128881,7 @@ soap_serialize_PointerTons1__modifyPublicationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__modifyPublicationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__modifyPublicationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifyPublicationResponse);
   if (id < 0)
     return soap->error;
@@ -128543,22 +128892,22 @@ SOAP_FMAC3 ns1__modifyPublicationResponse **SOAP_FMAC4
 soap_in_PointerTons1__modifyPublicationResponse(
     struct soap *soap, const char *tag, ns1__modifyPublicationResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifyPublicationResponse **)soap_malloc(
               soap, sizeof(ns1__modifyPublicationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifyPublicationResponse *)
               soap_instantiate_ns1__modifyPublicationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifyPublicationResponse **p =
         (ns1__modifyPublicationResponse **)soap_id_lookup(
@@ -128567,7 +128916,7 @@ soap_in_PointerTons1__modifyPublicationResponse(
             sizeof(ns1__modifyPublicationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -128575,7 +128924,7 @@ soap_in_PointerTons1__modifyPublicationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__modifyPublicationResponse(
     struct soap *soap, ns1__modifyPublicationResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__modifyPublicationResponse);
   if (soap_out_PointerTons1__modifyPublicationResponse(
           soap, tag ? tag : "ns1:modifyPublicationResponse", id, a, type))
@@ -128589,7 +128938,7 @@ soap_get_PointerTons1__modifyPublicationResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__modifyPublicationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -128606,7 +128955,7 @@ soap_out_PointerTons1__modifyPublication(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__modifyPublication *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifyPublication);
   if (id < 0)
     return soap->error;
@@ -128617,29 +128966,29 @@ SOAP_FMAC3 ns1__modifyPublication **SOAP_FMAC4
 soap_in_PointerTons1__modifyPublication(struct soap *soap, const char *tag,
                                         ns1__modifyPublication **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifyPublication **)soap_malloc(
               soap, sizeof(ns1__modifyPublication *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__modifyPublication *)soap_instantiate_ns1__modifyPublication(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifyPublication **p = (ns1__modifyPublication **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__modifyPublication,
         sizeof(ns1__modifyPublication), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -128648,7 +128997,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__modifyPublication(struct soap *soap,
                                          ns1__modifyPublication *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__modifyPublication);
   if (soap_out_PointerTons1__modifyPublication(
           soap, tag ? tag : "ns1:modifyPublication", id, a, type))
@@ -128662,7 +129011,7 @@ soap_get_PointerTons1__modifyPublication(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__modifyPublication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -128679,7 +129028,7 @@ soap_out_PointerTons1__modifySampleResponse(struct soap *soap, const char *tag,
                                             int id,
                                             ns1__modifySampleResponse *const *a,
                                             const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifySampleResponse);
   if (id < 0)
     return soap->error;
@@ -128690,22 +129039,22 @@ SOAP_FMAC3 ns1__modifySampleResponse **SOAP_FMAC4
 soap_in_PointerTons1__modifySampleResponse(struct soap *soap, const char *tag,
                                            ns1__modifySampleResponse **a,
                                            const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifySampleResponse **)soap_malloc(
               soap, sizeof(ns1__modifySampleResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifySampleResponse *)
               soap_instantiate_ns1__modifySampleResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifySampleResponse **p =
         (ns1__modifySampleResponse **)soap_id_lookup(
@@ -128714,7 +129063,7 @@ soap_in_PointerTons1__modifySampleResponse(struct soap *soap, const char *tag,
             sizeof(ns1__modifySampleResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -128723,7 +129072,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__modifySampleResponse(struct soap *soap,
                                             ns1__modifySampleResponse *const *a,
                                             const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__modifySampleResponse);
   if (soap_out_PointerTons1__modifySampleResponse(
           soap, tag ? tag : "ns1:modifySampleResponse", id, a, type))
@@ -128737,7 +129086,7 @@ soap_get_PointerTons1__modifySampleResponse(struct soap *soap,
                                             const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__modifySampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -128754,7 +129103,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__modifySample(struct soap *soap, const char *tag, int id,
                                     ns1__modifySample *const *a,
                                     const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifySample);
   if (id < 0)
     return soap->error;
@@ -128764,28 +129113,28 @@ soap_out_PointerTons1__modifySample(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__modifySample **SOAP_FMAC4
 soap_in_PointerTons1__modifySample(struct soap *soap, const char *tag,
                                    ns1__modifySample **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifySample **)soap_malloc(soap,
                                                 sizeof(ns1__modifySample *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifySample *)soap_instantiate_ns1__modifySample(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifySample **p = (ns1__modifySample **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__modifySample,
         sizeof(ns1__modifySample), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -128794,7 +129143,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__modifySample(struct soap *soap,
                                     ns1__modifySample *const *a,
                                     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__modifySample);
   if (soap_out_PointerTons1__modifySample(soap, tag ? tag : "ns1:modifySample",
                                           id, a, type))
@@ -128807,7 +129156,7 @@ soap_get_PointerTons1__modifySample(struct soap *soap, ns1__modifySample **p,
                                     const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__modifySample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -128824,7 +129173,7 @@ soap_serialize_PointerTons1__modifyInvestigatorResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__modifyInvestigatorResponse(
     struct soap *soap, const char *tag, int id,
     ns1__modifyInvestigatorResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifyInvestigatorResponse);
   if (id < 0)
     return soap->error;
@@ -128835,22 +129184,22 @@ SOAP_FMAC3 ns1__modifyInvestigatorResponse **SOAP_FMAC4
 soap_in_PointerTons1__modifyInvestigatorResponse(
     struct soap *soap, const char *tag, ns1__modifyInvestigatorResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifyInvestigatorResponse **)soap_malloc(
               soap, sizeof(ns1__modifyInvestigatorResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifyInvestigatorResponse *)
               soap_instantiate_ns1__modifyInvestigatorResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifyInvestigatorResponse **p =
         (ns1__modifyInvestigatorResponse **)soap_id_lookup(
@@ -128859,7 +129208,7 @@ soap_in_PointerTons1__modifyInvestigatorResponse(
             sizeof(ns1__modifyInvestigatorResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -128867,7 +129216,7 @@ soap_in_PointerTons1__modifyInvestigatorResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__modifyInvestigatorResponse(
     struct soap *soap, ns1__modifyInvestigatorResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__modifyInvestigatorResponse);
   if (soap_out_PointerTons1__modifyInvestigatorResponse(
           soap, tag ? tag : "ns1:modifyInvestigatorResponse", id, a, type))
@@ -128882,7 +129231,7 @@ soap_get_PointerTons1__modifyInvestigatorResponse(
   if ((p = soap_in_PointerTons1__modifyInvestigatorResponse(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -128899,7 +129248,7 @@ soap_out_PointerTons1__modifyInvestigator(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__modifyInvestigator *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifyInvestigator);
   if (id < 0)
     return soap->error;
@@ -128910,29 +129259,29 @@ SOAP_FMAC3 ns1__modifyInvestigator **SOAP_FMAC4
 soap_in_PointerTons1__modifyInvestigator(struct soap *soap, const char *tag,
                                          ns1__modifyInvestigator **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifyInvestigator **)soap_malloc(
               soap, sizeof(ns1__modifyInvestigator *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifyInvestigator *)
-              soap_instantiate_ns1__modifyInvestigator(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__modifyInvestigator(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifyInvestigator **p = (ns1__modifyInvestigator **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__modifyInvestigator,
         sizeof(ns1__modifyInvestigator), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -128941,7 +129290,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__modifyInvestigator(struct soap *soap,
                                           ns1__modifyInvestigator *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__modifyInvestigator);
   if (soap_out_PointerTons1__modifyInvestigator(
           soap, tag ? tag : "ns1:modifyInvestigator", id, a, type))
@@ -128955,7 +129304,7 @@ soap_get_PointerTons1__modifyInvestigator(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__modifyInvestigator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -128972,7 +129321,7 @@ soap_serialize_PointerTons1__modifyInvestigationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__modifyInvestigationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__modifyInvestigationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifyInvestigationResponse);
   if (id < 0)
     return soap->error;
@@ -128983,22 +129332,22 @@ SOAP_FMAC3 ns1__modifyInvestigationResponse **SOAP_FMAC4
 soap_in_PointerTons1__modifyInvestigationResponse(
     struct soap *soap, const char *tag, ns1__modifyInvestigationResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifyInvestigationResponse **)soap_malloc(
               soap, sizeof(ns1__modifyInvestigationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifyInvestigationResponse *)
               soap_instantiate_ns1__modifyInvestigationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifyInvestigationResponse **p =
         (ns1__modifyInvestigationResponse **)soap_id_lookup(
@@ -129007,7 +129356,7 @@ soap_in_PointerTons1__modifyInvestigationResponse(
             sizeof(ns1__modifyInvestigationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -129016,7 +129365,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__modifyInvestigationResponse(
     struct soap *soap, ns1__modifyInvestigationResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__modifyInvestigationResponse);
   if (soap_out_PointerTons1__modifyInvestigationResponse(
           soap, tag ? tag : "ns1:modifyInvestigationResponse", id, a, type))
@@ -129031,7 +129380,7 @@ soap_get_PointerTons1__modifyInvestigationResponse(
   if ((p = soap_in_PointerTons1__modifyInvestigationResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -129048,7 +129397,7 @@ soap_out_PointerTons1__modifyInvestigation(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__modifyInvestigation *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__modifyInvestigation);
   if (id < 0)
     return soap->error;
@@ -129059,29 +129408,29 @@ SOAP_FMAC3 ns1__modifyInvestigation **SOAP_FMAC4
 soap_in_PointerTons1__modifyInvestigation(struct soap *soap, const char *tag,
                                           ns1__modifyInvestigation **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__modifyInvestigation **)soap_malloc(
               soap, sizeof(ns1__modifyInvestigation *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__modifyInvestigation *)
-              soap_instantiate_ns1__modifyInvestigation(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__modifyInvestigation(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__modifyInvestigation **p = (ns1__modifyInvestigation **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__modifyInvestigation,
         sizeof(ns1__modifyInvestigation), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -129090,7 +129439,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__modifyInvestigation(struct soap *soap,
                                            ns1__modifyInvestigation *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__modifyInvestigation);
   if (soap_out_PointerTons1__modifyInvestigation(
           soap, tag ? tag : "ns1:modifyInvestigation", id, a, type))
@@ -129104,7 +129453,7 @@ soap_get_PointerTons1__modifyInvestigation(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__modifyInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -129121,7 +129470,7 @@ soap_serialize_PointerTons1__deleteSampleParameterResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__deleteSampleParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__deleteSampleParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteSampleParameterResponse);
   if (id < 0)
     return soap->error;
@@ -129132,22 +129481,22 @@ SOAP_FMAC3 ns1__deleteSampleParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__deleteSampleParameterResponse(
     struct soap *soap, const char *tag, ns1__deleteSampleParameterResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteSampleParameterResponse **)soap_malloc(
               soap, sizeof(ns1__deleteSampleParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteSampleParameterResponse *)
               soap_instantiate_ns1__deleteSampleParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteSampleParameterResponse **p =
         (ns1__deleteSampleParameterResponse **)soap_id_lookup(
@@ -129156,7 +129505,7 @@ soap_in_PointerTons1__deleteSampleParameterResponse(
             sizeof(ns1__deleteSampleParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -129165,7 +129514,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__deleteSampleParameterResponse(
     struct soap *soap, ns1__deleteSampleParameterResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__deleteSampleParameterResponse);
   if (soap_out_PointerTons1__deleteSampleParameterResponse(
           soap, tag ? tag : "ns1:deleteSampleParameterResponse", id, a, type))
@@ -129180,7 +129529,7 @@ soap_get_PointerTons1__deleteSampleParameterResponse(
   if ((p = soap_in_PointerTons1__deleteSampleParameterResponse(soap, tag, p,
                                                                type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -129195,7 +129544,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__deleteSampleParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__deleteSampleParameter(
     struct soap *soap, const char *tag, int id,
     ns1__deleteSampleParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteSampleParameter);
   if (id < 0)
     return soap->error;
@@ -129206,22 +129555,22 @@ SOAP_FMAC3 ns1__deleteSampleParameter **SOAP_FMAC4
 soap_in_PointerTons1__deleteSampleParameter(struct soap *soap, const char *tag,
                                             ns1__deleteSampleParameter **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteSampleParameter **)soap_malloc(
               soap, sizeof(ns1__deleteSampleParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteSampleParameter *)
               soap_instantiate_ns1__deleteSampleParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteSampleParameter **p =
         (ns1__deleteSampleParameter **)soap_id_lookup(
@@ -129230,7 +129579,7 @@ soap_in_PointerTons1__deleteSampleParameter(struct soap *soap, const char *tag,
             sizeof(ns1__deleteSampleParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -129238,7 +129587,7 @@ soap_in_PointerTons1__deleteSampleParameter(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__deleteSampleParameter(
     struct soap *soap, ns1__deleteSampleParameter *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteSampleParameter);
   if (soap_out_PointerTons1__deleteSampleParameter(
           soap, tag ? tag : "ns1:deleteSampleParameter", id, a, type))
@@ -129253,7 +129602,7 @@ soap_get_PointerTons1__deleteSampleParameter(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__deleteSampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -129270,7 +129619,7 @@ soap_out_PointerTons1__deleteSampleResponse(struct soap *soap, const char *tag,
                                             int id,
                                             ns1__deleteSampleResponse *const *a,
                                             const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteSampleResponse);
   if (id < 0)
     return soap->error;
@@ -129281,22 +129630,22 @@ SOAP_FMAC3 ns1__deleteSampleResponse **SOAP_FMAC4
 soap_in_PointerTons1__deleteSampleResponse(struct soap *soap, const char *tag,
                                            ns1__deleteSampleResponse **a,
                                            const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteSampleResponse **)soap_malloc(
               soap, sizeof(ns1__deleteSampleResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteSampleResponse *)
               soap_instantiate_ns1__deleteSampleResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteSampleResponse **p =
         (ns1__deleteSampleResponse **)soap_id_lookup(
@@ -129305,7 +129654,7 @@ soap_in_PointerTons1__deleteSampleResponse(struct soap *soap, const char *tag,
             sizeof(ns1__deleteSampleResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -129314,7 +129663,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__deleteSampleResponse(struct soap *soap,
                                             ns1__deleteSampleResponse *const *a,
                                             const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteSampleResponse);
   if (soap_out_PointerTons1__deleteSampleResponse(
           soap, tag ? tag : "ns1:deleteSampleResponse", id, a, type))
@@ -129328,7 +129677,7 @@ soap_get_PointerTons1__deleteSampleResponse(struct soap *soap,
                                             const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__deleteSampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -129345,7 +129694,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__deleteSample(struct soap *soap, const char *tag, int id,
                                     ns1__deleteSample *const *a,
                                     const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteSample);
   if (id < 0)
     return soap->error;
@@ -129355,28 +129704,28 @@ soap_out_PointerTons1__deleteSample(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__deleteSample **SOAP_FMAC4
 soap_in_PointerTons1__deleteSample(struct soap *soap, const char *tag,
                                    ns1__deleteSample **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteSample **)soap_malloc(soap,
                                                 sizeof(ns1__deleteSample *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteSample *)soap_instantiate_ns1__deleteSample(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteSample **p = (ns1__deleteSample **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__deleteSample,
         sizeof(ns1__deleteSample), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -129385,7 +129734,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__deleteSample(struct soap *soap,
                                     ns1__deleteSample *const *a,
                                     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteSample);
   if (soap_out_PointerTons1__deleteSample(soap, tag ? tag : "ns1:deleteSample",
                                           id, a, type))
@@ -129398,7 +129747,7 @@ soap_get_PointerTons1__deleteSample(struct soap *soap, ns1__deleteSample **p,
                                     const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__deleteSample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -129414,7 +129763,7 @@ soap_serialize_PointerTons1__deletePublicationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__deletePublicationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__deletePublicationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deletePublicationResponse);
   if (id < 0)
     return soap->error;
@@ -129425,22 +129774,22 @@ SOAP_FMAC3 ns1__deletePublicationResponse **SOAP_FMAC4
 soap_in_PointerTons1__deletePublicationResponse(
     struct soap *soap, const char *tag, ns1__deletePublicationResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deletePublicationResponse **)soap_malloc(
               soap, sizeof(ns1__deletePublicationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deletePublicationResponse *)
               soap_instantiate_ns1__deletePublicationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deletePublicationResponse **p =
         (ns1__deletePublicationResponse **)soap_id_lookup(
@@ -129449,7 +129798,7 @@ soap_in_PointerTons1__deletePublicationResponse(
             sizeof(ns1__deletePublicationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -129457,7 +129806,7 @@ soap_in_PointerTons1__deletePublicationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__deletePublicationResponse(
     struct soap *soap, ns1__deletePublicationResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deletePublicationResponse);
   if (soap_out_PointerTons1__deletePublicationResponse(
           soap, tag ? tag : "ns1:deletePublicationResponse", id, a, type))
@@ -129471,7 +129820,7 @@ soap_get_PointerTons1__deletePublicationResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__deletePublicationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -129488,7 +129837,7 @@ soap_out_PointerTons1__deletePublication(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__deletePublication *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deletePublication);
   if (id < 0)
     return soap->error;
@@ -129499,29 +129848,29 @@ SOAP_FMAC3 ns1__deletePublication **SOAP_FMAC4
 soap_in_PointerTons1__deletePublication(struct soap *soap, const char *tag,
                                         ns1__deletePublication **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deletePublication **)soap_malloc(
               soap, sizeof(ns1__deletePublication *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__deletePublication *)soap_instantiate_ns1__deletePublication(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deletePublication **p = (ns1__deletePublication **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__deletePublication,
         sizeof(ns1__deletePublication), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -129530,7 +129879,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__deletePublication(struct soap *soap,
                                          ns1__deletePublication *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deletePublication);
   if (soap_out_PointerTons1__deletePublication(
           soap, tag ? tag : "ns1:deletePublication", id, a, type))
@@ -129544,7 +129893,7 @@ soap_get_PointerTons1__deletePublication(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__deletePublication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -129559,7 +129908,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__deleteKeywordResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__deleteKeywordResponse(
     struct soap *soap, const char *tag, int id,
     ns1__deleteKeywordResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteKeywordResponse);
   if (id < 0)
     return soap->error;
@@ -129570,22 +129919,22 @@ SOAP_FMAC3 ns1__deleteKeywordResponse **SOAP_FMAC4
 soap_in_PointerTons1__deleteKeywordResponse(struct soap *soap, const char *tag,
                                             ns1__deleteKeywordResponse **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteKeywordResponse **)soap_malloc(
               soap, sizeof(ns1__deleteKeywordResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteKeywordResponse *)
               soap_instantiate_ns1__deleteKeywordResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteKeywordResponse **p =
         (ns1__deleteKeywordResponse **)soap_id_lookup(
@@ -129594,7 +129943,7 @@ soap_in_PointerTons1__deleteKeywordResponse(struct soap *soap, const char *tag,
             sizeof(ns1__deleteKeywordResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -129602,7 +129951,7 @@ soap_in_PointerTons1__deleteKeywordResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__deleteKeywordResponse(
     struct soap *soap, ns1__deleteKeywordResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteKeywordResponse);
   if (soap_out_PointerTons1__deleteKeywordResponse(
           soap, tag ? tag : "ns1:deleteKeywordResponse", id, a, type))
@@ -129617,7 +129966,7 @@ soap_get_PointerTons1__deleteKeywordResponse(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__deleteKeywordResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -129634,7 +129983,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__deleteKeyword(struct soap *soap, const char *tag, int id,
                                      ns1__deleteKeyword *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteKeyword);
   if (id < 0)
     return soap->error;
@@ -129644,28 +129993,28 @@ soap_out_PointerTons1__deleteKeyword(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__deleteKeyword **SOAP_FMAC4
 soap_in_PointerTons1__deleteKeyword(struct soap *soap, const char *tag,
                                     ns1__deleteKeyword **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteKeyword **)soap_malloc(soap,
                                                  sizeof(ns1__deleteKeyword *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteKeyword *)soap_instantiate_ns1__deleteKeyword(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteKeyword **p = (ns1__deleteKeyword **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__deleteKeyword,
         sizeof(ns1__deleteKeyword), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -129674,7 +130023,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__deleteKeyword(struct soap *soap,
                                      ns1__deleteKeyword *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteKeyword);
   if (soap_out_PointerTons1__deleteKeyword(
           soap, tag ? tag : "ns1:deleteKeyword", id, a, type))
@@ -129687,7 +130036,7 @@ soap_get_PointerTons1__deleteKeyword(struct soap *soap, ns1__deleteKeyword **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__deleteKeyword(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -129704,7 +130053,7 @@ soap_serialize_PointerTons1__deleteInvestigatorResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__deleteInvestigatorResponse(
     struct soap *soap, const char *tag, int id,
     ns1__deleteInvestigatorResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteInvestigatorResponse);
   if (id < 0)
     return soap->error;
@@ -129715,22 +130064,22 @@ SOAP_FMAC3 ns1__deleteInvestigatorResponse **SOAP_FMAC4
 soap_in_PointerTons1__deleteInvestigatorResponse(
     struct soap *soap, const char *tag, ns1__deleteInvestigatorResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteInvestigatorResponse **)soap_malloc(
               soap, sizeof(ns1__deleteInvestigatorResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteInvestigatorResponse *)
               soap_instantiate_ns1__deleteInvestigatorResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteInvestigatorResponse **p =
         (ns1__deleteInvestigatorResponse **)soap_id_lookup(
@@ -129739,7 +130088,7 @@ soap_in_PointerTons1__deleteInvestigatorResponse(
             sizeof(ns1__deleteInvestigatorResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -129747,7 +130096,7 @@ soap_in_PointerTons1__deleteInvestigatorResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__deleteInvestigatorResponse(
     struct soap *soap, ns1__deleteInvestigatorResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteInvestigatorResponse);
   if (soap_out_PointerTons1__deleteInvestigatorResponse(
           soap, tag ? tag : "ns1:deleteInvestigatorResponse", id, a, type))
@@ -129762,7 +130111,7 @@ soap_get_PointerTons1__deleteInvestigatorResponse(
   if ((p = soap_in_PointerTons1__deleteInvestigatorResponse(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -129779,7 +130128,7 @@ soap_out_PointerTons1__deleteInvestigator(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__deleteInvestigator *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteInvestigator);
   if (id < 0)
     return soap->error;
@@ -129790,29 +130139,29 @@ SOAP_FMAC3 ns1__deleteInvestigator **SOAP_FMAC4
 soap_in_PointerTons1__deleteInvestigator(struct soap *soap, const char *tag,
                                          ns1__deleteInvestigator **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteInvestigator **)soap_malloc(
               soap, sizeof(ns1__deleteInvestigator *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteInvestigator *)
-              soap_instantiate_ns1__deleteInvestigator(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__deleteInvestigator(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteInvestigator **p = (ns1__deleteInvestigator **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__deleteInvestigator,
         sizeof(ns1__deleteInvestigator), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -129821,7 +130170,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__deleteInvestigator(struct soap *soap,
                                           ns1__deleteInvestigator *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteInvestigator);
   if (soap_out_PointerTons1__deleteInvestigator(
           soap, tag ? tag : "ns1:deleteInvestigator", id, a, type))
@@ -129835,7 +130184,7 @@ soap_get_PointerTons1__deleteInvestigator(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__deleteInvestigator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -129852,7 +130201,7 @@ soap_serialize_PointerTons1__addSampleParameterResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__addSampleParameterResponse(
     struct soap *soap, const char *tag, int id,
     ns1__addSampleParameterResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addSampleParameterResponse);
   if (id < 0)
     return soap->error;
@@ -129863,22 +130212,22 @@ SOAP_FMAC3 ns1__addSampleParameterResponse **SOAP_FMAC4
 soap_in_PointerTons1__addSampleParameterResponse(
     struct soap *soap, const char *tag, ns1__addSampleParameterResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addSampleParameterResponse **)soap_malloc(
               soap, sizeof(ns1__addSampleParameterResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addSampleParameterResponse *)
               soap_instantiate_ns1__addSampleParameterResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addSampleParameterResponse **p =
         (ns1__addSampleParameterResponse **)soap_id_lookup(
@@ -129887,7 +130236,7 @@ soap_in_PointerTons1__addSampleParameterResponse(
             sizeof(ns1__addSampleParameterResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -129895,7 +130244,7 @@ soap_in_PointerTons1__addSampleParameterResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__addSampleParameterResponse(
     struct soap *soap, ns1__addSampleParameterResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addSampleParameterResponse);
   if (soap_out_PointerTons1__addSampleParameterResponse(
           soap, tag ? tag : "ns1:addSampleParameterResponse", id, a, type))
@@ -129910,7 +130259,7 @@ soap_get_PointerTons1__addSampleParameterResponse(
   if ((p = soap_in_PointerTons1__addSampleParameterResponse(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -129927,7 +130276,7 @@ soap_out_PointerTons1__addSampleParameter(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__addSampleParameter *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addSampleParameter);
   if (id < 0)
     return soap->error;
@@ -129938,29 +130287,29 @@ SOAP_FMAC3 ns1__addSampleParameter **SOAP_FMAC4
 soap_in_PointerTons1__addSampleParameter(struct soap *soap, const char *tag,
                                          ns1__addSampleParameter **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addSampleParameter **)soap_malloc(
               soap, sizeof(ns1__addSampleParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addSampleParameter *)
-              soap_instantiate_ns1__addSampleParameter(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__addSampleParameter(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addSampleParameter **p = (ns1__addSampleParameter **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__addSampleParameter,
         sizeof(ns1__addSampleParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -129969,7 +130318,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__addSampleParameter(struct soap *soap,
                                           ns1__addSampleParameter *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addSampleParameter);
   if (soap_out_PointerTons1__addSampleParameter(
           soap, tag ? tag : "ns1:addSampleParameter", id, a, type))
@@ -129983,7 +130332,7 @@ soap_get_PointerTons1__addSampleParameter(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__addSampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -129998,7 +130347,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__addPublicationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__addPublicationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__addPublicationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addPublicationResponse);
   if (id < 0)
     return soap->error;
@@ -130009,22 +130358,22 @@ SOAP_FMAC3 ns1__addPublicationResponse **SOAP_FMAC4
 soap_in_PointerTons1__addPublicationResponse(struct soap *soap, const char *tag,
                                              ns1__addPublicationResponse **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addPublicationResponse **)soap_malloc(
               soap, sizeof(ns1__addPublicationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addPublicationResponse *)
               soap_instantiate_ns1__addPublicationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addPublicationResponse **p =
         (ns1__addPublicationResponse **)soap_id_lookup(
@@ -130033,7 +130382,7 @@ soap_in_PointerTons1__addPublicationResponse(struct soap *soap, const char *tag,
             sizeof(ns1__addPublicationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -130041,7 +130390,7 @@ soap_in_PointerTons1__addPublicationResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__addPublicationResponse(
     struct soap *soap, ns1__addPublicationResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addPublicationResponse);
   if (soap_out_PointerTons1__addPublicationResponse(
           soap, tag ? tag : "ns1:addPublicationResponse", id, a, type))
@@ -130056,7 +130405,7 @@ soap_get_PointerTons1__addPublicationResponse(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__addPublicationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -130073,7 +130422,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__addPublication(struct soap *soap, const char *tag,
                                       int id, ns1__addPublication *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addPublication);
   if (id < 0)
     return soap->error;
@@ -130084,28 +130433,28 @@ SOAP_FMAC3 ns1__addPublication **SOAP_FMAC4
 soap_in_PointerTons1__addPublication(struct soap *soap, const char *tag,
                                      ns1__addPublication **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addPublication **)soap_malloc(
               soap, sizeof(ns1__addPublication *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addPublication *)soap_instantiate_ns1__addPublication(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addPublication **p = (ns1__addPublication **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__addPublication,
         sizeof(ns1__addPublication), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -130114,7 +130463,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__addPublication(struct soap *soap,
                                       ns1__addPublication *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addPublication);
   if (soap_out_PointerTons1__addPublication(
           soap, tag ? tag : "ns1:addPublication", id, a, type))
@@ -130128,7 +130477,7 @@ soap_get_PointerTons1__addPublication(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__addPublication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -130145,7 +130494,7 @@ soap_out_PointerTons1__addSampleResponse(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__addSampleResponse *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addSampleResponse);
   if (id < 0)
     return soap->error;
@@ -130156,29 +130505,29 @@ SOAP_FMAC3 ns1__addSampleResponse **SOAP_FMAC4
 soap_in_PointerTons1__addSampleResponse(struct soap *soap, const char *tag,
                                         ns1__addSampleResponse **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addSampleResponse **)soap_malloc(
               soap, sizeof(ns1__addSampleResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__addSampleResponse *)soap_instantiate_ns1__addSampleResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addSampleResponse **p = (ns1__addSampleResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__addSampleResponse,
         sizeof(ns1__addSampleResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -130187,7 +130536,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__addSampleResponse(struct soap *soap,
                                          ns1__addSampleResponse *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addSampleResponse);
   if (soap_out_PointerTons1__addSampleResponse(
           soap, tag ? tag : "ns1:addSampleResponse", id, a, type))
@@ -130201,7 +130550,7 @@ soap_get_PointerTons1__addSampleResponse(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__addSampleResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -130217,7 +130566,7 @@ soap_serialize_PointerTons1__addSample(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__addSample(struct soap *soap, const char *tag, int id,
                                  ns1__addSample *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addSample);
   if (id < 0)
     return soap->error;
@@ -130227,27 +130576,27 @@ soap_out_PointerTons1__addSample(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__addSample **SOAP_FMAC4
 soap_in_PointerTons1__addSample(struct soap *soap, const char *tag,
                                 ns1__addSample **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addSample **)soap_malloc(soap, sizeof(ns1__addSample *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addSample *)soap_instantiate_ns1__addSample(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addSample **p = (ns1__addSample **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__addSample,
         sizeof(ns1__addSample), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -130255,7 +130604,7 @@ soap_in_PointerTons1__addSample(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__addSample(struct soap *soap, ns1__addSample *const *a,
                                  const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addSample);
   if (soap_out_PointerTons1__addSample(soap, tag ? tag : "ns1:addSample", id, a,
                                        type))
@@ -130268,7 +130617,7 @@ soap_get_PointerTons1__addSample(struct soap *soap, ns1__addSample **p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__addSample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -130283,7 +130632,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__addInvestigatorResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__addInvestigatorResponse(
     struct soap *soap, const char *tag, int id,
     ns1__addInvestigatorResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addInvestigatorResponse);
   if (id < 0)
     return soap->error;
@@ -130295,22 +130644,22 @@ soap_in_PointerTons1__addInvestigatorResponse(struct soap *soap,
                                               const char *tag,
                                               ns1__addInvestigatorResponse **a,
                                               const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addInvestigatorResponse **)soap_malloc(
               soap, sizeof(ns1__addInvestigatorResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addInvestigatorResponse *)
               soap_instantiate_ns1__addInvestigatorResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addInvestigatorResponse **p =
         (ns1__addInvestigatorResponse **)soap_id_lookup(
@@ -130319,7 +130668,7 @@ soap_in_PointerTons1__addInvestigatorResponse(struct soap *soap,
             sizeof(ns1__addInvestigatorResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -130327,7 +130676,7 @@ soap_in_PointerTons1__addInvestigatorResponse(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__addInvestigatorResponse(
     struct soap *soap, ns1__addInvestigatorResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addInvestigatorResponse);
   if (soap_out_PointerTons1__addInvestigatorResponse(
           soap, tag ? tag : "ns1:addInvestigatorResponse", id, a, type))
@@ -130342,7 +130691,7 @@ soap_get_PointerTons1__addInvestigatorResponse(struct soap *soap,
                                                const char *type) {
   if ((p = soap_in_PointerTons1__addInvestigatorResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -130359,7 +130708,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__addInvestigator(struct soap *soap, const char *tag,
                                        int id, ns1__addInvestigator *const *a,
                                        const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addInvestigator);
   if (id < 0)
     return soap->error;
@@ -130370,28 +130719,28 @@ SOAP_FMAC3 ns1__addInvestigator **SOAP_FMAC4
 soap_in_PointerTons1__addInvestigator(struct soap *soap, const char *tag,
                                       ns1__addInvestigator **a,
                                       const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addInvestigator **)soap_malloc(
               soap, sizeof(ns1__addInvestigator *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addInvestigator *)soap_instantiate_ns1__addInvestigator(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addInvestigator **p = (ns1__addInvestigator **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__addInvestigator,
         sizeof(ns1__addInvestigator), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -130400,7 +130749,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__addInvestigator(struct soap *soap,
                                        ns1__addInvestigator *const *a,
                                        const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addInvestigator);
   if (soap_out_PointerTons1__addInvestigator(
           soap, tag ? tag : "ns1:addInvestigator", id, a, type))
@@ -130414,7 +130763,7 @@ soap_get_PointerTons1__addInvestigator(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__addInvestigator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -130431,7 +130780,7 @@ soap_out_PointerTons1__addKeywordResponse(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__addKeywordResponse *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addKeywordResponse);
   if (id < 0)
     return soap->error;
@@ -130442,29 +130791,29 @@ SOAP_FMAC3 ns1__addKeywordResponse **SOAP_FMAC4
 soap_in_PointerTons1__addKeywordResponse(struct soap *soap, const char *tag,
                                          ns1__addKeywordResponse **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addKeywordResponse **)soap_malloc(
               soap, sizeof(ns1__addKeywordResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addKeywordResponse *)
-              soap_instantiate_ns1__addKeywordResponse(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__addKeywordResponse(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addKeywordResponse **p = (ns1__addKeywordResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__addKeywordResponse,
         sizeof(ns1__addKeywordResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -130473,7 +130822,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__addKeywordResponse(struct soap *soap,
                                           ns1__addKeywordResponse *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addKeywordResponse);
   if (soap_out_PointerTons1__addKeywordResponse(
           soap, tag ? tag : "ns1:addKeywordResponse", id, a, type))
@@ -130487,7 +130836,7 @@ soap_get_PointerTons1__addKeywordResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__addKeywordResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -130503,7 +130852,7 @@ soap_serialize_PointerTons1__addKeyword(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__addKeyword(struct soap *soap, const char *tag, int id,
                                   ns1__addKeyword *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__addKeyword);
   if (id < 0)
     return soap->error;
@@ -130513,27 +130862,27 @@ soap_out_PointerTons1__addKeyword(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__addKeyword **SOAP_FMAC4
 soap_in_PointerTons1__addKeyword(struct soap *soap, const char *tag,
                                  ns1__addKeyword **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__addKeyword **)soap_malloc(soap, sizeof(ns1__addKeyword *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__addKeyword *)soap_instantiate_ns1__addKeyword(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__addKeyword **p = (ns1__addKeyword **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__addKeyword,
         sizeof(ns1__addKeyword), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -130541,7 +130890,7 @@ soap_in_PointerTons1__addKeyword(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__addKeyword(struct soap *soap, ns1__addKeyword *const *a,
                                   const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__addKeyword);
   if (soap_out_PointerTons1__addKeyword(soap, tag ? tag : "ns1:addKeyword", id,
                                         a, type))
@@ -130554,7 +130903,7 @@ soap_get_PointerTons1__addKeyword(struct soap *soap, ns1__addKeyword **p,
                                   const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__addKeyword(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -130571,7 +130920,7 @@ soap_serialize_PointerTons1__removeInvestigationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__removeInvestigationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__removeInvestigationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeInvestigationResponse);
   if (id < 0)
     return soap->error;
@@ -130582,22 +130931,22 @@ SOAP_FMAC3 ns1__removeInvestigationResponse **SOAP_FMAC4
 soap_in_PointerTons1__removeInvestigationResponse(
     struct soap *soap, const char *tag, ns1__removeInvestigationResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeInvestigationResponse **)soap_malloc(
               soap, sizeof(ns1__removeInvestigationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeInvestigationResponse *)
               soap_instantiate_ns1__removeInvestigationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeInvestigationResponse **p =
         (ns1__removeInvestigationResponse **)soap_id_lookup(
@@ -130606,7 +130955,7 @@ soap_in_PointerTons1__removeInvestigationResponse(
             sizeof(ns1__removeInvestigationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -130615,7 +130964,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__removeInvestigationResponse(
     struct soap *soap, ns1__removeInvestigationResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__removeInvestigationResponse);
   if (soap_out_PointerTons1__removeInvestigationResponse(
           soap, tag ? tag : "ns1:removeInvestigationResponse", id, a, type))
@@ -130630,7 +130979,7 @@ soap_get_PointerTons1__removeInvestigationResponse(
   if ((p = soap_in_PointerTons1__removeInvestigationResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -130647,7 +130996,7 @@ soap_out_PointerTons1__removeInvestigation(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__removeInvestigation *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__removeInvestigation);
   if (id < 0)
     return soap->error;
@@ -130658,29 +131007,29 @@ SOAP_FMAC3 ns1__removeInvestigation **SOAP_FMAC4
 soap_in_PointerTons1__removeInvestigation(struct soap *soap, const char *tag,
                                           ns1__removeInvestigation **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__removeInvestigation **)soap_malloc(
               soap, sizeof(ns1__removeInvestigation *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__removeInvestigation *)
-              soap_instantiate_ns1__removeInvestigation(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__removeInvestigation(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__removeInvestigation **p = (ns1__removeInvestigation **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__removeInvestigation,
         sizeof(ns1__removeInvestigation), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -130689,7 +131038,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__removeInvestigation(struct soap *soap,
                                            ns1__removeInvestigation *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__removeInvestigation);
   if (soap_out_PointerTons1__removeInvestigation(
           soap, tag ? tag : "ns1:removeInvestigation", id, a, type))
@@ -130703,7 +131052,7 @@ soap_get_PointerTons1__removeInvestigation(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__removeInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -130720,7 +131069,7 @@ soap_serialize_PointerTons1__deleteInvestigationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__deleteInvestigationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__deleteInvestigationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteInvestigationResponse);
   if (id < 0)
     return soap->error;
@@ -130731,22 +131080,22 @@ SOAP_FMAC3 ns1__deleteInvestigationResponse **SOAP_FMAC4
 soap_in_PointerTons1__deleteInvestigationResponse(
     struct soap *soap, const char *tag, ns1__deleteInvestigationResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteInvestigationResponse **)soap_malloc(
               soap, sizeof(ns1__deleteInvestigationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteInvestigationResponse *)
               soap_instantiate_ns1__deleteInvestigationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteInvestigationResponse **p =
         (ns1__deleteInvestigationResponse **)soap_id_lookup(
@@ -130755,7 +131104,7 @@ soap_in_PointerTons1__deleteInvestigationResponse(
             sizeof(ns1__deleteInvestigationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -130764,7 +131113,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__deleteInvestigationResponse(
     struct soap *soap, ns1__deleteInvestigationResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__deleteInvestigationResponse);
   if (soap_out_PointerTons1__deleteInvestigationResponse(
           soap, tag ? tag : "ns1:deleteInvestigationResponse", id, a, type))
@@ -130779,7 +131128,7 @@ soap_get_PointerTons1__deleteInvestigationResponse(
   if ((p = soap_in_PointerTons1__deleteInvestigationResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -130796,7 +131145,7 @@ soap_out_PointerTons1__deleteInvestigation(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__deleteInvestigation *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__deleteInvestigation);
   if (id < 0)
     return soap->error;
@@ -130807,29 +131156,29 @@ SOAP_FMAC3 ns1__deleteInvestigation **SOAP_FMAC4
 soap_in_PointerTons1__deleteInvestigation(struct soap *soap, const char *tag,
                                           ns1__deleteInvestigation **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteInvestigation **)soap_malloc(
               soap, sizeof(ns1__deleteInvestigation *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteInvestigation *)
-              soap_instantiate_ns1__deleteInvestigation(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__deleteInvestigation(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteInvestigation **p = (ns1__deleteInvestigation **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__deleteInvestigation,
         sizeof(ns1__deleteInvestigation), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -130838,7 +131187,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__deleteInvestigation(struct soap *soap,
                                            ns1__deleteInvestigation *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__deleteInvestigation);
   if (soap_out_PointerTons1__deleteInvestigation(
           soap, tag ? tag : "ns1:deleteInvestigation", id, a, type))
@@ -130852,7 +131201,7 @@ soap_get_PointerTons1__deleteInvestigation(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__deleteInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -130869,7 +131218,7 @@ soap_serialize_PointerTons1__createInvestigationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__createInvestigationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__createInvestigationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__createInvestigationResponse);
   if (id < 0)
     return soap->error;
@@ -130880,22 +131229,22 @@ SOAP_FMAC3 ns1__createInvestigationResponse **SOAP_FMAC4
 soap_in_PointerTons1__createInvestigationResponse(
     struct soap *soap, const char *tag, ns1__createInvestigationResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__createInvestigationResponse **)soap_malloc(
               soap, sizeof(ns1__createInvestigationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__createInvestigationResponse *)
               soap_instantiate_ns1__createInvestigationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__createInvestigationResponse **p =
         (ns1__createInvestigationResponse **)soap_id_lookup(
@@ -130904,7 +131253,7 @@ soap_in_PointerTons1__createInvestigationResponse(
             sizeof(ns1__createInvestigationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -130913,7 +131262,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__createInvestigationResponse(
     struct soap *soap, ns1__createInvestigationResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__createInvestigationResponse);
   if (soap_out_PointerTons1__createInvestigationResponse(
           soap, tag ? tag : "ns1:createInvestigationResponse", id, a, type))
@@ -130928,7 +131277,7 @@ soap_get_PointerTons1__createInvestigationResponse(
   if ((p = soap_in_PointerTons1__createInvestigationResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -130945,7 +131294,7 @@ soap_out_PointerTons1__createInvestigation(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__createInvestigation *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__createInvestigation);
   if (id < 0)
     return soap->error;
@@ -130956,29 +131305,29 @@ SOAP_FMAC3 ns1__createInvestigation **SOAP_FMAC4
 soap_in_PointerTons1__createInvestigation(struct soap *soap, const char *tag,
                                           ns1__createInvestigation **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__createInvestigation **)soap_malloc(
               soap, sizeof(ns1__createInvestigation *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__createInvestigation *)
-              soap_instantiate_ns1__createInvestigation(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__createInvestigation(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__createInvestigation **p = (ns1__createInvestigation **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__createInvestigation,
         sizeof(ns1__createInvestigation), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -130987,7 +131336,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__createInvestigation(struct soap *soap,
                                            ns1__createInvestigation *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__createInvestigation);
   if (soap_out_PointerTons1__createInvestigation(
           soap, tag ? tag : "ns1:createInvestigation", id, a, type))
@@ -131001,7 +131350,7 @@ soap_get_PointerTons1__createInvestigation(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__createInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -131019,7 +131368,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getInvestigationsIncludesResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getInvestigationsIncludesResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getInvestigationsIncludesResponse);
   if (id < 0)
     return soap->error;
@@ -131030,22 +131379,22 @@ SOAP_FMAC3 ns1__getInvestigationsIncludesResponse **SOAP_FMAC4
 soap_in_PointerTons1__getInvestigationsIncludesResponse(
     struct soap *soap, const char *tag,
     ns1__getInvestigationsIncludesResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getInvestigationsIncludesResponse **)soap_malloc(
               soap, sizeof(ns1__getInvestigationsIncludesResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getInvestigationsIncludesResponse *)
               soap_instantiate_ns1__getInvestigationsIncludesResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getInvestigationsIncludesResponse **p =
         (ns1__getInvestigationsIncludesResponse **)soap_id_lookup(
@@ -131054,7 +131403,7 @@ soap_in_PointerTons1__getInvestigationsIncludesResponse(
             sizeof(ns1__getInvestigationsIncludesResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -131064,7 +131413,7 @@ soap_put_PointerTons1__getInvestigationsIncludesResponse(
     struct soap *soap, ns1__getInvestigationsIncludesResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__getInvestigationsIncludesResponse);
   if (soap_out_PointerTons1__getInvestigationsIncludesResponse(
           soap, tag ? tag : "ns1:getInvestigationsIncludesResponse", id, a,
@@ -131080,7 +131429,7 @@ soap_get_PointerTons1__getInvestigationsIncludesResponse(
   if ((p = soap_in_PointerTons1__getInvestigationsIncludesResponse(soap, tag, p,
                                                                    type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -131096,7 +131445,7 @@ soap_serialize_PointerTons1__getInvestigationsIncludes(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getInvestigationsIncludes(
     struct soap *soap, const char *tag, int id,
     ns1__getInvestigationsIncludes *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getInvestigationsIncludes);
   if (id < 0)
     return soap->error;
@@ -131107,22 +131456,22 @@ SOAP_FMAC3 ns1__getInvestigationsIncludes **SOAP_FMAC4
 soap_in_PointerTons1__getInvestigationsIncludes(
     struct soap *soap, const char *tag, ns1__getInvestigationsIncludes **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getInvestigationsIncludes **)soap_malloc(
               soap, sizeof(ns1__getInvestigationsIncludes *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getInvestigationsIncludes *)
               soap_instantiate_ns1__getInvestigationsIncludes(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getInvestigationsIncludes **p =
         (ns1__getInvestigationsIncludes **)soap_id_lookup(
@@ -131131,7 +131480,7 @@ soap_in_PointerTons1__getInvestigationsIncludes(
             sizeof(ns1__getInvestigationsIncludes), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -131139,7 +131488,7 @@ soap_in_PointerTons1__getInvestigationsIncludes(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getInvestigationsIncludes(
     struct soap *soap, ns1__getInvestigationsIncludes *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getInvestigationsIncludes);
   if (soap_out_PointerTons1__getInvestigationsIncludes(
           soap, tag ? tag : "ns1:getInvestigationsIncludes", id, a, type))
@@ -131153,7 +131502,7 @@ soap_get_PointerTons1__getInvestigationsIncludes(
     const char *type) {
   if ((p = soap_in_PointerTons1__getInvestigationsIncludes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -131169,7 +131518,7 @@ soap_serialize_PointerTons1__getInvestigationsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getInvestigationsResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getInvestigationsResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getInvestigationsResponse);
   if (id < 0)
     return soap->error;
@@ -131180,22 +131529,22 @@ SOAP_FMAC3 ns1__getInvestigationsResponse **SOAP_FMAC4
 soap_in_PointerTons1__getInvestigationsResponse(
     struct soap *soap, const char *tag, ns1__getInvestigationsResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getInvestigationsResponse **)soap_malloc(
               soap, sizeof(ns1__getInvestigationsResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getInvestigationsResponse *)
               soap_instantiate_ns1__getInvestigationsResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getInvestigationsResponse **p =
         (ns1__getInvestigationsResponse **)soap_id_lookup(
@@ -131204,7 +131553,7 @@ soap_in_PointerTons1__getInvestigationsResponse(
             sizeof(ns1__getInvestigationsResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -131212,7 +131561,7 @@ soap_in_PointerTons1__getInvestigationsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getInvestigationsResponse(
     struct soap *soap, ns1__getInvestigationsResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getInvestigationsResponse);
   if (soap_out_PointerTons1__getInvestigationsResponse(
           soap, tag ? tag : "ns1:getInvestigationsResponse", id, a, type))
@@ -131226,7 +131575,7 @@ soap_get_PointerTons1__getInvestigationsResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__getInvestigationsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -131243,7 +131592,7 @@ soap_out_PointerTons1__getInvestigations(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__getInvestigations *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getInvestigations);
   if (id < 0)
     return soap->error;
@@ -131254,29 +131603,29 @@ SOAP_FMAC3 ns1__getInvestigations **SOAP_FMAC4
 soap_in_PointerTons1__getInvestigations(struct soap *soap, const char *tag,
                                         ns1__getInvestigations **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getInvestigations **)soap_malloc(
               soap, sizeof(ns1__getInvestigations *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__getInvestigations *)soap_instantiate_ns1__getInvestigations(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getInvestigations **p = (ns1__getInvestigations **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getInvestigations,
         sizeof(ns1__getInvestigations), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -131285,7 +131634,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getInvestigations(struct soap *soap,
                                          ns1__getInvestigations *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getInvestigations);
   if (soap_out_PointerTons1__getInvestigations(
           soap, tag ? tag : "ns1:getInvestigations", id, a, type))
@@ -131299,7 +131648,7 @@ soap_get_PointerTons1__getInvestigations(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getInvestigations(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -131317,7 +131666,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getInvestigationIncludesResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getInvestigationIncludesResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getInvestigationIncludesResponse);
   if (id < 0)
     return soap->error;
@@ -131328,22 +131677,22 @@ SOAP_FMAC3 ns1__getInvestigationIncludesResponse **SOAP_FMAC4
 soap_in_PointerTons1__getInvestigationIncludesResponse(
     struct soap *soap, const char *tag,
     ns1__getInvestigationIncludesResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getInvestigationIncludesResponse **)soap_malloc(
               soap, sizeof(ns1__getInvestigationIncludesResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getInvestigationIncludesResponse *)
               soap_instantiate_ns1__getInvestigationIncludesResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getInvestigationIncludesResponse **p =
         (ns1__getInvestigationIncludesResponse **)soap_id_lookup(
@@ -131352,7 +131701,7 @@ soap_in_PointerTons1__getInvestigationIncludesResponse(
             sizeof(ns1__getInvestigationIncludesResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -131362,7 +131711,7 @@ soap_put_PointerTons1__getInvestigationIncludesResponse(
     struct soap *soap, ns1__getInvestigationIncludesResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__getInvestigationIncludesResponse);
   if (soap_out_PointerTons1__getInvestigationIncludesResponse(
           soap, tag ? tag : "ns1:getInvestigationIncludesResponse", id, a,
@@ -131378,7 +131727,7 @@ soap_get_PointerTons1__getInvestigationIncludesResponse(
   if ((p = soap_in_PointerTons1__getInvestigationIncludesResponse(soap, tag, p,
                                                                   type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -131394,7 +131743,7 @@ soap_serialize_PointerTons1__getInvestigationIncludes(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getInvestigationIncludes(
     struct soap *soap, const char *tag, int id,
     ns1__getInvestigationIncludes *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getInvestigationIncludes);
   if (id < 0)
     return soap->error;
@@ -131405,22 +131754,22 @@ SOAP_FMAC3 ns1__getInvestigationIncludes **SOAP_FMAC4
 soap_in_PointerTons1__getInvestigationIncludes(
     struct soap *soap, const char *tag, ns1__getInvestigationIncludes **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getInvestigationIncludes **)soap_malloc(
               soap, sizeof(ns1__getInvestigationIncludes *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getInvestigationIncludes *)
               soap_instantiate_ns1__getInvestigationIncludes(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getInvestigationIncludes **p =
         (ns1__getInvestigationIncludes **)soap_id_lookup(
@@ -131429,7 +131778,7 @@ soap_in_PointerTons1__getInvestigationIncludes(
             sizeof(ns1__getInvestigationIncludes), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -131437,7 +131786,7 @@ soap_in_PointerTons1__getInvestigationIncludes(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getInvestigationIncludes(
     struct soap *soap, ns1__getInvestigationIncludes *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getInvestigationIncludes);
   if (soap_out_PointerTons1__getInvestigationIncludes(
           soap, tag ? tag : "ns1:getInvestigationIncludes", id, a, type))
@@ -131451,7 +131800,7 @@ soap_get_PointerTons1__getInvestigationIncludes(
     const char *type) {
   if ((p = soap_in_PointerTons1__getInvestigationIncludes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -131467,7 +131816,7 @@ soap_serialize_PointerTons1__getInvestigationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getInvestigationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getInvestigationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getInvestigationResponse);
   if (id < 0)
     return soap->error;
@@ -131478,22 +131827,22 @@ SOAP_FMAC3 ns1__getInvestigationResponse **SOAP_FMAC4
 soap_in_PointerTons1__getInvestigationResponse(
     struct soap *soap, const char *tag, ns1__getInvestigationResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getInvestigationResponse **)soap_malloc(
               soap, sizeof(ns1__getInvestigationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getInvestigationResponse *)
               soap_instantiate_ns1__getInvestigationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getInvestigationResponse **p =
         (ns1__getInvestigationResponse **)soap_id_lookup(
@@ -131502,7 +131851,7 @@ soap_in_PointerTons1__getInvestigationResponse(
             sizeof(ns1__getInvestigationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -131510,7 +131859,7 @@ soap_in_PointerTons1__getInvestigationResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getInvestigationResponse(
     struct soap *soap, ns1__getInvestigationResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getInvestigationResponse);
   if (soap_out_PointerTons1__getInvestigationResponse(
           soap, tag ? tag : "ns1:getInvestigationResponse", id, a, type))
@@ -131524,7 +131873,7 @@ soap_get_PointerTons1__getInvestigationResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__getInvestigationResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -131541,7 +131890,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getInvestigation(struct soap *soap, const char *tag,
                                         int id, ns1__getInvestigation *const *a,
                                         const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getInvestigation);
   if (id < 0)
     return soap->error;
@@ -131552,28 +131901,28 @@ SOAP_FMAC3 ns1__getInvestigation **SOAP_FMAC4
 soap_in_PointerTons1__getInvestigation(struct soap *soap, const char *tag,
                                        ns1__getInvestigation **a,
                                        const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getInvestigation **)soap_malloc(
               soap, sizeof(ns1__getInvestigation *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getInvestigation *)soap_instantiate_ns1__getInvestigation(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getInvestigation **p = (ns1__getInvestigation **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getInvestigation,
         sizeof(ns1__getInvestigation), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -131582,7 +131931,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getInvestigation(struct soap *soap,
                                         ns1__getInvestigation *const *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getInvestigation);
   if (soap_out_PointerTons1__getInvestigation(
           soap, tag ? tag : "ns1:getInvestigation", id, a, type))
@@ -131596,7 +131945,7 @@ soap_get_PointerTons1__getInvestigation(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -131613,7 +131962,7 @@ soap_serialize_PointerTons1__listDatafileFormatsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__listDatafileFormatsResponse(
     struct soap *soap, const char *tag, int id,
     ns1__listDatafileFormatsResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listDatafileFormatsResponse);
   if (id < 0)
     return soap->error;
@@ -131624,22 +131973,22 @@ SOAP_FMAC3 ns1__listDatafileFormatsResponse **SOAP_FMAC4
 soap_in_PointerTons1__listDatafileFormatsResponse(
     struct soap *soap, const char *tag, ns1__listDatafileFormatsResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listDatafileFormatsResponse **)soap_malloc(
               soap, sizeof(ns1__listDatafileFormatsResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__listDatafileFormatsResponse *)
               soap_instantiate_ns1__listDatafileFormatsResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listDatafileFormatsResponse **p =
         (ns1__listDatafileFormatsResponse **)soap_id_lookup(
@@ -131648,7 +131997,7 @@ soap_in_PointerTons1__listDatafileFormatsResponse(
             sizeof(ns1__listDatafileFormatsResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -131657,7 +132006,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__listDatafileFormatsResponse(
     struct soap *soap, ns1__listDatafileFormatsResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__listDatafileFormatsResponse);
   if (soap_out_PointerTons1__listDatafileFormatsResponse(
           soap, tag ? tag : "ns1:listDatafileFormatsResponse", id, a, type))
@@ -131672,7 +132021,7 @@ soap_get_PointerTons1__listDatafileFormatsResponse(
   if ((p = soap_in_PointerTons1__listDatafileFormatsResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -131689,7 +132038,7 @@ soap_out_PointerTons1__listDatafileFormats(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__listDatafileFormats *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listDatafileFormats);
   if (id < 0)
     return soap->error;
@@ -131700,29 +132049,29 @@ SOAP_FMAC3 ns1__listDatafileFormats **SOAP_FMAC4
 soap_in_PointerTons1__listDatafileFormats(struct soap *soap, const char *tag,
                                           ns1__listDatafileFormats **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listDatafileFormats **)soap_malloc(
               soap, sizeof(ns1__listDatafileFormats *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__listDatafileFormats *)
-              soap_instantiate_ns1__listDatafileFormats(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__listDatafileFormats(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listDatafileFormats **p = (ns1__listDatafileFormats **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__listDatafileFormats,
         sizeof(ns1__listDatafileFormats), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -131731,7 +132080,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__listDatafileFormats(struct soap *soap,
                                            ns1__listDatafileFormats *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__listDatafileFormats);
   if (soap_out_PointerTons1__listDatafileFormats(
           soap, tag ? tag : "ns1:listDatafileFormats", id, a, type))
@@ -131745,7 +132094,7 @@ soap_get_PointerTons1__listDatafileFormats(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__listDatafileFormats(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -131764,7 +132113,7 @@ soap_out_PointerTons1__searchByRunNumberPaginationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchByRunNumberPaginationResponse *const *a, const char *type) {
   id =
-      soap_element_id(soap, tag, id, *a, NULL, 0, type,
+      soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                       SOAP_TYPE_ICat3_ns1__searchByRunNumberPaginationResponse);
   if (id < 0)
     return soap->error;
@@ -131775,22 +132124,22 @@ SOAP_FMAC3 ns1__searchByRunNumberPaginationResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchByRunNumberPaginationResponse(
     struct soap *soap, const char *tag,
     ns1__searchByRunNumberPaginationResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByRunNumberPaginationResponse **)soap_malloc(
               soap, sizeof(ns1__searchByRunNumberPaginationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByRunNumberPaginationResponse *)
               soap_instantiate_ns1__searchByRunNumberPaginationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByRunNumberPaginationResponse **p =
         (ns1__searchByRunNumberPaginationResponse **)soap_id_lookup(
@@ -131799,7 +132148,7 @@ soap_in_PointerTons1__searchByRunNumberPaginationResponse(
             sizeof(ns1__searchByRunNumberPaginationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -131809,7 +132158,7 @@ soap_put_PointerTons1__searchByRunNumberPaginationResponse(
     struct soap *soap, ns1__searchByRunNumberPaginationResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchByRunNumberPaginationResponse);
   if (soap_out_PointerTons1__searchByRunNumberPaginationResponse(
           soap, tag ? tag : "ns1:searchByRunNumberPaginationResponse", id, a,
@@ -131825,7 +132174,7 @@ soap_get_PointerTons1__searchByRunNumberPaginationResponse(
   if ((p = soap_in_PointerTons1__searchByRunNumberPaginationResponse(soap, tag,
                                                                      p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -131842,7 +132191,7 @@ soap_serialize_PointerTons1__searchByRunNumberPagination(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchByRunNumberPagination(
     struct soap *soap, const char *tag, int id,
     ns1__searchByRunNumberPagination *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByRunNumberPagination);
   if (id < 0)
     return soap->error;
@@ -131853,22 +132202,22 @@ SOAP_FMAC3 ns1__searchByRunNumberPagination **SOAP_FMAC4
 soap_in_PointerTons1__searchByRunNumberPagination(
     struct soap *soap, const char *tag, ns1__searchByRunNumberPagination **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByRunNumberPagination **)soap_malloc(
               soap, sizeof(ns1__searchByRunNumberPagination *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByRunNumberPagination *)
               soap_instantiate_ns1__searchByRunNumberPagination(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByRunNumberPagination **p =
         (ns1__searchByRunNumberPagination **)soap_id_lookup(
@@ -131877,7 +132226,7 @@ soap_in_PointerTons1__searchByRunNumberPagination(
             sizeof(ns1__searchByRunNumberPagination), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -131886,7 +132235,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchByRunNumberPagination(
     struct soap *soap, ns1__searchByRunNumberPagination *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__searchByRunNumberPagination);
   if (soap_out_PointerTons1__searchByRunNumberPagination(
           soap, tag ? tag : "ns1:searchByRunNumberPagination", id, a, type))
@@ -131901,7 +132250,7 @@ soap_get_PointerTons1__searchByRunNumberPagination(
   if ((p = soap_in_PointerTons1__searchByRunNumberPagination(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -131917,7 +132266,7 @@ soap_serialize_PointerTons1__searchByRunNumberResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchByRunNumberResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchByRunNumberResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByRunNumberResponse);
   if (id < 0)
     return soap->error;
@@ -131928,22 +132277,22 @@ SOAP_FMAC3 ns1__searchByRunNumberResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchByRunNumberResponse(
     struct soap *soap, const char *tag, ns1__searchByRunNumberResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByRunNumberResponse **)soap_malloc(
               soap, sizeof(ns1__searchByRunNumberResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByRunNumberResponse *)
               soap_instantiate_ns1__searchByRunNumberResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByRunNumberResponse **p =
         (ns1__searchByRunNumberResponse **)soap_id_lookup(
@@ -131952,7 +132301,7 @@ soap_in_PointerTons1__searchByRunNumberResponse(
             sizeof(ns1__searchByRunNumberResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -131960,7 +132309,7 @@ soap_in_PointerTons1__searchByRunNumberResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchByRunNumberResponse(
     struct soap *soap, ns1__searchByRunNumberResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchByRunNumberResponse);
   if (soap_out_PointerTons1__searchByRunNumberResponse(
           soap, tag ? tag : "ns1:searchByRunNumberResponse", id, a, type))
@@ -131974,7 +132323,7 @@ soap_get_PointerTons1__searchByRunNumberResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__searchByRunNumberResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -131991,7 +132340,7 @@ soap_out_PointerTons1__searchByRunNumber(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__searchByRunNumber *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByRunNumber);
   if (id < 0)
     return soap->error;
@@ -132002,29 +132351,29 @@ SOAP_FMAC3 ns1__searchByRunNumber **SOAP_FMAC4
 soap_in_PointerTons1__searchByRunNumber(struct soap *soap, const char *tag,
                                         ns1__searchByRunNumber **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByRunNumber **)soap_malloc(
               soap, sizeof(ns1__searchByRunNumber *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__searchByRunNumber *)soap_instantiate_ns1__searchByRunNumber(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByRunNumber **p = (ns1__searchByRunNumber **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__searchByRunNumber,
         sizeof(ns1__searchByRunNumber), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -132033,7 +132382,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__searchByRunNumber(struct soap *soap,
                                          ns1__searchByRunNumber *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchByRunNumber);
   if (soap_out_PointerTons1__searchByRunNumber(
           soap, tag ? tag : "ns1:searchByRunNumber", id, a, type))
@@ -132047,7 +132396,7 @@ soap_get_PointerTons1__searchByRunNumber(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__searchByRunNumber(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -132063,7 +132412,7 @@ soap_serialize_PointerTons1__listDatasetStatusResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__listDatasetStatusResponse(
     struct soap *soap, const char *tag, int id,
     ns1__listDatasetStatusResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listDatasetStatusResponse);
   if (id < 0)
     return soap->error;
@@ -132074,22 +132423,22 @@ SOAP_FMAC3 ns1__listDatasetStatusResponse **SOAP_FMAC4
 soap_in_PointerTons1__listDatasetStatusResponse(
     struct soap *soap, const char *tag, ns1__listDatasetStatusResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listDatasetStatusResponse **)soap_malloc(
               soap, sizeof(ns1__listDatasetStatusResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__listDatasetStatusResponse *)
               soap_instantiate_ns1__listDatasetStatusResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listDatasetStatusResponse **p =
         (ns1__listDatasetStatusResponse **)soap_id_lookup(
@@ -132098,7 +132447,7 @@ soap_in_PointerTons1__listDatasetStatusResponse(
             sizeof(ns1__listDatasetStatusResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -132106,7 +132455,7 @@ soap_in_PointerTons1__listDatasetStatusResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__listDatasetStatusResponse(
     struct soap *soap, ns1__listDatasetStatusResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__listDatasetStatusResponse);
   if (soap_out_PointerTons1__listDatasetStatusResponse(
           soap, tag ? tag : "ns1:listDatasetStatusResponse", id, a, type))
@@ -132120,7 +132469,7 @@ soap_get_PointerTons1__listDatasetStatusResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__listDatasetStatusResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -132137,7 +132486,7 @@ soap_out_PointerTons1__listDatasetStatus(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__listDatasetStatus *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listDatasetStatus);
   if (id < 0)
     return soap->error;
@@ -132148,29 +132497,29 @@ SOAP_FMAC3 ns1__listDatasetStatus **SOAP_FMAC4
 soap_in_PointerTons1__listDatasetStatus(struct soap *soap, const char *tag,
                                         ns1__listDatasetStatus **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listDatasetStatus **)soap_malloc(
               soap, sizeof(ns1__listDatasetStatus *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__listDatasetStatus *)soap_instantiate_ns1__listDatasetStatus(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listDatasetStatus **p = (ns1__listDatasetStatus **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__listDatasetStatus,
         sizeof(ns1__listDatasetStatus), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -132179,7 +132528,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__listDatasetStatus(struct soap *soap,
                                          ns1__listDatasetStatus *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__listDatasetStatus);
   if (soap_out_PointerTons1__listDatasetStatus(
           soap, tag ? tag : "ns1:listDatasetStatus", id, a, type))
@@ -132193,7 +132542,7 @@ soap_get_PointerTons1__listDatasetStatus(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__listDatasetStatus(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -132209,7 +132558,7 @@ soap_serialize_PointerTons1__listDatasetTypesResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__listDatasetTypesResponse(
     struct soap *soap, const char *tag, int id,
     ns1__listDatasetTypesResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listDatasetTypesResponse);
   if (id < 0)
     return soap->error;
@@ -132220,22 +132569,22 @@ SOAP_FMAC3 ns1__listDatasetTypesResponse **SOAP_FMAC4
 soap_in_PointerTons1__listDatasetTypesResponse(
     struct soap *soap, const char *tag, ns1__listDatasetTypesResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listDatasetTypesResponse **)soap_malloc(
               soap, sizeof(ns1__listDatasetTypesResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__listDatasetTypesResponse *)
               soap_instantiate_ns1__listDatasetTypesResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listDatasetTypesResponse **p =
         (ns1__listDatasetTypesResponse **)soap_id_lookup(
@@ -132244,7 +132593,7 @@ soap_in_PointerTons1__listDatasetTypesResponse(
             sizeof(ns1__listDatasetTypesResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -132252,7 +132601,7 @@ soap_in_PointerTons1__listDatasetTypesResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__listDatasetTypesResponse(
     struct soap *soap, ns1__listDatasetTypesResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__listDatasetTypesResponse);
   if (soap_out_PointerTons1__listDatasetTypesResponse(
           soap, tag ? tag : "ns1:listDatasetTypesResponse", id, a, type))
@@ -132266,7 +132615,7 @@ soap_get_PointerTons1__listDatasetTypesResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__listDatasetTypesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -132283,7 +132632,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__listDatasetTypes(struct soap *soap, const char *tag,
                                         int id, ns1__listDatasetTypes *const *a,
                                         const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listDatasetTypes);
   if (id < 0)
     return soap->error;
@@ -132294,28 +132643,28 @@ SOAP_FMAC3 ns1__listDatasetTypes **SOAP_FMAC4
 soap_in_PointerTons1__listDatasetTypes(struct soap *soap, const char *tag,
                                        ns1__listDatasetTypes **a,
                                        const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listDatasetTypes **)soap_malloc(
               soap, sizeof(ns1__listDatasetTypes *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__listDatasetTypes *)soap_instantiate_ns1__listDatasetTypes(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listDatasetTypes **p = (ns1__listDatasetTypes **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__listDatasetTypes,
         sizeof(ns1__listDatasetTypes), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -132324,7 +132673,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__listDatasetTypes(struct soap *soap,
                                         ns1__listDatasetTypes *const *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__listDatasetTypes);
   if (soap_out_PointerTons1__listDatasetTypes(
           soap, tag ? tag : "ns1:listDatasetTypes", id, a, type))
@@ -132338,7 +132687,7 @@ soap_get_PointerTons1__listDatasetTypes(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__listDatasetTypes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -132355,7 +132704,7 @@ soap_serialize_PointerTons1__searchDatasetsBySampleResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchDatasetsBySampleResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatasetsBySampleResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatasetsBySampleResponse);
   if (id < 0)
     return soap->error;
@@ -132366,22 +132715,22 @@ SOAP_FMAC3 ns1__searchDatasetsBySampleResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetsBySampleResponse(
     struct soap *soap, const char *tag, ns1__searchDatasetsBySampleResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetsBySampleResponse **)soap_malloc(
               soap, sizeof(ns1__searchDatasetsBySampleResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetsBySampleResponse *)
               soap_instantiate_ns1__searchDatasetsBySampleResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetsBySampleResponse **p =
         (ns1__searchDatasetsBySampleResponse **)soap_id_lookup(
@@ -132390,7 +132739,7 @@ soap_in_PointerTons1__searchDatasetsBySampleResponse(
             sizeof(ns1__searchDatasetsBySampleResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -132399,7 +132748,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchDatasetsBySampleResponse(
     struct soap *soap, ns1__searchDatasetsBySampleResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__searchDatasetsBySampleResponse);
   if (soap_out_PointerTons1__searchDatasetsBySampleResponse(
           soap, tag ? tag : "ns1:searchDatasetsBySampleResponse", id, a, type))
@@ -132414,7 +132763,7 @@ soap_get_PointerTons1__searchDatasetsBySampleResponse(
   if ((p = soap_in_PointerTons1__searchDatasetsBySampleResponse(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -132429,7 +132778,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__searchDatasetsBySample(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchDatasetsBySample(
     struct soap *soap, const char *tag, int id,
     ns1__searchDatasetsBySample *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchDatasetsBySample);
   if (id < 0)
     return soap->error;
@@ -132440,22 +132789,22 @@ SOAP_FMAC3 ns1__searchDatasetsBySample **SOAP_FMAC4
 soap_in_PointerTons1__searchDatasetsBySample(struct soap *soap, const char *tag,
                                              ns1__searchDatasetsBySample **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchDatasetsBySample **)soap_malloc(
               soap, sizeof(ns1__searchDatasetsBySample *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchDatasetsBySample *)
               soap_instantiate_ns1__searchDatasetsBySample(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchDatasetsBySample **p =
         (ns1__searchDatasetsBySample **)soap_id_lookup(
@@ -132464,7 +132813,7 @@ soap_in_PointerTons1__searchDatasetsBySample(struct soap *soap, const char *tag,
             sizeof(ns1__searchDatasetsBySample), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -132472,7 +132821,7 @@ soap_in_PointerTons1__searchDatasetsBySample(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchDatasetsBySample(
     struct soap *soap, ns1__searchDatasetsBySample *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchDatasetsBySample);
   if (soap_out_PointerTons1__searchDatasetsBySample(
           soap, tag ? tag : "ns1:searchDatasetsBySample", id, a, type))
@@ -132487,7 +132836,7 @@ soap_get_PointerTons1__searchDatasetsBySample(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__searchDatasetsBySample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -132505,7 +132854,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchSamplesBySampleNameResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchSamplesBySampleNameResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchSamplesBySampleNameResponse);
   if (id < 0)
     return soap->error;
@@ -132516,22 +132865,22 @@ SOAP_FMAC3 ns1__searchSamplesBySampleNameResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchSamplesBySampleNameResponse(
     struct soap *soap, const char *tag,
     ns1__searchSamplesBySampleNameResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSamplesBySampleNameResponse **)soap_malloc(
               soap, sizeof(ns1__searchSamplesBySampleNameResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSamplesBySampleNameResponse *)
               soap_instantiate_ns1__searchSamplesBySampleNameResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSamplesBySampleNameResponse **p =
         (ns1__searchSamplesBySampleNameResponse **)soap_id_lookup(
@@ -132540,7 +132889,7 @@ soap_in_PointerTons1__searchSamplesBySampleNameResponse(
             sizeof(ns1__searchSamplesBySampleNameResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -132550,7 +132899,7 @@ soap_put_PointerTons1__searchSamplesBySampleNameResponse(
     struct soap *soap, ns1__searchSamplesBySampleNameResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchSamplesBySampleNameResponse);
   if (soap_out_PointerTons1__searchSamplesBySampleNameResponse(
           soap, tag ? tag : "ns1:searchSamplesBySampleNameResponse", id, a,
@@ -132566,7 +132915,7 @@ soap_get_PointerTons1__searchSamplesBySampleNameResponse(
   if ((p = soap_in_PointerTons1__searchSamplesBySampleNameResponse(soap, tag, p,
                                                                    type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -132582,7 +132931,7 @@ soap_serialize_PointerTons1__searchSamplesBySampleName(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchSamplesBySampleName(
     struct soap *soap, const char *tag, int id,
     ns1__searchSamplesBySampleName *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchSamplesBySampleName);
   if (id < 0)
     return soap->error;
@@ -132593,22 +132942,22 @@ SOAP_FMAC3 ns1__searchSamplesBySampleName **SOAP_FMAC4
 soap_in_PointerTons1__searchSamplesBySampleName(
     struct soap *soap, const char *tag, ns1__searchSamplesBySampleName **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchSamplesBySampleName **)soap_malloc(
               soap, sizeof(ns1__searchSamplesBySampleName *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchSamplesBySampleName *)
               soap_instantiate_ns1__searchSamplesBySampleName(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchSamplesBySampleName **p =
         (ns1__searchSamplesBySampleName **)soap_id_lookup(
@@ -132617,7 +132966,7 @@ soap_in_PointerTons1__searchSamplesBySampleName(
             sizeof(ns1__searchSamplesBySampleName), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -132625,7 +132974,7 @@ soap_in_PointerTons1__searchSamplesBySampleName(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchSamplesBySampleName(
     struct soap *soap, ns1__searchSamplesBySampleName *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchSamplesBySampleName);
   if (soap_out_PointerTons1__searchSamplesBySampleName(
           soap, tag ? tag : "ns1:searchSamplesBySampleName", id, a, type))
@@ -132639,7 +132988,7 @@ soap_get_PointerTons1__searchSamplesBySampleName(
     const char *type) {
   if ((p = soap_in_PointerTons1__searchSamplesBySampleName(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -132656,7 +133005,7 @@ soap_serialize_PointerTons1__listInvestigationTypesResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__listInvestigationTypesResponse(
     struct soap *soap, const char *tag, int id,
     ns1__listInvestigationTypesResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listInvestigationTypesResponse);
   if (id < 0)
     return soap->error;
@@ -132667,22 +133016,22 @@ SOAP_FMAC3 ns1__listInvestigationTypesResponse **SOAP_FMAC4
 soap_in_PointerTons1__listInvestigationTypesResponse(
     struct soap *soap, const char *tag, ns1__listInvestigationTypesResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listInvestigationTypesResponse **)soap_malloc(
               soap, sizeof(ns1__listInvestigationTypesResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__listInvestigationTypesResponse *)
               soap_instantiate_ns1__listInvestigationTypesResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listInvestigationTypesResponse **p =
         (ns1__listInvestigationTypesResponse **)soap_id_lookup(
@@ -132691,7 +133040,7 @@ soap_in_PointerTons1__listInvestigationTypesResponse(
             sizeof(ns1__listInvestigationTypesResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -132700,7 +133049,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__listInvestigationTypesResponse(
     struct soap *soap, ns1__listInvestigationTypesResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__listInvestigationTypesResponse);
   if (soap_out_PointerTons1__listInvestigationTypesResponse(
           soap, tag ? tag : "ns1:listInvestigationTypesResponse", id, a, type))
@@ -132715,7 +133064,7 @@ soap_get_PointerTons1__listInvestigationTypesResponse(
   if ((p = soap_in_PointerTons1__listInvestigationTypesResponse(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -132730,7 +133079,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__listInvestigationTypes(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__listInvestigationTypes(
     struct soap *soap, const char *tag, int id,
     ns1__listInvestigationTypes *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listInvestigationTypes);
   if (id < 0)
     return soap->error;
@@ -132741,22 +133090,22 @@ SOAP_FMAC3 ns1__listInvestigationTypes **SOAP_FMAC4
 soap_in_PointerTons1__listInvestigationTypes(struct soap *soap, const char *tag,
                                              ns1__listInvestigationTypes **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listInvestigationTypes **)soap_malloc(
               soap, sizeof(ns1__listInvestigationTypes *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__listInvestigationTypes *)
               soap_instantiate_ns1__listInvestigationTypes(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listInvestigationTypes **p =
         (ns1__listInvestigationTypes **)soap_id_lookup(
@@ -132765,7 +133114,7 @@ soap_in_PointerTons1__listInvestigationTypes(struct soap *soap, const char *tag,
             sizeof(ns1__listInvestigationTypes), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -132773,7 +133122,7 @@ soap_in_PointerTons1__listInvestigationTypes(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__listInvestigationTypes(
     struct soap *soap, ns1__listInvestigationTypes *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__listInvestigationTypes);
   if (soap_out_PointerTons1__listInvestigationTypes(
           soap, tag ? tag : "ns1:listInvestigationTypes", id, a, type))
@@ -132788,7 +133137,7 @@ soap_get_PointerTons1__listInvestigationTypes(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__listInvestigationTypes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -132805,7 +133154,7 @@ soap_serialize_PointerTons1__getInstrumentsWithDataResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getInstrumentsWithDataResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getInstrumentsWithDataResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getInstrumentsWithDataResponse);
   if (id < 0)
     return soap->error;
@@ -132816,22 +133165,22 @@ SOAP_FMAC3 ns1__getInstrumentsWithDataResponse **SOAP_FMAC4
 soap_in_PointerTons1__getInstrumentsWithDataResponse(
     struct soap *soap, const char *tag, ns1__getInstrumentsWithDataResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getInstrumentsWithDataResponse **)soap_malloc(
               soap, sizeof(ns1__getInstrumentsWithDataResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getInstrumentsWithDataResponse *)
               soap_instantiate_ns1__getInstrumentsWithDataResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getInstrumentsWithDataResponse **p =
         (ns1__getInstrumentsWithDataResponse **)soap_id_lookup(
@@ -132840,7 +133189,7 @@ soap_in_PointerTons1__getInstrumentsWithDataResponse(
             sizeof(ns1__getInstrumentsWithDataResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -132849,7 +133198,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getInstrumentsWithDataResponse(
     struct soap *soap, ns1__getInstrumentsWithDataResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__getInstrumentsWithDataResponse);
   if (soap_out_PointerTons1__getInstrumentsWithDataResponse(
           soap, tag ? tag : "ns1:getInstrumentsWithDataResponse", id, a, type))
@@ -132864,7 +133213,7 @@ soap_get_PointerTons1__getInstrumentsWithDataResponse(
   if ((p = soap_in_PointerTons1__getInstrumentsWithDataResponse(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -132879,7 +133228,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__getInstrumentsWithData(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getInstrumentsWithData(
     struct soap *soap, const char *tag, int id,
     ns1__getInstrumentsWithData *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getInstrumentsWithData);
   if (id < 0)
     return soap->error;
@@ -132890,22 +133239,22 @@ SOAP_FMAC3 ns1__getInstrumentsWithData **SOAP_FMAC4
 soap_in_PointerTons1__getInstrumentsWithData(struct soap *soap, const char *tag,
                                              ns1__getInstrumentsWithData **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getInstrumentsWithData **)soap_malloc(
               soap, sizeof(ns1__getInstrumentsWithData *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getInstrumentsWithData *)
               soap_instantiate_ns1__getInstrumentsWithData(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getInstrumentsWithData **p =
         (ns1__getInstrumentsWithData **)soap_id_lookup(
@@ -132914,7 +133263,7 @@ soap_in_PointerTons1__getInstrumentsWithData(struct soap *soap, const char *tag,
             sizeof(ns1__getInstrumentsWithData), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -132922,7 +133271,7 @@ soap_in_PointerTons1__getInstrumentsWithData(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getInstrumentsWithData(
     struct soap *soap, ns1__getInstrumentsWithData *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getInstrumentsWithData);
   if (soap_out_PointerTons1__getInstrumentsWithData(
           soap, tag ? tag : "ns1:getInstrumentsWithData", id, a, type))
@@ -132937,7 +133286,7 @@ soap_get_PointerTons1__getInstrumentsWithData(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__getInstrumentsWithData(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -132959,7 +133308,7 @@ soap_out_PointerTons1__getFacilityCyclesWithDataForInstrumentResponse(
     ns1__getFacilityCyclesWithDataForInstrumentResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__getFacilityCyclesWithDataForInstrumentResponse);
   if (id < 0)
     return soap->error;
@@ -132970,25 +133319,25 @@ SOAP_FMAC3 ns1__getFacilityCyclesWithDataForInstrumentResponse **SOAP_FMAC4
 soap_in_PointerTons1__getFacilityCyclesWithDataForInstrumentResponse(
     struct soap *soap, const char *tag,
     ns1__getFacilityCyclesWithDataForInstrumentResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getFacilityCyclesWithDataForInstrumentResponse **)
               soap_malloc(
                   soap,
                   sizeof(
                       ns1__getFacilityCyclesWithDataForInstrumentResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getFacilityCyclesWithDataForInstrumentResponse *)
               soap_instantiate_ns1__getFacilityCyclesWithDataForInstrumentResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getFacilityCyclesWithDataForInstrumentResponse **p =
         (ns1__getFacilityCyclesWithDataForInstrumentResponse **)soap_id_lookup(
@@ -132997,7 +133346,7 @@ soap_in_PointerTons1__getFacilityCyclesWithDataForInstrumentResponse(
             sizeof(ns1__getFacilityCyclesWithDataForInstrumentResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -133008,7 +133357,7 @@ soap_put_PointerTons1__getFacilityCyclesWithDataForInstrumentResponse(
     ns1__getFacilityCyclesWithDataForInstrumentResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__getFacilityCyclesWithDataForInstrumentResponse);
   if (soap_out_PointerTons1__getFacilityCyclesWithDataForInstrumentResponse(
           soap,
@@ -133025,7 +133374,7 @@ soap_get_PointerTons1__getFacilityCyclesWithDataForInstrumentResponse(
   if ((p = soap_in_PointerTons1__getFacilityCyclesWithDataForInstrumentResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -133045,7 +133394,7 @@ soap_out_PointerTons1__getFacilityCyclesWithDataForInstrument(
     struct soap *soap, const char *tag, int id,
     ns1__getFacilityCyclesWithDataForInstrument *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__getFacilityCyclesWithDataForInstrument);
   if (id < 0)
     return soap->error;
@@ -133056,22 +133405,22 @@ SOAP_FMAC3 ns1__getFacilityCyclesWithDataForInstrument **SOAP_FMAC4
 soap_in_PointerTons1__getFacilityCyclesWithDataForInstrument(
     struct soap *soap, const char *tag,
     ns1__getFacilityCyclesWithDataForInstrument **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getFacilityCyclesWithDataForInstrument **)soap_malloc(
               soap, sizeof(ns1__getFacilityCyclesWithDataForInstrument *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getFacilityCyclesWithDataForInstrument *)
               soap_instantiate_ns1__getFacilityCyclesWithDataForInstrument(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getFacilityCyclesWithDataForInstrument **p =
         (ns1__getFacilityCyclesWithDataForInstrument **)soap_id_lookup(
@@ -133080,7 +133429,7 @@ soap_in_PointerTons1__getFacilityCyclesWithDataForInstrument(
             sizeof(ns1__getFacilityCyclesWithDataForInstrument), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -133090,7 +133439,7 @@ soap_put_PointerTons1__getFacilityCyclesWithDataForInstrument(
     struct soap *soap, ns1__getFacilityCyclesWithDataForInstrument *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__getFacilityCyclesWithDataForInstrument);
   if (soap_out_PointerTons1__getFacilityCyclesWithDataForInstrument(
           soap, tag ? tag : "ns1:getFacilityCyclesWithDataForInstrument", id, a,
@@ -133106,7 +133455,7 @@ soap_get_PointerTons1__getFacilityCyclesWithDataForInstrument(
   if ((p = soap_in_PointerTons1__getFacilityCyclesWithDataForInstrument(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -133123,7 +133472,7 @@ soap_serialize_PointerTons1__listFacilityCyclesResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__listFacilityCyclesResponse(
     struct soap *soap, const char *tag, int id,
     ns1__listFacilityCyclesResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listFacilityCyclesResponse);
   if (id < 0)
     return soap->error;
@@ -133134,22 +133483,22 @@ SOAP_FMAC3 ns1__listFacilityCyclesResponse **SOAP_FMAC4
 soap_in_PointerTons1__listFacilityCyclesResponse(
     struct soap *soap, const char *tag, ns1__listFacilityCyclesResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listFacilityCyclesResponse **)soap_malloc(
               soap, sizeof(ns1__listFacilityCyclesResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__listFacilityCyclesResponse *)
               soap_instantiate_ns1__listFacilityCyclesResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listFacilityCyclesResponse **p =
         (ns1__listFacilityCyclesResponse **)soap_id_lookup(
@@ -133158,7 +133507,7 @@ soap_in_PointerTons1__listFacilityCyclesResponse(
             sizeof(ns1__listFacilityCyclesResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -133166,7 +133515,7 @@ soap_in_PointerTons1__listFacilityCyclesResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__listFacilityCyclesResponse(
     struct soap *soap, ns1__listFacilityCyclesResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__listFacilityCyclesResponse);
   if (soap_out_PointerTons1__listFacilityCyclesResponse(
           soap, tag ? tag : "ns1:listFacilityCyclesResponse", id, a, type))
@@ -133181,7 +133530,7 @@ soap_get_PointerTons1__listFacilityCyclesResponse(
   if ((p = soap_in_PointerTons1__listFacilityCyclesResponse(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -133198,7 +133547,7 @@ soap_out_PointerTons1__listFacilityCycles(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__listFacilityCycles *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listFacilityCycles);
   if (id < 0)
     return soap->error;
@@ -133209,29 +133558,29 @@ SOAP_FMAC3 ns1__listFacilityCycles **SOAP_FMAC4
 soap_in_PointerTons1__listFacilityCycles(struct soap *soap, const char *tag,
                                          ns1__listFacilityCycles **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listFacilityCycles **)soap_malloc(
               soap, sizeof(ns1__listFacilityCycles *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__listFacilityCycles *)
-              soap_instantiate_ns1__listFacilityCycles(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__listFacilityCycles(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listFacilityCycles **p = (ns1__listFacilityCycles **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__listFacilityCycles,
         sizeof(ns1__listFacilityCycles), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -133240,7 +133589,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__listFacilityCycles(struct soap *soap,
                                           ns1__listFacilityCycles *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__listFacilityCycles);
   if (soap_out_PointerTons1__listFacilityCycles(
           soap, tag ? tag : "ns1:listFacilityCycles", id, a, type))
@@ -133254,7 +133603,7 @@ soap_get_PointerTons1__listFacilityCycles(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__listFacilityCycles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -133269,7 +133618,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__listParametersResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__listParametersResponse(
     struct soap *soap, const char *tag, int id,
     ns1__listParametersResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listParametersResponse);
   if (id < 0)
     return soap->error;
@@ -133280,22 +133629,22 @@ SOAP_FMAC3 ns1__listParametersResponse **SOAP_FMAC4
 soap_in_PointerTons1__listParametersResponse(struct soap *soap, const char *tag,
                                              ns1__listParametersResponse **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listParametersResponse **)soap_malloc(
               soap, sizeof(ns1__listParametersResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__listParametersResponse *)
               soap_instantiate_ns1__listParametersResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listParametersResponse **p =
         (ns1__listParametersResponse **)soap_id_lookup(
@@ -133304,7 +133653,7 @@ soap_in_PointerTons1__listParametersResponse(struct soap *soap, const char *tag,
             sizeof(ns1__listParametersResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -133312,7 +133661,7 @@ soap_in_PointerTons1__listParametersResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__listParametersResponse(
     struct soap *soap, ns1__listParametersResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__listParametersResponse);
   if (soap_out_PointerTons1__listParametersResponse(
           soap, tag ? tag : "ns1:listParametersResponse", id, a, type))
@@ -133327,7 +133676,7 @@ soap_get_PointerTons1__listParametersResponse(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__listParametersResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -133344,7 +133693,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__listParameters(struct soap *soap, const char *tag,
                                       int id, ns1__listParameters *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listParameters);
   if (id < 0)
     return soap->error;
@@ -133355,28 +133704,28 @@ SOAP_FMAC3 ns1__listParameters **SOAP_FMAC4
 soap_in_PointerTons1__listParameters(struct soap *soap, const char *tag,
                                      ns1__listParameters **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listParameters **)soap_malloc(
               soap, sizeof(ns1__listParameters *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__listParameters *)soap_instantiate_ns1__listParameters(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listParameters **p = (ns1__listParameters **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__listParameters,
         sizeof(ns1__listParameters), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -133385,7 +133734,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__listParameters(struct soap *soap,
                                       ns1__listParameters *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__listParameters);
   if (soap_out_PointerTons1__listParameters(
           soap, tag ? tag : "ns1:listParameters", id, a, type))
@@ -133399,7 +133748,7 @@ soap_get_PointerTons1__listParameters(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__listParameters(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -133416,7 +133765,7 @@ soap_out_PointerTons1__listRolesResponse(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__listRolesResponse *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listRolesResponse);
   if (id < 0)
     return soap->error;
@@ -133427,29 +133776,29 @@ SOAP_FMAC3 ns1__listRolesResponse **SOAP_FMAC4
 soap_in_PointerTons1__listRolesResponse(struct soap *soap, const char *tag,
                                         ns1__listRolesResponse **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listRolesResponse **)soap_malloc(
               soap, sizeof(ns1__listRolesResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__listRolesResponse *)soap_instantiate_ns1__listRolesResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listRolesResponse **p = (ns1__listRolesResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__listRolesResponse,
         sizeof(ns1__listRolesResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -133458,7 +133807,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__listRolesResponse(struct soap *soap,
                                          ns1__listRolesResponse *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__listRolesResponse);
   if (soap_out_PointerTons1__listRolesResponse(
           soap, tag ? tag : "ns1:listRolesResponse", id, a, type))
@@ -133472,7 +133821,7 @@ soap_get_PointerTons1__listRolesResponse(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__listRolesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -133488,7 +133837,7 @@ soap_serialize_PointerTons1__listRoles(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__listRoles(struct soap *soap, const char *tag, int id,
                                  ns1__listRoles *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listRoles);
   if (id < 0)
     return soap->error;
@@ -133498,27 +133847,27 @@ soap_out_PointerTons1__listRoles(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__listRoles **SOAP_FMAC4
 soap_in_PointerTons1__listRoles(struct soap *soap, const char *tag,
                                 ns1__listRoles **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listRoles **)soap_malloc(soap, sizeof(ns1__listRoles *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__listRoles *)soap_instantiate_ns1__listRoles(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listRoles **p = (ns1__listRoles **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__listRoles,
         sizeof(ns1__listRoles), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -133526,7 +133875,7 @@ soap_in_PointerTons1__listRoles(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__listRoles(struct soap *soap, ns1__listRoles *const *a,
                                  const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__listRoles);
   if (soap_out_PointerTons1__listRoles(soap, tag ? tag : "ns1:listRoles", id, a,
                                        type))
@@ -133539,7 +133888,7 @@ soap_get_PointerTons1__listRoles(struct soap *soap, ns1__listRoles **p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__listRoles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -133555,7 +133904,7 @@ soap_serialize_PointerTons1__getAllInstrumentsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getAllInstrumentsResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getAllInstrumentsResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getAllInstrumentsResponse);
   if (id < 0)
     return soap->error;
@@ -133566,22 +133915,22 @@ SOAP_FMAC3 ns1__getAllInstrumentsResponse **SOAP_FMAC4
 soap_in_PointerTons1__getAllInstrumentsResponse(
     struct soap *soap, const char *tag, ns1__getAllInstrumentsResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getAllInstrumentsResponse **)soap_malloc(
               soap, sizeof(ns1__getAllInstrumentsResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getAllInstrumentsResponse *)
               soap_instantiate_ns1__getAllInstrumentsResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getAllInstrumentsResponse **p =
         (ns1__getAllInstrumentsResponse **)soap_id_lookup(
@@ -133590,7 +133939,7 @@ soap_in_PointerTons1__getAllInstrumentsResponse(
             sizeof(ns1__getAllInstrumentsResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -133598,7 +133947,7 @@ soap_in_PointerTons1__getAllInstrumentsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getAllInstrumentsResponse(
     struct soap *soap, ns1__getAllInstrumentsResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getAllInstrumentsResponse);
   if (soap_out_PointerTons1__getAllInstrumentsResponse(
           soap, tag ? tag : "ns1:getAllInstrumentsResponse", id, a, type))
@@ -133612,7 +133961,7 @@ soap_get_PointerTons1__getAllInstrumentsResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__getAllInstrumentsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -133629,7 +133978,7 @@ soap_out_PointerTons1__getAllInstruments(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__getAllInstruments *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getAllInstruments);
   if (id < 0)
     return soap->error;
@@ -133640,29 +133989,29 @@ SOAP_FMAC3 ns1__getAllInstruments **SOAP_FMAC4
 soap_in_PointerTons1__getAllInstruments(struct soap *soap, const char *tag,
                                         ns1__getAllInstruments **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getAllInstruments **)soap_malloc(
               soap, sizeof(ns1__getAllInstruments *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__getAllInstruments *)soap_instantiate_ns1__getAllInstruments(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getAllInstruments **p = (ns1__getAllInstruments **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getAllInstruments,
         sizeof(ns1__getAllInstruments), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -133671,7 +134020,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getAllInstruments(struct soap *soap,
                                          ns1__getAllInstruments *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getAllInstruments);
   if (soap_out_PointerTons1__getAllInstruments(
           soap, tag ? tag : "ns1:getAllInstruments", id, a, type))
@@ -133685,7 +134034,7 @@ soap_get_PointerTons1__getAllInstruments(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getAllInstruments(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -133700,7 +134049,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__listInstrumentsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__listInstrumentsResponse(
     struct soap *soap, const char *tag, int id,
     ns1__listInstrumentsResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listInstrumentsResponse);
   if (id < 0)
     return soap->error;
@@ -133712,22 +134061,22 @@ soap_in_PointerTons1__listInstrumentsResponse(struct soap *soap,
                                               const char *tag,
                                               ns1__listInstrumentsResponse **a,
                                               const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listInstrumentsResponse **)soap_malloc(
               soap, sizeof(ns1__listInstrumentsResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__listInstrumentsResponse *)
               soap_instantiate_ns1__listInstrumentsResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listInstrumentsResponse **p =
         (ns1__listInstrumentsResponse **)soap_id_lookup(
@@ -133736,7 +134085,7 @@ soap_in_PointerTons1__listInstrumentsResponse(struct soap *soap,
             sizeof(ns1__listInstrumentsResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -133744,7 +134093,7 @@ soap_in_PointerTons1__listInstrumentsResponse(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__listInstrumentsResponse(
     struct soap *soap, ns1__listInstrumentsResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__listInstrumentsResponse);
   if (soap_out_PointerTons1__listInstrumentsResponse(
           soap, tag ? tag : "ns1:listInstrumentsResponse", id, a, type))
@@ -133759,7 +134108,7 @@ soap_get_PointerTons1__listInstrumentsResponse(struct soap *soap,
                                                const char *type) {
   if ((p = soap_in_PointerTons1__listInstrumentsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -133776,7 +134125,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__listInstruments(struct soap *soap, const char *tag,
                                        int id, ns1__listInstruments *const *a,
                                        const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__listInstruments);
   if (id < 0)
     return soap->error;
@@ -133787,28 +134136,28 @@ SOAP_FMAC3 ns1__listInstruments **SOAP_FMAC4
 soap_in_PointerTons1__listInstruments(struct soap *soap, const char *tag,
                                       ns1__listInstruments **a,
                                       const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__listInstruments **)soap_malloc(
               soap, sizeof(ns1__listInstruments *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__listInstruments *)soap_instantiate_ns1__listInstruments(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__listInstruments **p = (ns1__listInstruments **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__listInstruments,
         sizeof(ns1__listInstruments), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -133817,7 +134166,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__listInstruments(struct soap *soap,
                                        ns1__listInstruments *const *a,
                                        const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__listInstruments);
   if (soap_out_PointerTons1__listInstruments(
           soap, tag ? tag : "ns1:listInstruments", id, a, type))
@@ -133831,7 +134180,7 @@ soap_get_PointerTons1__listInstruments(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__listInstruments(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -133850,7 +134199,7 @@ soap_out_PointerTons1__searchByUserSurnamePaginationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchByUserSurnamePaginationResponse *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__searchByUserSurnamePaginationResponse);
   if (id < 0)
     return soap->error;
@@ -133861,22 +134210,22 @@ SOAP_FMAC3 ns1__searchByUserSurnamePaginationResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchByUserSurnamePaginationResponse(
     struct soap *soap, const char *tag,
     ns1__searchByUserSurnamePaginationResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByUserSurnamePaginationResponse **)soap_malloc(
               soap, sizeof(ns1__searchByUserSurnamePaginationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByUserSurnamePaginationResponse *)
               soap_instantiate_ns1__searchByUserSurnamePaginationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByUserSurnamePaginationResponse **p =
         (ns1__searchByUserSurnamePaginationResponse **)soap_id_lookup(
@@ -133885,7 +134234,7 @@ soap_in_PointerTons1__searchByUserSurnamePaginationResponse(
             sizeof(ns1__searchByUserSurnamePaginationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -133895,7 +134244,7 @@ soap_put_PointerTons1__searchByUserSurnamePaginationResponse(
     struct soap *soap, ns1__searchByUserSurnamePaginationResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchByUserSurnamePaginationResponse);
   if (soap_out_PointerTons1__searchByUserSurnamePaginationResponse(
           soap, tag ? tag : "ns1:searchByUserSurnamePaginationResponse", id, a,
@@ -133911,7 +134260,7 @@ soap_get_PointerTons1__searchByUserSurnamePaginationResponse(
   if ((p = soap_in_PointerTons1__searchByUserSurnamePaginationResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -133928,7 +134277,7 @@ soap_serialize_PointerTons1__searchByUserSurnamePagination(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchByUserSurnamePagination(
     struct soap *soap, const char *tag, int id,
     ns1__searchByUserSurnamePagination *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByUserSurnamePagination);
   if (id < 0)
     return soap->error;
@@ -133939,22 +134288,22 @@ SOAP_FMAC3 ns1__searchByUserSurnamePagination **SOAP_FMAC4
 soap_in_PointerTons1__searchByUserSurnamePagination(
     struct soap *soap, const char *tag, ns1__searchByUserSurnamePagination **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByUserSurnamePagination **)soap_malloc(
               soap, sizeof(ns1__searchByUserSurnamePagination *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByUserSurnamePagination *)
               soap_instantiate_ns1__searchByUserSurnamePagination(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByUserSurnamePagination **p =
         (ns1__searchByUserSurnamePagination **)soap_id_lookup(
@@ -133963,7 +134312,7 @@ soap_in_PointerTons1__searchByUserSurnamePagination(
             sizeof(ns1__searchByUserSurnamePagination), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -133972,7 +134321,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchByUserSurnamePagination(
     struct soap *soap, ns1__searchByUserSurnamePagination *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__searchByUserSurnamePagination);
   if (soap_out_PointerTons1__searchByUserSurnamePagination(
           soap, tag ? tag : "ns1:searchByUserSurnamePagination", id, a, type))
@@ -133987,7 +134336,7 @@ soap_get_PointerTons1__searchByUserSurnamePagination(
   if ((p = soap_in_PointerTons1__searchByUserSurnamePagination(soap, tag, p,
                                                                type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -134004,7 +134353,7 @@ soap_serialize_PointerTons1__searchByUserSurnameResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchByUserSurnameResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchByUserSurnameResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByUserSurnameResponse);
   if (id < 0)
     return soap->error;
@@ -134015,22 +134364,22 @@ SOAP_FMAC3 ns1__searchByUserSurnameResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchByUserSurnameResponse(
     struct soap *soap, const char *tag, ns1__searchByUserSurnameResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByUserSurnameResponse **)soap_malloc(
               soap, sizeof(ns1__searchByUserSurnameResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByUserSurnameResponse *)
               soap_instantiate_ns1__searchByUserSurnameResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByUserSurnameResponse **p =
         (ns1__searchByUserSurnameResponse **)soap_id_lookup(
@@ -134039,7 +134388,7 @@ soap_in_PointerTons1__searchByUserSurnameResponse(
             sizeof(ns1__searchByUserSurnameResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -134048,7 +134397,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchByUserSurnameResponse(
     struct soap *soap, ns1__searchByUserSurnameResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__searchByUserSurnameResponse);
   if (soap_out_PointerTons1__searchByUserSurnameResponse(
           soap, tag ? tag : "ns1:searchByUserSurnameResponse", id, a, type))
@@ -134063,7 +134412,7 @@ soap_get_PointerTons1__searchByUserSurnameResponse(
   if ((p = soap_in_PointerTons1__searchByUserSurnameResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -134080,7 +134429,7 @@ soap_out_PointerTons1__searchByUserSurname(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__searchByUserSurname *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByUserSurname);
   if (id < 0)
     return soap->error;
@@ -134091,29 +134440,29 @@ SOAP_FMAC3 ns1__searchByUserSurname **SOAP_FMAC4
 soap_in_PointerTons1__searchByUserSurname(struct soap *soap, const char *tag,
                                           ns1__searchByUserSurname **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByUserSurname **)soap_malloc(
               soap, sizeof(ns1__searchByUserSurname *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByUserSurname *)
-              soap_instantiate_ns1__searchByUserSurname(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__searchByUserSurname(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByUserSurname **p = (ns1__searchByUserSurname **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__searchByUserSurname,
         sizeof(ns1__searchByUserSurname), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -134122,7 +134471,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__searchByUserSurname(struct soap *soap,
                                            ns1__searchByUserSurname *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchByUserSurname);
   if (soap_out_PointerTons1__searchByUserSurname(
           soap, tag ? tag : "ns1:searchByUserSurname", id, a, type))
@@ -134136,7 +134485,7 @@ soap_get_PointerTons1__searchByUserSurname(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__searchByUserSurname(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -134154,7 +134503,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchByUserIDPaginationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchByUserIDPaginationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByUserIDPaginationResponse);
   if (id < 0)
     return soap->error;
@@ -134165,22 +134514,22 @@ SOAP_FMAC3 ns1__searchByUserIDPaginationResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchByUserIDPaginationResponse(
     struct soap *soap, const char *tag,
     ns1__searchByUserIDPaginationResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByUserIDPaginationResponse **)soap_malloc(
               soap, sizeof(ns1__searchByUserIDPaginationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByUserIDPaginationResponse *)
               soap_instantiate_ns1__searchByUserIDPaginationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByUserIDPaginationResponse **p =
         (ns1__searchByUserIDPaginationResponse **)soap_id_lookup(
@@ -134189,7 +134538,7 @@ soap_in_PointerTons1__searchByUserIDPaginationResponse(
             sizeof(ns1__searchByUserIDPaginationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -134199,7 +134548,7 @@ soap_put_PointerTons1__searchByUserIDPaginationResponse(
     struct soap *soap, ns1__searchByUserIDPaginationResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchByUserIDPaginationResponse);
   if (soap_out_PointerTons1__searchByUserIDPaginationResponse(
           soap, tag ? tag : "ns1:searchByUserIDPaginationResponse", id, a,
@@ -134215,7 +134564,7 @@ soap_get_PointerTons1__searchByUserIDPaginationResponse(
   if ((p = soap_in_PointerTons1__searchByUserIDPaginationResponse(soap, tag, p,
                                                                   type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -134231,7 +134580,7 @@ soap_serialize_PointerTons1__searchByUserIDPagination(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchByUserIDPagination(
     struct soap *soap, const char *tag, int id,
     ns1__searchByUserIDPagination *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByUserIDPagination);
   if (id < 0)
     return soap->error;
@@ -134242,22 +134591,22 @@ SOAP_FMAC3 ns1__searchByUserIDPagination **SOAP_FMAC4
 soap_in_PointerTons1__searchByUserIDPagination(
     struct soap *soap, const char *tag, ns1__searchByUserIDPagination **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByUserIDPagination **)soap_malloc(
               soap, sizeof(ns1__searchByUserIDPagination *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByUserIDPagination *)
               soap_instantiate_ns1__searchByUserIDPagination(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByUserIDPagination **p =
         (ns1__searchByUserIDPagination **)soap_id_lookup(
@@ -134266,7 +134615,7 @@ soap_in_PointerTons1__searchByUserIDPagination(
             sizeof(ns1__searchByUserIDPagination), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -134274,7 +134623,7 @@ soap_in_PointerTons1__searchByUserIDPagination(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchByUserIDPagination(
     struct soap *soap, ns1__searchByUserIDPagination *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchByUserIDPagination);
   if (soap_out_PointerTons1__searchByUserIDPagination(
           soap, tag ? tag : "ns1:searchByUserIDPagination", id, a, type))
@@ -134288,7 +134637,7 @@ soap_get_PointerTons1__searchByUserIDPagination(
     const char *type) {
   if ((p = soap_in_PointerTons1__searchByUserIDPagination(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -134303,7 +134652,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__searchByUserIDResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchByUserIDResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchByUserIDResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByUserIDResponse);
   if (id < 0)
     return soap->error;
@@ -134314,22 +134663,22 @@ SOAP_FMAC3 ns1__searchByUserIDResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchByUserIDResponse(struct soap *soap, const char *tag,
                                              ns1__searchByUserIDResponse **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByUserIDResponse **)soap_malloc(
               soap, sizeof(ns1__searchByUserIDResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByUserIDResponse *)
               soap_instantiate_ns1__searchByUserIDResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByUserIDResponse **p =
         (ns1__searchByUserIDResponse **)soap_id_lookup(
@@ -134338,7 +134687,7 @@ soap_in_PointerTons1__searchByUserIDResponse(struct soap *soap, const char *tag,
             sizeof(ns1__searchByUserIDResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -134346,7 +134695,7 @@ soap_in_PointerTons1__searchByUserIDResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchByUserIDResponse(
     struct soap *soap, ns1__searchByUserIDResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchByUserIDResponse);
   if (soap_out_PointerTons1__searchByUserIDResponse(
           soap, tag ? tag : "ns1:searchByUserIDResponse", id, a, type))
@@ -134361,7 +134710,7 @@ soap_get_PointerTons1__searchByUserIDResponse(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__searchByUserIDResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -134378,7 +134727,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchByUserID(struct soap *soap, const char *tag,
                                       int id, ns1__searchByUserID *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByUserID);
   if (id < 0)
     return soap->error;
@@ -134389,28 +134738,28 @@ SOAP_FMAC3 ns1__searchByUserID **SOAP_FMAC4
 soap_in_PointerTons1__searchByUserID(struct soap *soap, const char *tag,
                                      ns1__searchByUserID **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByUserID **)soap_malloc(
               soap, sizeof(ns1__searchByUserID *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByUserID *)soap_instantiate_ns1__searchByUserID(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByUserID **p = (ns1__searchByUserID **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__searchByUserID,
         sizeof(ns1__searchByUserID), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -134419,7 +134768,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__searchByUserID(struct soap *soap,
                                       ns1__searchByUserID *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchByUserID);
   if (soap_out_PointerTons1__searchByUserID(
           soap, tag ? tag : "ns1:searchByUserID", id, a, type))
@@ -134433,7 +134782,7 @@ soap_get_PointerTons1__searchByUserID(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__searchByUserID(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -134455,7 +134804,7 @@ soap_out_PointerTons1__getMyInvestigationsIncludesPaginationResponse(
     ns1__getMyInvestigationsIncludesPaginationResponse *const *a,
     const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesPaginationResponse);
   if (id < 0)
     return soap->error;
@@ -134466,25 +134815,25 @@ SOAP_FMAC3 ns1__getMyInvestigationsIncludesPaginationResponse **SOAP_FMAC4
 soap_in_PointerTons1__getMyInvestigationsIncludesPaginationResponse(
     struct soap *soap, const char *tag,
     ns1__getMyInvestigationsIncludesPaginationResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getMyInvestigationsIncludesPaginationResponse **)
               soap_malloc(
                   soap,
                   sizeof(
                       ns1__getMyInvestigationsIncludesPaginationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getMyInvestigationsIncludesPaginationResponse *)
               soap_instantiate_ns1__getMyInvestigationsIncludesPaginationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getMyInvestigationsIncludesPaginationResponse **p =
         (ns1__getMyInvestigationsIncludesPaginationResponse **)soap_id_lookup(
@@ -134493,7 +134842,7 @@ soap_in_PointerTons1__getMyInvestigationsIncludesPaginationResponse(
             sizeof(ns1__getMyInvestigationsIncludesPaginationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -134504,7 +134853,7 @@ soap_put_PointerTons1__getMyInvestigationsIncludesPaginationResponse(
     ns1__getMyInvestigationsIncludesPaginationResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__getMyInvestigationsIncludesPaginationResponse);
   if (soap_out_PointerTons1__getMyInvestigationsIncludesPaginationResponse(
           soap, tag ? tag : "ns1:getMyInvestigationsIncludesPaginationResponse",
@@ -134520,7 +134869,7 @@ soap_get_PointerTons1__getMyInvestigationsIncludesPaginationResponse(
   if ((p = soap_in_PointerTons1__getMyInvestigationsIncludesPaginationResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -134539,7 +134888,7 @@ soap_out_PointerTons1__getMyInvestigationsIncludesPagination(
     struct soap *soap, const char *tag, int id,
     ns1__getMyInvestigationsIncludesPagination *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesPagination);
   if (id < 0)
     return soap->error;
@@ -134550,22 +134899,22 @@ SOAP_FMAC3 ns1__getMyInvestigationsIncludesPagination **SOAP_FMAC4
 soap_in_PointerTons1__getMyInvestigationsIncludesPagination(
     struct soap *soap, const char *tag,
     ns1__getMyInvestigationsIncludesPagination **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getMyInvestigationsIncludesPagination **)soap_malloc(
               soap, sizeof(ns1__getMyInvestigationsIncludesPagination *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getMyInvestigationsIncludesPagination *)
               soap_instantiate_ns1__getMyInvestigationsIncludesPagination(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getMyInvestigationsIncludesPagination **p =
         (ns1__getMyInvestigationsIncludesPagination **)soap_id_lookup(
@@ -134574,7 +134923,7 @@ soap_in_PointerTons1__getMyInvestigationsIncludesPagination(
             sizeof(ns1__getMyInvestigationsIncludesPagination), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -134584,7 +134933,7 @@ soap_put_PointerTons1__getMyInvestigationsIncludesPagination(
     struct soap *soap, ns1__getMyInvestigationsIncludesPagination *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__getMyInvestigationsIncludesPagination);
   if (soap_out_PointerTons1__getMyInvestigationsIncludesPagination(
           soap, tag ? tag : "ns1:getMyInvestigationsIncludesPagination", id, a,
@@ -134600,7 +134949,7 @@ soap_get_PointerTons1__getMyInvestigationsIncludesPagination(
   if ((p = soap_in_PointerTons1__getMyInvestigationsIncludesPagination(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -134619,7 +134968,7 @@ soap_out_PointerTons1__getMyInvestigationsIncludesResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getMyInvestigationsIncludesResponse *const *a, const char *type) {
   id =
-      soap_element_id(soap, tag, id, *a, NULL, 0, type,
+      soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                       SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludesResponse);
   if (id < 0)
     return soap->error;
@@ -134630,22 +134979,22 @@ SOAP_FMAC3 ns1__getMyInvestigationsIncludesResponse **SOAP_FMAC4
 soap_in_PointerTons1__getMyInvestigationsIncludesResponse(
     struct soap *soap, const char *tag,
     ns1__getMyInvestigationsIncludesResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getMyInvestigationsIncludesResponse **)soap_malloc(
               soap, sizeof(ns1__getMyInvestigationsIncludesResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getMyInvestigationsIncludesResponse *)
               soap_instantiate_ns1__getMyInvestigationsIncludesResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getMyInvestigationsIncludesResponse **p =
         (ns1__getMyInvestigationsIncludesResponse **)soap_id_lookup(
@@ -134654,7 +135003,7 @@ soap_in_PointerTons1__getMyInvestigationsIncludesResponse(
             sizeof(ns1__getMyInvestigationsIncludesResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -134664,7 +135013,7 @@ soap_put_PointerTons1__getMyInvestigationsIncludesResponse(
     struct soap *soap, ns1__getMyInvestigationsIncludesResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__getMyInvestigationsIncludesResponse);
   if (soap_out_PointerTons1__getMyInvestigationsIncludesResponse(
           soap, tag ? tag : "ns1:getMyInvestigationsIncludesResponse", id, a,
@@ -134680,7 +135029,7 @@ soap_get_PointerTons1__getMyInvestigationsIncludesResponse(
   if ((p = soap_in_PointerTons1__getMyInvestigationsIncludesResponse(soap, tag,
                                                                      p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -134697,7 +135046,7 @@ soap_serialize_PointerTons1__getMyInvestigationsIncludes(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getMyInvestigationsIncludes(
     struct soap *soap, const char *tag, int id,
     ns1__getMyInvestigationsIncludes *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getMyInvestigationsIncludes);
   if (id < 0)
     return soap->error;
@@ -134708,22 +135057,22 @@ SOAP_FMAC3 ns1__getMyInvestigationsIncludes **SOAP_FMAC4
 soap_in_PointerTons1__getMyInvestigationsIncludes(
     struct soap *soap, const char *tag, ns1__getMyInvestigationsIncludes **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getMyInvestigationsIncludes **)soap_malloc(
               soap, sizeof(ns1__getMyInvestigationsIncludes *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getMyInvestigationsIncludes *)
               soap_instantiate_ns1__getMyInvestigationsIncludes(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getMyInvestigationsIncludes **p =
         (ns1__getMyInvestigationsIncludes **)soap_id_lookup(
@@ -134732,7 +135081,7 @@ soap_in_PointerTons1__getMyInvestigationsIncludes(
             sizeof(ns1__getMyInvestigationsIncludes), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -134741,7 +135090,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getMyInvestigationsIncludes(
     struct soap *soap, ns1__getMyInvestigationsIncludes *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__getMyInvestigationsIncludes);
   if (soap_out_PointerTons1__getMyInvestigationsIncludes(
           soap, tag ? tag : "ns1:getMyInvestigationsIncludes", id, a, type))
@@ -134756,7 +135105,7 @@ soap_get_PointerTons1__getMyInvestigationsIncludes(
   if ((p = soap_in_PointerTons1__getMyInvestigationsIncludes(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -134773,7 +135122,7 @@ soap_serialize_PointerTons1__getMyInvestigationsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getMyInvestigationsResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getMyInvestigationsResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getMyInvestigationsResponse);
   if (id < 0)
     return soap->error;
@@ -134784,22 +135133,22 @@ SOAP_FMAC3 ns1__getMyInvestigationsResponse **SOAP_FMAC4
 soap_in_PointerTons1__getMyInvestigationsResponse(
     struct soap *soap, const char *tag, ns1__getMyInvestigationsResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getMyInvestigationsResponse **)soap_malloc(
               soap, sizeof(ns1__getMyInvestigationsResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getMyInvestigationsResponse *)
               soap_instantiate_ns1__getMyInvestigationsResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getMyInvestigationsResponse **p =
         (ns1__getMyInvestigationsResponse **)soap_id_lookup(
@@ -134808,7 +135157,7 @@ soap_in_PointerTons1__getMyInvestigationsResponse(
             sizeof(ns1__getMyInvestigationsResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -134817,7 +135166,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getMyInvestigationsResponse(
     struct soap *soap, ns1__getMyInvestigationsResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__getMyInvestigationsResponse);
   if (soap_out_PointerTons1__getMyInvestigationsResponse(
           soap, tag ? tag : "ns1:getMyInvestigationsResponse", id, a, type))
@@ -134832,7 +135181,7 @@ soap_get_PointerTons1__getMyInvestigationsResponse(
   if ((p = soap_in_PointerTons1__getMyInvestigationsResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -134849,7 +135198,7 @@ soap_out_PointerTons1__getMyInvestigations(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__getMyInvestigations *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getMyInvestigations);
   if (id < 0)
     return soap->error;
@@ -134860,29 +135209,29 @@ SOAP_FMAC3 ns1__getMyInvestigations **SOAP_FMAC4
 soap_in_PointerTons1__getMyInvestigations(struct soap *soap, const char *tag,
                                           ns1__getMyInvestigations **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getMyInvestigations **)soap_malloc(
               soap, sizeof(ns1__getMyInvestigations *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getMyInvestigations *)
-              soap_instantiate_ns1__getMyInvestigations(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__getMyInvestigations(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getMyInvestigations **p = (ns1__getMyInvestigations **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getMyInvestigations,
         sizeof(ns1__getMyInvestigations), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -134891,7 +135240,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getMyInvestigations(struct soap *soap,
                                            ns1__getMyInvestigations *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getMyInvestigations);
   if (soap_out_PointerTons1__getMyInvestigations(
           soap, tag ? tag : "ns1:getMyInvestigations", id, a, type))
@@ -134905,7 +135254,7 @@ soap_get_PointerTons1__getMyInvestigations(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getMyInvestigations(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -134922,7 +135271,7 @@ soap_serialize_PointerTons1__searchByKeywordsAllResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchByKeywordsAllResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchByKeywordsAllResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByKeywordsAllResponse);
   if (id < 0)
     return soap->error;
@@ -134933,22 +135282,22 @@ SOAP_FMAC3 ns1__searchByKeywordsAllResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchByKeywordsAllResponse(
     struct soap *soap, const char *tag, ns1__searchByKeywordsAllResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByKeywordsAllResponse **)soap_malloc(
               soap, sizeof(ns1__searchByKeywordsAllResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByKeywordsAllResponse *)
               soap_instantiate_ns1__searchByKeywordsAllResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByKeywordsAllResponse **p =
         (ns1__searchByKeywordsAllResponse **)soap_id_lookup(
@@ -134957,7 +135306,7 @@ soap_in_PointerTons1__searchByKeywordsAllResponse(
             sizeof(ns1__searchByKeywordsAllResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -134966,7 +135315,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchByKeywordsAllResponse(
     struct soap *soap, ns1__searchByKeywordsAllResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__searchByKeywordsAllResponse);
   if (soap_out_PointerTons1__searchByKeywordsAllResponse(
           soap, tag ? tag : "ns1:searchByKeywordsAllResponse", id, a, type))
@@ -134981,7 +135330,7 @@ soap_get_PointerTons1__searchByKeywordsAllResponse(
   if ((p = soap_in_PointerTons1__searchByKeywordsAllResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -134998,7 +135347,7 @@ soap_out_PointerTons1__searchByKeywordsAll(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__searchByKeywordsAll *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByKeywordsAll);
   if (id < 0)
     return soap->error;
@@ -135009,29 +135358,29 @@ SOAP_FMAC3 ns1__searchByKeywordsAll **SOAP_FMAC4
 soap_in_PointerTons1__searchByKeywordsAll(struct soap *soap, const char *tag,
                                           ns1__searchByKeywordsAll **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByKeywordsAll **)soap_malloc(
               soap, sizeof(ns1__searchByKeywordsAll *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByKeywordsAll *)
-              soap_instantiate_ns1__searchByKeywordsAll(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__searchByKeywordsAll(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByKeywordsAll **p = (ns1__searchByKeywordsAll **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__searchByKeywordsAll,
         sizeof(ns1__searchByKeywordsAll), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -135040,7 +135389,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__searchByKeywordsAll(struct soap *soap,
                                            ns1__searchByKeywordsAll *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchByKeywordsAll);
   if (soap_out_PointerTons1__searchByKeywordsAll(
           soap, tag ? tag : "ns1:searchByKeywordsAll", id, a, type))
@@ -135054,7 +135403,7 @@ soap_get_PointerTons1__searchByKeywordsAll(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__searchByKeywordsAll(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -135070,7 +135419,7 @@ soap_serialize_PointerTons1__searchByKeywordsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchByKeywordsResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchByKeywordsResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByKeywordsResponse);
   if (id < 0)
     return soap->error;
@@ -135081,22 +135430,22 @@ SOAP_FMAC3 ns1__searchByKeywordsResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchByKeywordsResponse(
     struct soap *soap, const char *tag, ns1__searchByKeywordsResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByKeywordsResponse **)soap_malloc(
               soap, sizeof(ns1__searchByKeywordsResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByKeywordsResponse *)
               soap_instantiate_ns1__searchByKeywordsResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByKeywordsResponse **p =
         (ns1__searchByKeywordsResponse **)soap_id_lookup(
@@ -135105,7 +135454,7 @@ soap_in_PointerTons1__searchByKeywordsResponse(
             sizeof(ns1__searchByKeywordsResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -135113,7 +135462,7 @@ soap_in_PointerTons1__searchByKeywordsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchByKeywordsResponse(
     struct soap *soap, ns1__searchByKeywordsResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchByKeywordsResponse);
   if (soap_out_PointerTons1__searchByKeywordsResponse(
           soap, tag ? tag : "ns1:searchByKeywordsResponse", id, a, type))
@@ -135127,7 +135476,7 @@ soap_get_PointerTons1__searchByKeywordsResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__searchByKeywordsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -135144,7 +135493,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchByKeywords(struct soap *soap, const char *tag,
                                         int id, ns1__searchByKeywords *const *a,
                                         const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByKeywords);
   if (id < 0)
     return soap->error;
@@ -135155,28 +135504,28 @@ SOAP_FMAC3 ns1__searchByKeywords **SOAP_FMAC4
 soap_in_PointerTons1__searchByKeywords(struct soap *soap, const char *tag,
                                        ns1__searchByKeywords **a,
                                        const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByKeywords **)soap_malloc(
               soap, sizeof(ns1__searchByKeywords *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByKeywords *)soap_instantiate_ns1__searchByKeywords(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByKeywords **p = (ns1__searchByKeywords **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__searchByKeywords,
         sizeof(ns1__searchByKeywords), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -135185,7 +135534,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__searchByKeywords(struct soap *soap,
                                         ns1__searchByKeywords *const *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchByKeywords);
   if (soap_out_PointerTons1__searchByKeywords(
           soap, tag ? tag : "ns1:searchByKeywords", id, a, type))
@@ -135199,7 +135548,7 @@ soap_get_PointerTons1__searchByKeywords(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__searchByKeywords(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -135217,7 +135566,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchByAdvancedPaginationResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchByAdvancedPaginationResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByAdvancedPaginationResponse);
   if (id < 0)
     return soap->error;
@@ -135228,22 +135577,22 @@ SOAP_FMAC3 ns1__searchByAdvancedPaginationResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchByAdvancedPaginationResponse(
     struct soap *soap, const char *tag,
     ns1__searchByAdvancedPaginationResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByAdvancedPaginationResponse **)soap_malloc(
               soap, sizeof(ns1__searchByAdvancedPaginationResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByAdvancedPaginationResponse *)
               soap_instantiate_ns1__searchByAdvancedPaginationResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByAdvancedPaginationResponse **p =
         (ns1__searchByAdvancedPaginationResponse **)soap_id_lookup(
@@ -135252,7 +135601,7 @@ soap_in_PointerTons1__searchByAdvancedPaginationResponse(
             sizeof(ns1__searchByAdvancedPaginationResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -135262,7 +135611,7 @@ soap_put_PointerTons1__searchByAdvancedPaginationResponse(
     struct soap *soap, ns1__searchByAdvancedPaginationResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__searchByAdvancedPaginationResponse);
   if (soap_out_PointerTons1__searchByAdvancedPaginationResponse(
           soap, tag ? tag : "ns1:searchByAdvancedPaginationResponse", id, a,
@@ -135278,7 +135627,7 @@ soap_get_PointerTons1__searchByAdvancedPaginationResponse(
   if ((p = soap_in_PointerTons1__searchByAdvancedPaginationResponse(soap, tag,
                                                                     p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -135295,7 +135644,7 @@ soap_serialize_PointerTons1__searchByAdvancedPagination(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchByAdvancedPagination(
     struct soap *soap, const char *tag, int id,
     ns1__searchByAdvancedPagination *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByAdvancedPagination);
   if (id < 0)
     return soap->error;
@@ -135306,22 +135655,22 @@ SOAP_FMAC3 ns1__searchByAdvancedPagination **SOAP_FMAC4
 soap_in_PointerTons1__searchByAdvancedPagination(
     struct soap *soap, const char *tag, ns1__searchByAdvancedPagination **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByAdvancedPagination **)soap_malloc(
               soap, sizeof(ns1__searchByAdvancedPagination *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByAdvancedPagination *)
               soap_instantiate_ns1__searchByAdvancedPagination(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByAdvancedPagination **p =
         (ns1__searchByAdvancedPagination **)soap_id_lookup(
@@ -135330,7 +135679,7 @@ soap_in_PointerTons1__searchByAdvancedPagination(
             sizeof(ns1__searchByAdvancedPagination), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -135338,7 +135687,7 @@ soap_in_PointerTons1__searchByAdvancedPagination(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchByAdvancedPagination(
     struct soap *soap, ns1__searchByAdvancedPagination *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchByAdvancedPagination);
   if (soap_out_PointerTons1__searchByAdvancedPagination(
           soap, tag ? tag : "ns1:searchByAdvancedPagination", id, a, type))
@@ -135353,7 +135702,7 @@ soap_get_PointerTons1__searchByAdvancedPagination(
   if ((p = soap_in_PointerTons1__searchByAdvancedPagination(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -135369,7 +135718,7 @@ soap_serialize_PointerTons1__searchByAdvancedResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__searchByAdvancedResponse(
     struct soap *soap, const char *tag, int id,
     ns1__searchByAdvancedResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByAdvancedResponse);
   if (id < 0)
     return soap->error;
@@ -135380,22 +135729,22 @@ SOAP_FMAC3 ns1__searchByAdvancedResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchByAdvancedResponse(
     struct soap *soap, const char *tag, ns1__searchByAdvancedResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByAdvancedResponse **)soap_malloc(
               soap, sizeof(ns1__searchByAdvancedResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByAdvancedResponse *)
               soap_instantiate_ns1__searchByAdvancedResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByAdvancedResponse **p =
         (ns1__searchByAdvancedResponse **)soap_id_lookup(
@@ -135404,7 +135753,7 @@ soap_in_PointerTons1__searchByAdvancedResponse(
             sizeof(ns1__searchByAdvancedResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -135412,7 +135761,7 @@ soap_in_PointerTons1__searchByAdvancedResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__searchByAdvancedResponse(
     struct soap *soap, ns1__searchByAdvancedResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchByAdvancedResponse);
   if (soap_out_PointerTons1__searchByAdvancedResponse(
           soap, tag ? tag : "ns1:searchByAdvancedResponse", id, a, type))
@@ -135426,7 +135775,7 @@ soap_get_PointerTons1__searchByAdvancedResponse(
     const char *type) {
   if ((p = soap_in_PointerTons1__searchByAdvancedResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -135443,7 +135792,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchByAdvanced(struct soap *soap, const char *tag,
                                         int id, ns1__searchByAdvanced *const *a,
                                         const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__searchByAdvanced);
   if (id < 0)
     return soap->error;
@@ -135454,28 +135803,28 @@ SOAP_FMAC3 ns1__searchByAdvanced **SOAP_FMAC4
 soap_in_PointerTons1__searchByAdvanced(struct soap *soap, const char *tag,
                                        ns1__searchByAdvanced **a,
                                        const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchByAdvanced **)soap_malloc(
               soap, sizeof(ns1__searchByAdvanced *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchByAdvanced *)soap_instantiate_ns1__searchByAdvanced(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchByAdvanced **p = (ns1__searchByAdvanced **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__searchByAdvanced,
         sizeof(ns1__searchByAdvanced), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -135484,7 +135833,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__searchByAdvanced(struct soap *soap,
                                         ns1__searchByAdvanced *const *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__searchByAdvanced);
   if (soap_out_PointerTons1__searchByAdvanced(
           soap, tag ? tag : "ns1:searchByAdvanced", id, a, type))
@@ -135498,7 +135847,7 @@ soap_get_PointerTons1__searchByAdvanced(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__searchByAdvanced(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -135513,7 +135862,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__getAllKeywordsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getAllKeywordsResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getAllKeywordsResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getAllKeywordsResponse);
   if (id < 0)
     return soap->error;
@@ -135524,22 +135873,22 @@ SOAP_FMAC3 ns1__getAllKeywordsResponse **SOAP_FMAC4
 soap_in_PointerTons1__getAllKeywordsResponse(struct soap *soap, const char *tag,
                                              ns1__getAllKeywordsResponse **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getAllKeywordsResponse **)soap_malloc(
               soap, sizeof(ns1__getAllKeywordsResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getAllKeywordsResponse *)
               soap_instantiate_ns1__getAllKeywordsResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getAllKeywordsResponse **p =
         (ns1__getAllKeywordsResponse **)soap_id_lookup(
@@ -135548,7 +135897,7 @@ soap_in_PointerTons1__getAllKeywordsResponse(struct soap *soap, const char *tag,
             sizeof(ns1__getAllKeywordsResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -135556,7 +135905,7 @@ soap_in_PointerTons1__getAllKeywordsResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getAllKeywordsResponse(
     struct soap *soap, ns1__getAllKeywordsResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getAllKeywordsResponse);
   if (soap_out_PointerTons1__getAllKeywordsResponse(
           soap, tag ? tag : "ns1:getAllKeywordsResponse", id, a, type))
@@ -135571,7 +135920,7 @@ soap_get_PointerTons1__getAllKeywordsResponse(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__getAllKeywordsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -135588,7 +135937,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getAllKeywords(struct soap *soap, const char *tag,
                                       int id, ns1__getAllKeywords *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getAllKeywords);
   if (id < 0)
     return soap->error;
@@ -135599,28 +135948,28 @@ SOAP_FMAC3 ns1__getAllKeywords **SOAP_FMAC4
 soap_in_PointerTons1__getAllKeywords(struct soap *soap, const char *tag,
                                      ns1__getAllKeywords **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getAllKeywords **)soap_malloc(
               soap, sizeof(ns1__getAllKeywords *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getAllKeywords *)soap_instantiate_ns1__getAllKeywords(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getAllKeywords **p = (ns1__getAllKeywords **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getAllKeywords,
         sizeof(ns1__getAllKeywords), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -135629,7 +135978,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getAllKeywords(struct soap *soap,
                                       ns1__getAllKeywords *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getAllKeywords);
   if (soap_out_PointerTons1__getAllKeywords(
           soap, tag ? tag : "ns1:getAllKeywords", id, a, type))
@@ -135643,7 +135992,7 @@ soap_get_PointerTons1__getAllKeywords(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__getAllKeywords(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -135660,7 +136009,7 @@ soap_serialize_PointerTons1__getKeywordsForUserTypeResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getKeywordsForUserTypeResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getKeywordsForUserTypeResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getKeywordsForUserTypeResponse);
   if (id < 0)
     return soap->error;
@@ -135671,22 +136020,22 @@ SOAP_FMAC3 ns1__getKeywordsForUserTypeResponse **SOAP_FMAC4
 soap_in_PointerTons1__getKeywordsForUserTypeResponse(
     struct soap *soap, const char *tag, ns1__getKeywordsForUserTypeResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getKeywordsForUserTypeResponse **)soap_malloc(
               soap, sizeof(ns1__getKeywordsForUserTypeResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getKeywordsForUserTypeResponse *)
               soap_instantiate_ns1__getKeywordsForUserTypeResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getKeywordsForUserTypeResponse **p =
         (ns1__getKeywordsForUserTypeResponse **)soap_id_lookup(
@@ -135695,7 +136044,7 @@ soap_in_PointerTons1__getKeywordsForUserTypeResponse(
             sizeof(ns1__getKeywordsForUserTypeResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -135704,7 +136053,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getKeywordsForUserTypeResponse(
     struct soap *soap, ns1__getKeywordsForUserTypeResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUserTypeResponse);
   if (soap_out_PointerTons1__getKeywordsForUserTypeResponse(
           soap, tag ? tag : "ns1:getKeywordsForUserTypeResponse", id, a, type))
@@ -135719,7 +136068,7 @@ soap_get_PointerTons1__getKeywordsForUserTypeResponse(
   if ((p = soap_in_PointerTons1__getKeywordsForUserTypeResponse(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -135734,7 +136083,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__getKeywordsForUserType(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getKeywordsForUserType(
     struct soap *soap, const char *tag, int id,
     ns1__getKeywordsForUserType *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getKeywordsForUserType);
   if (id < 0)
     return soap->error;
@@ -135745,22 +136094,22 @@ SOAP_FMAC3 ns1__getKeywordsForUserType **SOAP_FMAC4
 soap_in_PointerTons1__getKeywordsForUserType(struct soap *soap, const char *tag,
                                              ns1__getKeywordsForUserType **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getKeywordsForUserType **)soap_malloc(
               soap, sizeof(ns1__getKeywordsForUserType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getKeywordsForUserType *)
               soap_instantiate_ns1__getKeywordsForUserType(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getKeywordsForUserType **p =
         (ns1__getKeywordsForUserType **)soap_id_lookup(
@@ -135769,7 +136118,7 @@ soap_in_PointerTons1__getKeywordsForUserType(struct soap *soap, const char *tag,
             sizeof(ns1__getKeywordsForUserType), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -135777,7 +136126,7 @@ soap_in_PointerTons1__getKeywordsForUserType(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getKeywordsForUserType(
     struct soap *soap, ns1__getKeywordsForUserType *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUserType);
   if (soap_out_PointerTons1__getKeywordsForUserType(
           soap, tag ? tag : "ns1:getKeywordsForUserType", id, a, type))
@@ -135792,7 +136141,7 @@ soap_get_PointerTons1__getKeywordsForUserType(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__getKeywordsForUserType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -135809,7 +136158,7 @@ soap_serialize_PointerTons1__getKeywordsForUserMaxResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getKeywordsForUserMaxResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getKeywordsForUserMaxResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getKeywordsForUserMaxResponse);
   if (id < 0)
     return soap->error;
@@ -135820,22 +136169,22 @@ SOAP_FMAC3 ns1__getKeywordsForUserMaxResponse **SOAP_FMAC4
 soap_in_PointerTons1__getKeywordsForUserMaxResponse(
     struct soap *soap, const char *tag, ns1__getKeywordsForUserMaxResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getKeywordsForUserMaxResponse **)soap_malloc(
               soap, sizeof(ns1__getKeywordsForUserMaxResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getKeywordsForUserMaxResponse *)
               soap_instantiate_ns1__getKeywordsForUserMaxResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getKeywordsForUserMaxResponse **p =
         (ns1__getKeywordsForUserMaxResponse **)soap_id_lookup(
@@ -135844,7 +136193,7 @@ soap_in_PointerTons1__getKeywordsForUserMaxResponse(
             sizeof(ns1__getKeywordsForUserMaxResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -135853,7 +136202,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getKeywordsForUserMaxResponse(
     struct soap *soap, ns1__getKeywordsForUserMaxResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUserMaxResponse);
   if (soap_out_PointerTons1__getKeywordsForUserMaxResponse(
           soap, tag ? tag : "ns1:getKeywordsForUserMaxResponse", id, a, type))
@@ -135868,7 +136217,7 @@ soap_get_PointerTons1__getKeywordsForUserMaxResponse(
   if ((p = soap_in_PointerTons1__getKeywordsForUserMaxResponse(soap, tag, p,
                                                                type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -135883,7 +136232,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__getKeywordsForUserMax(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getKeywordsForUserMax(
     struct soap *soap, const char *tag, int id,
     ns1__getKeywordsForUserMax *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getKeywordsForUserMax);
   if (id < 0)
     return soap->error;
@@ -135894,22 +136243,22 @@ SOAP_FMAC3 ns1__getKeywordsForUserMax **SOAP_FMAC4
 soap_in_PointerTons1__getKeywordsForUserMax(struct soap *soap, const char *tag,
                                             ns1__getKeywordsForUserMax **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getKeywordsForUserMax **)soap_malloc(
               soap, sizeof(ns1__getKeywordsForUserMax *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getKeywordsForUserMax *)
               soap_instantiate_ns1__getKeywordsForUserMax(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getKeywordsForUserMax **p =
         (ns1__getKeywordsForUserMax **)soap_id_lookup(
@@ -135918,7 +136267,7 @@ soap_in_PointerTons1__getKeywordsForUserMax(struct soap *soap, const char *tag,
             sizeof(ns1__getKeywordsForUserMax), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -135926,7 +136275,7 @@ soap_in_PointerTons1__getKeywordsForUserMax(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getKeywordsForUserMax(
     struct soap *soap, ns1__getKeywordsForUserMax *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUserMax);
   if (soap_out_PointerTons1__getKeywordsForUserMax(
           soap, tag ? tag : "ns1:getKeywordsForUserMax", id, a, type))
@@ -135941,7 +136290,7 @@ soap_get_PointerTons1__getKeywordsForUserMax(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__getKeywordsForUserMax(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -135961,7 +136310,7 @@ soap_out_PointerTons1__getKeywordsForUserStartWithMaxResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getKeywordsForUserStartWithMaxResponse *const *a, const char *type) {
   id = soap_element_id(
-      soap, tag, id, *a, NULL, 0, type,
+      soap, tag, id, *a, nullptr, 0, type,
       SOAP_TYPE_ICat3_ns1__getKeywordsForUserStartWithMaxResponse);
   if (id < 0)
     return soap->error;
@@ -135972,22 +136321,22 @@ SOAP_FMAC3 ns1__getKeywordsForUserStartWithMaxResponse **SOAP_FMAC4
 soap_in_PointerTons1__getKeywordsForUserStartWithMaxResponse(
     struct soap *soap, const char *tag,
     ns1__getKeywordsForUserStartWithMaxResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getKeywordsForUserStartWithMaxResponse **)soap_malloc(
               soap, sizeof(ns1__getKeywordsForUserStartWithMaxResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getKeywordsForUserStartWithMaxResponse *)
               soap_instantiate_ns1__getKeywordsForUserStartWithMaxResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getKeywordsForUserStartWithMaxResponse **p =
         (ns1__getKeywordsForUserStartWithMaxResponse **)soap_id_lookup(
@@ -135996,7 +136345,7 @@ soap_in_PointerTons1__getKeywordsForUserStartWithMaxResponse(
             sizeof(ns1__getKeywordsForUserStartWithMaxResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -136006,7 +136355,7 @@ soap_put_PointerTons1__getKeywordsForUserStartWithMaxResponse(
     struct soap *soap, ns1__getKeywordsForUserStartWithMaxResponse *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUserStartWithMaxResponse);
   if (soap_out_PointerTons1__getKeywordsForUserStartWithMaxResponse(
           soap, tag ? tag : "ns1:getKeywordsForUserStartWithMaxResponse", id, a,
@@ -136022,7 +136371,7 @@ soap_get_PointerTons1__getKeywordsForUserStartWithMaxResponse(
   if ((p = soap_in_PointerTons1__getKeywordsForUserStartWithMaxResponse(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -136039,7 +136388,7 @@ soap_serialize_PointerTons1__getKeywordsForUserStartWithMax(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getKeywordsForUserStartWithMax(
     struct soap *soap, const char *tag, int id,
     ns1__getKeywordsForUserStartWithMax *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getKeywordsForUserStartWithMax);
   if (id < 0)
     return soap->error;
@@ -136050,22 +136399,22 @@ SOAP_FMAC3 ns1__getKeywordsForUserStartWithMax **SOAP_FMAC4
 soap_in_PointerTons1__getKeywordsForUserStartWithMax(
     struct soap *soap, const char *tag, ns1__getKeywordsForUserStartWithMax **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getKeywordsForUserStartWithMax **)soap_malloc(
               soap, sizeof(ns1__getKeywordsForUserStartWithMax *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getKeywordsForUserStartWithMax *)
               soap_instantiate_ns1__getKeywordsForUserStartWithMax(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getKeywordsForUserStartWithMax **p =
         (ns1__getKeywordsForUserStartWithMax **)soap_id_lookup(
@@ -136074,7 +136423,7 @@ soap_in_PointerTons1__getKeywordsForUserStartWithMax(
             sizeof(ns1__getKeywordsForUserStartWithMax), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -136083,7 +136432,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getKeywordsForUserStartWithMax(
     struct soap *soap, ns1__getKeywordsForUserStartWithMax *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUserStartWithMax);
   if (soap_out_PointerTons1__getKeywordsForUserStartWithMax(
           soap, tag ? tag : "ns1:getKeywordsForUserStartWithMax", id, a, type))
@@ -136098,7 +136447,7 @@ soap_get_PointerTons1__getKeywordsForUserStartWithMax(
   if ((p = soap_in_PointerTons1__getKeywordsForUserStartWithMax(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -136115,7 +136464,7 @@ soap_serialize_PointerTons1__getKeywordsForUserResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getKeywordsForUserResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getKeywordsForUserResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getKeywordsForUserResponse);
   if (id < 0)
     return soap->error;
@@ -136126,22 +136475,22 @@ SOAP_FMAC3 ns1__getKeywordsForUserResponse **SOAP_FMAC4
 soap_in_PointerTons1__getKeywordsForUserResponse(
     struct soap *soap, const char *tag, ns1__getKeywordsForUserResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getKeywordsForUserResponse **)soap_malloc(
               soap, sizeof(ns1__getKeywordsForUserResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getKeywordsForUserResponse *)
               soap_instantiate_ns1__getKeywordsForUserResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getKeywordsForUserResponse **p =
         (ns1__getKeywordsForUserResponse **)soap_id_lookup(
@@ -136150,7 +136499,7 @@ soap_in_PointerTons1__getKeywordsForUserResponse(
             sizeof(ns1__getKeywordsForUserResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -136158,7 +136507,7 @@ soap_in_PointerTons1__getKeywordsForUserResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getKeywordsForUserResponse(
     struct soap *soap, ns1__getKeywordsForUserResponse *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUserResponse);
   if (soap_out_PointerTons1__getKeywordsForUserResponse(
           soap, tag ? tag : "ns1:getKeywordsForUserResponse", id, a, type))
@@ -136173,7 +136522,7 @@ soap_get_PointerTons1__getKeywordsForUserResponse(
   if ((p = soap_in_PointerTons1__getKeywordsForUserResponse(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -136190,7 +136539,7 @@ soap_out_PointerTons1__getKeywordsForUser(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__getKeywordsForUser *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__getKeywordsForUser);
   if (id < 0)
     return soap->error;
@@ -136201,29 +136550,29 @@ SOAP_FMAC3 ns1__getKeywordsForUser **SOAP_FMAC4
 soap_in_PointerTons1__getKeywordsForUser(struct soap *soap, const char *tag,
                                          ns1__getKeywordsForUser **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getKeywordsForUser **)soap_malloc(
               soap, sizeof(ns1__getKeywordsForUser *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getKeywordsForUser *)
-              soap_instantiate_ns1__getKeywordsForUser(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__getKeywordsForUser(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getKeywordsForUser **p = (ns1__getKeywordsForUser **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__getKeywordsForUser,
         sizeof(ns1__getKeywordsForUser), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -136232,7 +136581,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getKeywordsForUser(struct soap *soap,
                                           ns1__getKeywordsForUser *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__getKeywordsForUser);
   if (soap_out_PointerTons1__getKeywordsForUser(
           soap, tag ? tag : "ns1:getKeywordsForUser", id, a, type))
@@ -136246,7 +136595,7 @@ soap_get_PointerTons1__getKeywordsForUser(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getKeywordsForUser(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -136261,7 +136610,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__isSessionValidResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__isSessionValidResponse(
     struct soap *soap, const char *tag, int id,
     ns1__isSessionValidResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__isSessionValidResponse);
   if (id < 0)
     return soap->error;
@@ -136272,22 +136621,22 @@ SOAP_FMAC3 ns1__isSessionValidResponse **SOAP_FMAC4
 soap_in_PointerTons1__isSessionValidResponse(struct soap *soap, const char *tag,
                                              ns1__isSessionValidResponse **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__isSessionValidResponse **)soap_malloc(
               soap, sizeof(ns1__isSessionValidResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__isSessionValidResponse *)
               soap_instantiate_ns1__isSessionValidResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__isSessionValidResponse **p =
         (ns1__isSessionValidResponse **)soap_id_lookup(
@@ -136296,7 +136645,7 @@ soap_in_PointerTons1__isSessionValidResponse(struct soap *soap, const char *tag,
             sizeof(ns1__isSessionValidResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -136304,7 +136653,7 @@ soap_in_PointerTons1__isSessionValidResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__isSessionValidResponse(
     struct soap *soap, ns1__isSessionValidResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__isSessionValidResponse);
   if (soap_out_PointerTons1__isSessionValidResponse(
           soap, tag ? tag : "ns1:isSessionValidResponse", id, a, type))
@@ -136319,7 +136668,7 @@ soap_get_PointerTons1__isSessionValidResponse(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__isSessionValidResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -136336,7 +136685,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__isSessionValid(struct soap *soap, const char *tag,
                                       int id, ns1__isSessionValid *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__isSessionValid);
   if (id < 0)
     return soap->error;
@@ -136347,28 +136696,28 @@ SOAP_FMAC3 ns1__isSessionValid **SOAP_FMAC4
 soap_in_PointerTons1__isSessionValid(struct soap *soap, const char *tag,
                                      ns1__isSessionValid **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__isSessionValid **)soap_malloc(
               soap, sizeof(ns1__isSessionValid *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__isSessionValid *)soap_instantiate_ns1__isSessionValid(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__isSessionValid **p = (ns1__isSessionValid **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__isSessionValid,
         sizeof(ns1__isSessionValid), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -136377,7 +136726,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__isSessionValid(struct soap *soap,
                                       ns1__isSessionValid *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__isSessionValid);
   if (soap_out_PointerTons1__isSessionValid(
           soap, tag ? tag : "ns1:isSessionValid", id, a, type))
@@ -136391,7 +136740,7 @@ soap_get_PointerTons1__isSessionValid(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__isSessionValid(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -136406,7 +136755,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons3__getUserDetailsResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons3__getUserDetailsResponse(
     struct soap *soap, const char *tag, int id,
     ns3__getUserDetailsResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns3__getUserDetailsResponse);
   if (id < 0)
     return soap->error;
@@ -136417,22 +136766,22 @@ SOAP_FMAC3 ns3__getUserDetailsResponse **SOAP_FMAC4
 soap_in_PointerTons3__getUserDetailsResponse(struct soap *soap, const char *tag,
                                              ns3__getUserDetailsResponse **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns3__getUserDetailsResponse **)soap_malloc(
               soap, sizeof(ns3__getUserDetailsResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns3__getUserDetailsResponse *)
               soap_instantiate_ns3__getUserDetailsResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns3__getUserDetailsResponse **p =
         (ns3__getUserDetailsResponse **)soap_id_lookup(
@@ -136441,7 +136790,7 @@ soap_in_PointerTons3__getUserDetailsResponse(struct soap *soap, const char *tag,
             sizeof(ns3__getUserDetailsResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -136449,7 +136798,7 @@ soap_in_PointerTons3__getUserDetailsResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons3__getUserDetailsResponse(
     struct soap *soap, ns3__getUserDetailsResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons3__getUserDetailsResponse);
   if (soap_out_PointerTons3__getUserDetailsResponse(
           soap, tag ? tag : "ns3:getUserDetailsResponse", id, a, type))
@@ -136464,7 +136813,7 @@ soap_get_PointerTons3__getUserDetailsResponse(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons3__getUserDetailsResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -136481,7 +136830,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons3__getUserDetails(struct soap *soap, const char *tag,
                                       int id, ns3__getUserDetails *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns3__getUserDetails);
   if (id < 0)
     return soap->error;
@@ -136492,28 +136841,28 @@ SOAP_FMAC3 ns3__getUserDetails **SOAP_FMAC4
 soap_in_PointerTons3__getUserDetails(struct soap *soap, const char *tag,
                                      ns3__getUserDetails **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns3__getUserDetails **)soap_malloc(
               soap, sizeof(ns3__getUserDetails *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns3__getUserDetails *)soap_instantiate_ns3__getUserDetails(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns3__getUserDetails **p = (ns3__getUserDetails **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns3__getUserDetails,
         sizeof(ns3__getUserDetails), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -136522,7 +136871,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons3__getUserDetails(struct soap *soap,
                                       ns3__getUserDetails *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons3__getUserDetails);
   if (soap_out_PointerTons3__getUserDetails(
           soap, tag ? tag : "ns3:getUserDetails", id, a, type))
@@ -136536,7 +136885,7 @@ soap_get_PointerTons3__getUserDetails(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons3__getUserDetails(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -136553,7 +136902,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__logoutResponse(struct soap *soap, const char *tag,
                                       int id, ns1__logoutResponse *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__logoutResponse);
   if (id < 0)
     return soap->error;
@@ -136564,28 +136913,28 @@ SOAP_FMAC3 ns1__logoutResponse **SOAP_FMAC4
 soap_in_PointerTons1__logoutResponse(struct soap *soap, const char *tag,
                                      ns1__logoutResponse **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__logoutResponse **)soap_malloc(
               soap, sizeof(ns1__logoutResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__logoutResponse *)soap_instantiate_ns1__logoutResponse(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__logoutResponse **p = (ns1__logoutResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__logoutResponse,
         sizeof(ns1__logoutResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -136594,7 +136943,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__logoutResponse(struct soap *soap,
                                       ns1__logoutResponse *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__logoutResponse);
   if (soap_out_PointerTons1__logoutResponse(
           soap, tag ? tag : "ns1:logoutResponse", id, a, type))
@@ -136608,7 +136957,7 @@ soap_get_PointerTons1__logoutResponse(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__logoutResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -136623,7 +136972,7 @@ soap_serialize_PointerTons1__logout(struct soap *soap, ns1__logout *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__logout(struct soap *soap, const char *tag, int id,
                               ns1__logout *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__logout);
   if (id < 0)
     return soap->error;
@@ -136633,27 +136982,27 @@ soap_out_PointerTons1__logout(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__logout **SOAP_FMAC4
 soap_in_PointerTons1__logout(struct soap *soap, const char *tag,
                              ns1__logout **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__logout **)soap_malloc(soap, sizeof(ns1__logout *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__logout *)soap_instantiate_ns1__logout(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__logout **p = (ns1__logout **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__logout,
         sizeof(ns1__logout), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -136661,7 +137010,7 @@ soap_in_PointerTons1__logout(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__logout(struct soap *soap, ns1__logout *const *a,
                               const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__logout);
   if (soap_out_PointerTons1__logout(soap, tag ? tag : "ns1:logout", id, a,
                                     type))
@@ -136674,7 +137023,7 @@ soap_get_PointerTons1__logout(struct soap *soap, ns1__logout **p,
                               const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__logout(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -136689,7 +137038,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__loginLifetimeResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__loginLifetimeResponse(
     struct soap *soap, const char *tag, int id,
     ns1__loginLifetimeResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__loginLifetimeResponse);
   if (id < 0)
     return soap->error;
@@ -136700,22 +137049,22 @@ SOAP_FMAC3 ns1__loginLifetimeResponse **SOAP_FMAC4
 soap_in_PointerTons1__loginLifetimeResponse(struct soap *soap, const char *tag,
                                             ns1__loginLifetimeResponse **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__loginLifetimeResponse **)soap_malloc(
               soap, sizeof(ns1__loginLifetimeResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__loginLifetimeResponse *)
               soap_instantiate_ns1__loginLifetimeResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__loginLifetimeResponse **p =
         (ns1__loginLifetimeResponse **)soap_id_lookup(
@@ -136724,7 +137073,7 @@ soap_in_PointerTons1__loginLifetimeResponse(struct soap *soap, const char *tag,
             sizeof(ns1__loginLifetimeResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -136732,7 +137081,7 @@ soap_in_PointerTons1__loginLifetimeResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__loginLifetimeResponse(
     struct soap *soap, ns1__loginLifetimeResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__loginLifetimeResponse);
   if (soap_out_PointerTons1__loginLifetimeResponse(
           soap, tag ? tag : "ns1:loginLifetimeResponse", id, a, type))
@@ -136747,7 +137096,7 @@ soap_get_PointerTons1__loginLifetimeResponse(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__loginLifetimeResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -136764,7 +137113,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__loginLifetime(struct soap *soap, const char *tag, int id,
                                      ns1__loginLifetime *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__loginLifetime);
   if (id < 0)
     return soap->error;
@@ -136774,28 +137123,28 @@ soap_out_PointerTons1__loginLifetime(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__loginLifetime **SOAP_FMAC4
 soap_in_PointerTons1__loginLifetime(struct soap *soap, const char *tag,
                                     ns1__loginLifetime **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__loginLifetime **)soap_malloc(soap,
                                                  sizeof(ns1__loginLifetime *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__loginLifetime *)soap_instantiate_ns1__loginLifetime(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__loginLifetime **p = (ns1__loginLifetime **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__loginLifetime,
         sizeof(ns1__loginLifetime), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -136804,7 +137153,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__loginLifetime(struct soap *soap,
                                      ns1__loginLifetime *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__loginLifetime);
   if (soap_out_PointerTons1__loginLifetime(
           soap, tag ? tag : "ns1:loginLifetime", id, a, type))
@@ -136817,7 +137166,7 @@ soap_get_PointerTons1__loginLifetime(struct soap *soap, ns1__loginLifetime **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__loginLifetime(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -136834,7 +137183,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__loginResponse(struct soap *soap, const char *tag, int id,
                                      ns1__loginResponse *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__loginResponse);
   if (id < 0)
     return soap->error;
@@ -136844,28 +137193,28 @@ soap_out_PointerTons1__loginResponse(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__loginResponse **SOAP_FMAC4
 soap_in_PointerTons1__loginResponse(struct soap *soap, const char *tag,
                                     ns1__loginResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__loginResponse **)soap_malloc(soap,
                                                  sizeof(ns1__loginResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__loginResponse *)soap_instantiate_ns1__loginResponse(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__loginResponse **p = (ns1__loginResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__loginResponse,
         sizeof(ns1__loginResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -136874,7 +137223,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__loginResponse(struct soap *soap,
                                      ns1__loginResponse *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__loginResponse);
   if (soap_out_PointerTons1__loginResponse(
           soap, tag ? tag : "ns1:loginResponse", id, a, type))
@@ -136887,7 +137236,7 @@ soap_get_PointerTons1__loginResponse(struct soap *soap, ns1__loginResponse **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__loginResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -136902,7 +137251,7 @@ soap_serialize_PointerTons1__login(struct soap *soap, ns1__login *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__login(struct soap *soap, const char *tag, int id,
                              ns1__login *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__login);
   if (id < 0)
     return soap->error;
@@ -136912,27 +137261,27 @@ soap_out_PointerTons1__login(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__login **SOAP_FMAC4
 soap_in_PointerTons1__login(struct soap *soap, const char *tag, ns1__login **a,
                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__login **)soap_malloc(soap, sizeof(ns1__login *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__login *)soap_instantiate_ns1__login(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__login **p = (ns1__login **)soap_id_lookup(soap, soap->href, (void **)a,
                                                    SOAP_TYPE_ICat3_ns1__login,
                                                    sizeof(ns1__login), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -136940,7 +137289,7 @@ soap_in_PointerTons1__login(struct soap *soap, const char *tag, ns1__login **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__login(struct soap *soap, ns1__login *const *a,
                              const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__login);
   if (soap_out_PointerTons1__login(soap, tag ? tag : "ns1:login", id, a, type))
     return soap->error;
@@ -136952,7 +137301,7 @@ soap_get_PointerTons1__login(struct soap *soap, ns1__login **p, const char *tag,
                              const char *type) {
   if ((p = soap_in_PointerTons1__login(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -136969,7 +137318,7 @@ soap_out_PointerTons3__ValidationException(struct soap *soap, const char *tag,
                                            int id,
                                            ns3__ValidationException *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns3__ValidationException);
   if (id < 0)
     return soap->error;
@@ -136980,29 +137329,29 @@ SOAP_FMAC3 ns3__ValidationException **SOAP_FMAC4
 soap_in_PointerTons3__ValidationException(struct soap *soap, const char *tag,
                                           ns3__ValidationException **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns3__ValidationException **)soap_malloc(
               soap, sizeof(ns3__ValidationException *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns3__ValidationException *)
-              soap_instantiate_ns3__ValidationException(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns3__ValidationException(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns3__ValidationException **p = (ns3__ValidationException **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns3__ValidationException,
         sizeof(ns3__ValidationException), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137011,7 +137360,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons3__ValidationException(struct soap *soap,
                                            ns3__ValidationException *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons3__ValidationException);
   if (soap_out_PointerTons3__ValidationException(
           soap, tag ? tag : "ns3:ValidationException", id, a, type))
@@ -137025,7 +137374,7 @@ soap_get_PointerTons3__ValidationException(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons3__ValidationException(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -137042,7 +137391,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons3__SessionException(struct soap *soap, const char *tag,
                                         int id, ns3__SessionException *const *a,
                                         const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns3__SessionException);
   if (id < 0)
     return soap->error;
@@ -137053,28 +137402,28 @@ SOAP_FMAC3 ns3__SessionException **SOAP_FMAC4
 soap_in_PointerTons3__SessionException(struct soap *soap, const char *tag,
                                        ns3__SessionException **a,
                                        const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns3__SessionException **)soap_malloc(
               soap, sizeof(ns3__SessionException *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns3__SessionException *)soap_instantiate_ns3__SessionException(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns3__SessionException **p = (ns3__SessionException **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns3__SessionException,
         sizeof(ns3__SessionException), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137083,7 +137432,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons3__SessionException(struct soap *soap,
                                         ns3__SessionException *const *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons3__SessionException);
   if (soap_out_PointerTons3__SessionException(
           soap, tag ? tag : "ns3:SessionException", id, a, type))
@@ -137097,7 +137446,7 @@ soap_get_PointerTons3__SessionException(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_PointerTons3__SessionException(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -137114,7 +137463,7 @@ soap_out_PointerTons3__NoSuchUserException(struct soap *soap, const char *tag,
                                            int id,
                                            ns3__NoSuchUserException *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns3__NoSuchUserException);
   if (id < 0)
     return soap->error;
@@ -137125,29 +137474,29 @@ SOAP_FMAC3 ns3__NoSuchUserException **SOAP_FMAC4
 soap_in_PointerTons3__NoSuchUserException(struct soap *soap, const char *tag,
                                           ns3__NoSuchUserException **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns3__NoSuchUserException **)soap_malloc(
               soap, sizeof(ns3__NoSuchUserException *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns3__NoSuchUserException *)
-              soap_instantiate_ns3__NoSuchUserException(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns3__NoSuchUserException(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns3__NoSuchUserException **p = (ns3__NoSuchUserException **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns3__NoSuchUserException,
         sizeof(ns3__NoSuchUserException), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137156,7 +137505,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons3__NoSuchUserException(struct soap *soap,
                                            ns3__NoSuchUserException *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons3__NoSuchUserException);
   if (soap_out_PointerTons3__NoSuchUserException(
           soap, tag ? tag : "ns3:NoSuchUserException", id, a, type))
@@ -137170,7 +137519,7 @@ soap_get_PointerTons3__NoSuchUserException(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons3__NoSuchUserException(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -137187,7 +137536,7 @@ soap_serialize_PointerTons3__NoSuchObjectFoundException(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons3__NoSuchObjectFoundException(
     struct soap *soap, const char *tag, int id,
     ns3__NoSuchObjectFoundException *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns3__NoSuchObjectFoundException);
   if (id < 0)
     return soap->error;
@@ -137198,22 +137547,22 @@ SOAP_FMAC3 ns3__NoSuchObjectFoundException **SOAP_FMAC4
 soap_in_PointerTons3__NoSuchObjectFoundException(
     struct soap *soap, const char *tag, ns3__NoSuchObjectFoundException **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns3__NoSuchObjectFoundException **)soap_malloc(
               soap, sizeof(ns3__NoSuchObjectFoundException *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns3__NoSuchObjectFoundException *)
               soap_instantiate_ns3__NoSuchObjectFoundException(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns3__NoSuchObjectFoundException **p =
         (ns3__NoSuchObjectFoundException **)soap_id_lookup(
@@ -137222,7 +137571,7 @@ soap_in_PointerTons3__NoSuchObjectFoundException(
             sizeof(ns3__NoSuchObjectFoundException), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137230,7 +137579,7 @@ soap_in_PointerTons3__NoSuchObjectFoundException(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons3__NoSuchObjectFoundException(
     struct soap *soap, ns3__NoSuchObjectFoundException *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons3__NoSuchObjectFoundException);
   if (soap_out_PointerTons3__NoSuchObjectFoundException(
           soap, tag ? tag : "ns3:NoSuchObjectFoundException", id, a, type))
@@ -137245,7 +137594,7 @@ soap_get_PointerTons3__NoSuchObjectFoundException(
   if ((p = soap_in_PointerTons3__NoSuchObjectFoundException(soap, tag, p,
                                                             type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -137263,7 +137612,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__InsufficientPrivilegesException(
     struct soap *soap, const char *tag, int id,
     ns1__InsufficientPrivilegesException *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__InsufficientPrivilegesException);
   if (id < 0)
     return soap->error;
@@ -137274,22 +137623,22 @@ SOAP_FMAC3 ns1__InsufficientPrivilegesException **SOAP_FMAC4
 soap_in_PointerTons1__InsufficientPrivilegesException(
     struct soap *soap, const char *tag,
     ns1__InsufficientPrivilegesException **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__InsufficientPrivilegesException **)soap_malloc(
               soap, sizeof(ns1__InsufficientPrivilegesException *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__InsufficientPrivilegesException *)
               soap_instantiate_ns1__InsufficientPrivilegesException(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__InsufficientPrivilegesException **p =
         (ns1__InsufficientPrivilegesException **)soap_id_lookup(
@@ -137298,7 +137647,7 @@ soap_in_PointerTons1__InsufficientPrivilegesException(
             sizeof(ns1__InsufficientPrivilegesException), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137308,7 +137657,7 @@ soap_put_PointerTons1__InsufficientPrivilegesException(
     struct soap *soap, ns1__InsufficientPrivilegesException *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__InsufficientPrivilegesException);
   if (soap_out_PointerTons1__InsufficientPrivilegesException(
           soap, tag ? tag : "ns1:InsufficientPrivilegesException", id, a, type))
@@ -137323,7 +137672,7 @@ soap_get_PointerTons1__InsufficientPrivilegesException(
   if ((p = soap_in_PointerTons1__InsufficientPrivilegesException(soap, tag, p,
                                                                  type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -137340,7 +137689,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__ICATAPIException(struct soap *soap, const char *tag,
                                         int id, ns1__ICATAPIException *const *a,
                                         const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__ICATAPIException);
   if (id < 0)
     return soap->error;
@@ -137351,28 +137700,28 @@ SOAP_FMAC3 ns1__ICATAPIException **SOAP_FMAC4
 soap_in_PointerTons1__ICATAPIException(struct soap *soap, const char *tag,
                                        ns1__ICATAPIException **a,
                                        const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__ICATAPIException **)soap_malloc(
               soap, sizeof(ns1__ICATAPIException *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__ICATAPIException *)soap_instantiate_ns1__ICATAPIException(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__ICATAPIException **p = (ns1__ICATAPIException **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__ICATAPIException,
         sizeof(ns1__ICATAPIException), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137381,7 +137730,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__ICATAPIException(struct soap *soap,
                                         ns1__ICATAPIException *const *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__ICATAPIException);
   if (soap_out_PointerTons1__ICATAPIException(
           soap, tag ? tag : "ns1:ICATAPIException", id, a, type))
@@ -137395,7 +137744,7 @@ soap_get_PointerTons1__ICATAPIException(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__ICATAPIException(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -137411,7 +137760,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__parameterType(struct soap *soap, const char *tag, int id,
                                      enum ns1__parameterType *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__parameterType);
   if (id < 0)
     return soap->error;
@@ -137422,23 +137771,23 @@ SOAP_FMAC3 enum ns1__parameterType **SOAP_FMAC4
 soap_in_PointerTons1__parameterType(struct soap *soap, const char *tag,
                                     enum ns1__parameterType **a,
                                     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__parameterType **)soap_malloc(
               soap, sizeof(enum ns1__parameterType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__parameterType(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__parameterType **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__parameterType,
         sizeof(enum ns1__parameterType), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137447,7 +137796,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__parameterType(struct soap *soap,
                                      enum ns1__parameterType *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__parameterType);
   if (soap_out_PointerTons1__parameterType(
           soap, tag ? tag : "ns1:parameterType", id, a, type))
@@ -137461,7 +137810,7 @@ soap_get_PointerTons1__parameterType(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__parameterType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -137475,7 +137824,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__comparisonOperator(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__comparisonOperator(
     struct soap *soap, const char *tag, int id,
     enum ns1__comparisonOperator *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__comparisonOperator);
   if (id < 0)
     return soap->error;
@@ -137486,23 +137835,23 @@ SOAP_FMAC3 enum ns1__comparisonOperator **SOAP_FMAC4
 soap_in_PointerTons1__comparisonOperator(struct soap *soap, const char *tag,
                                          enum ns1__comparisonOperator **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__comparisonOperator **)soap_malloc(
               soap, sizeof(enum ns1__comparisonOperator *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__comparisonOperator(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__comparisonOperator **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__comparisonOperator,
         sizeof(enum ns1__comparisonOperator), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137510,7 +137859,7 @@ soap_in_PointerTons1__comparisonOperator(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__comparisonOperator(
     struct soap *soap, enum ns1__comparisonOperator *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__comparisonOperator);
   if (soap_out_PointerTons1__comparisonOperator(
           soap, tag ? tag : "ns1:comparisonOperator", id, a, type))
@@ -137524,7 +137873,7 @@ soap_get_PointerTons1__comparisonOperator(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__comparisonOperator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -137540,7 +137889,7 @@ soap_out_PointerTons1__logicalOperator(struct soap *soap, const char *tag,
                                        int id,
                                        enum ns1__logicalOperator *const *a,
                                        const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__logicalOperator);
   if (id < 0)
     return soap->error;
@@ -137551,23 +137900,23 @@ SOAP_FMAC3 enum ns1__logicalOperator **SOAP_FMAC4
 soap_in_PointerTons1__logicalOperator(struct soap *soap, const char *tag,
                                       enum ns1__logicalOperator **a,
                                       const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__logicalOperator **)soap_malloc(
               soap, sizeof(enum ns1__logicalOperator *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__logicalOperator(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__logicalOperator **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__logicalOperator,
         sizeof(enum ns1__logicalOperator), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137576,7 +137925,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__logicalOperator(struct soap *soap,
                                        enum ns1__logicalOperator *const *a,
                                        const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__logicalOperator);
   if (soap_out_PointerTons1__logicalOperator(
           soap, tag ? tag : "ns1:logicalOperator", id, a, type))
@@ -137590,7 +137939,7 @@ soap_get_PointerTons1__logicalOperator(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__logicalOperator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -137606,7 +137955,7 @@ soap_serialize_PointerTons1__shiftPK(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__shiftPK(struct soap *soap, const char *tag, int id,
                                ns1__shiftPK *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__shiftPK);
   if (id < 0)
     return soap->error;
@@ -137616,27 +137965,27 @@ soap_out_PointerTons1__shiftPK(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__shiftPK **SOAP_FMAC4
 soap_in_PointerTons1__shiftPK(struct soap *soap, const char *tag,
                               ns1__shiftPK **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__shiftPK **)soap_malloc(soap, sizeof(ns1__shiftPK *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__shiftPK *)soap_instantiate_ns1__shiftPK(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__shiftPK **p = (ns1__shiftPK **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__shiftPK,
         sizeof(ns1__shiftPK), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137644,7 +137993,7 @@ soap_in_PointerTons1__shiftPK(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__shiftPK(struct soap *soap, ns1__shiftPK *const *a,
                                const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__shiftPK);
   if (soap_out_PointerTons1__shiftPK(soap, tag ? tag : "ns1:shiftPK", id, a,
                                      type))
@@ -137657,7 +138006,7 @@ soap_get_PointerTons1__shiftPK(struct soap *soap, ns1__shiftPK **p,
                                const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__shiftPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -137672,7 +138021,7 @@ soap_serialize_PointerTons1__shift(struct soap *soap, ns1__shift *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__shift(struct soap *soap, const char *tag, int id,
                              ns1__shift *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__shift);
   if (id < 0)
     return soap->error;
@@ -137682,27 +138031,27 @@ soap_out_PointerTons1__shift(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__shift **SOAP_FMAC4
 soap_in_PointerTons1__shift(struct soap *soap, const char *tag, ns1__shift **a,
                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__shift **)soap_malloc(soap, sizeof(ns1__shift *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__shift *)soap_instantiate_ns1__shift(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__shift **p = (ns1__shift **)soap_id_lookup(soap, soap->href, (void **)a,
                                                    SOAP_TYPE_ICat3_ns1__shift,
                                                    sizeof(ns1__shift), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137710,7 +138059,7 @@ soap_in_PointerTons1__shift(struct soap *soap, const char *tag, ns1__shift **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__shift(struct soap *soap, ns1__shift *const *a,
                              const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__shift);
   if (soap_out_PointerTons1__shift(soap, tag ? tag : "ns1:shift", id, a, type))
     return soap->error;
@@ -137722,7 +138071,7 @@ soap_get_PointerTons1__shift(struct soap *soap, ns1__shift **p, const char *tag,
                              const char *type) {
   if ((p = soap_in_PointerTons1__shift(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -137739,7 +138088,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__parameterPK(struct soap *soap, const char *tag, int id,
                                    ns1__parameterPK *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__parameterPK);
   if (id < 0)
     return soap->error;
@@ -137749,28 +138098,28 @@ soap_out_PointerTons1__parameterPK(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__parameterPK **SOAP_FMAC4
 soap_in_PointerTons1__parameterPK(struct soap *soap, const char *tag,
                                   ns1__parameterPK **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__parameterPK **)soap_malloc(soap,
                                                sizeof(ns1__parameterPK *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__parameterPK *)soap_instantiate_ns1__parameterPK(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__parameterPK **p = (ns1__parameterPK **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__parameterPK,
         sizeof(ns1__parameterPK), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137779,7 +138128,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__parameterPK(struct soap *soap,
                                    ns1__parameterPK *const *a, const char *tag,
                                    const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__parameterPK);
   if (soap_out_PointerTons1__parameterPK(soap, tag ? tag : "ns1:parameterPK",
                                          id, a, type))
@@ -137792,7 +138141,7 @@ soap_get_PointerTons1__parameterPK(struct soap *soap, ns1__parameterPK **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__parameterPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -137809,7 +138158,7 @@ soap_out_PointerTons1__relatedDatafilesPK(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__relatedDatafilesPK *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__relatedDatafilesPK);
   if (id < 0)
     return soap->error;
@@ -137820,29 +138169,29 @@ SOAP_FMAC3 ns1__relatedDatafilesPK **SOAP_FMAC4
 soap_in_PointerTons1__relatedDatafilesPK(struct soap *soap, const char *tag,
                                          ns1__relatedDatafilesPK **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__relatedDatafilesPK **)soap_malloc(
               soap, sizeof(ns1__relatedDatafilesPK *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__relatedDatafilesPK *)
-              soap_instantiate_ns1__relatedDatafilesPK(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__relatedDatafilesPK(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__relatedDatafilesPK **p = (ns1__relatedDatafilesPK **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__relatedDatafilesPK,
         sizeof(ns1__relatedDatafilesPK), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137851,7 +138200,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__relatedDatafilesPK(struct soap *soap,
                                           ns1__relatedDatafilesPK *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__relatedDatafilesPK);
   if (soap_out_PointerTons1__relatedDatafilesPK(
           soap, tag ? tag : "ns1:relatedDatafilesPK", id, a, type))
@@ -137865,7 +138214,7 @@ soap_get_PointerTons1__relatedDatafilesPK(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__relatedDatafilesPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -137882,7 +138231,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__datafileFormatPK(struct soap *soap, const char *tag,
                                         int id, ns1__datafileFormatPK *const *a,
                                         const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__datafileFormatPK);
   if (id < 0)
     return soap->error;
@@ -137893,28 +138242,28 @@ SOAP_FMAC3 ns1__datafileFormatPK **SOAP_FMAC4
 soap_in_PointerTons1__datafileFormatPK(struct soap *soap, const char *tag,
                                        ns1__datafileFormatPK **a,
                                        const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__datafileFormatPK **)soap_malloc(
               soap, sizeof(ns1__datafileFormatPK *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__datafileFormatPK *)soap_instantiate_ns1__datafileFormatPK(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__datafileFormatPK **p = (ns1__datafileFormatPK **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__datafileFormatPK,
         sizeof(ns1__datafileFormatPK), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137923,7 +138272,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__datafileFormatPK(struct soap *soap,
                                         ns1__datafileFormatPK *const *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__datafileFormatPK);
   if (soap_out_PointerTons1__datafileFormatPK(
           soap, tag ? tag : "ns1:datafileFormatPK", id, a, type))
@@ -137937,7 +138286,7 @@ soap_get_PointerTons1__datafileFormatPK(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__datafileFormatPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -137954,7 +138303,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__relatedDatafiles(struct soap *soap, const char *tag,
                                         int id, ns1__relatedDatafiles *const *a,
                                         const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__relatedDatafiles);
   if (id < 0)
     return soap->error;
@@ -137965,28 +138314,28 @@ SOAP_FMAC3 ns1__relatedDatafiles **SOAP_FMAC4
 soap_in_PointerTons1__relatedDatafiles(struct soap *soap, const char *tag,
                                        ns1__relatedDatafiles **a,
                                        const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__relatedDatafiles **)soap_malloc(
               soap, sizeof(ns1__relatedDatafiles *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__relatedDatafiles *)soap_instantiate_ns1__relatedDatafiles(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__relatedDatafiles **p = (ns1__relatedDatafiles **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__relatedDatafiles,
         sizeof(ns1__relatedDatafiles), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -137995,7 +138344,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__relatedDatafiles(struct soap *soap,
                                         ns1__relatedDatafiles *const *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__relatedDatafiles);
   if (soap_out_PointerTons1__relatedDatafiles(
           soap, tag ? tag : "ns1:relatedDatafiles", id, a, type))
@@ -138009,7 +138358,7 @@ soap_get_PointerTons1__relatedDatafiles(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__relatedDatafiles(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138023,7 +138372,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__parameterValueType(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__parameterValueType(
     struct soap *soap, const char *tag, int id,
     enum ns1__parameterValueType *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__parameterValueType);
   if (id < 0)
     return soap->error;
@@ -138034,23 +138383,23 @@ SOAP_FMAC3 enum ns1__parameterValueType **SOAP_FMAC4
 soap_in_PointerTons1__parameterValueType(struct soap *soap, const char *tag,
                                          enum ns1__parameterValueType **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__parameterValueType **)soap_malloc(
               soap, sizeof(enum ns1__parameterValueType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__parameterValueType(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__parameterValueType **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__parameterValueType,
         sizeof(enum ns1__parameterValueType), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138058,7 +138407,7 @@ soap_in_PointerTons1__parameterValueType(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__parameterValueType(
     struct soap *soap, enum ns1__parameterValueType *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__parameterValueType);
   if (soap_out_PointerTons1__parameterValueType(
           soap, tag ? tag : "ns1:parameterValueType", id, a, type))
@@ -138072,7 +138421,7 @@ soap_get_PointerTons1__parameterValueType(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__parameterValueType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138088,7 +138437,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__sampleInclude(struct soap *soap, const char *tag, int id,
                                      enum ns1__sampleInclude *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__sampleInclude);
   if (id < 0)
     return soap->error;
@@ -138099,23 +138448,23 @@ SOAP_FMAC3 enum ns1__sampleInclude **SOAP_FMAC4
 soap_in_PointerTons1__sampleInclude(struct soap *soap, const char *tag,
                                     enum ns1__sampleInclude **a,
                                     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__sampleInclude **)soap_malloc(
               soap, sizeof(enum ns1__sampleInclude *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__sampleInclude(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__sampleInclude **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__sampleInclude,
         sizeof(enum ns1__sampleInclude), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138124,7 +138473,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__sampleInclude(struct soap *soap,
                                      enum ns1__sampleInclude *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__sampleInclude);
   if (soap_out_PointerTons1__sampleInclude(
           soap, tag ? tag : "ns1:sampleInclude", id, a, type))
@@ -138138,7 +138487,7 @@ soap_get_PointerTons1__sampleInclude(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__sampleInclude(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138152,7 +138501,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__restrictionAttributes(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__restrictionAttributes(
     struct soap *soap, const char *tag, int id,
     enum ns1__restrictionAttributes *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__restrictionAttributes);
   if (id < 0)
     return soap->error;
@@ -138163,24 +138512,24 @@ SOAP_FMAC3 enum ns1__restrictionAttributes **SOAP_FMAC4
 soap_in_PointerTons1__restrictionAttributes(struct soap *soap, const char *tag,
                                             enum ns1__restrictionAttributes **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__restrictionAttributes **)soap_malloc(
               soap, sizeof(enum ns1__restrictionAttributes *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__restrictionAttributes(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__restrictionAttributes **)soap_id_lookup(
         soap, soap->href, (void **)a,
         SOAP_TYPE_ICat3_ns1__restrictionAttributes,
         sizeof(enum ns1__restrictionAttributes), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138188,7 +138537,7 @@ soap_in_PointerTons1__restrictionAttributes(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__restrictionAttributes(
     struct soap *soap, enum ns1__restrictionAttributes *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__restrictionAttributes);
   if (soap_out_PointerTons1__restrictionAttributes(
           soap, tag ? tag : "ns1:restrictionAttributes", id, a, type))
@@ -138202,7 +138551,7 @@ soap_get_PointerTons1__restrictionAttributes(
     const char *type) {
   if ((p = soap_in_PointerTons1__restrictionAttributes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138216,7 +138565,8 @@ soap_serialize_PointerToint(struct soap *soap, int *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerToint(struct soap *soap, const char *tag, int id, int *const *a,
                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ICat3_int);
+  id =
+      soap_element_id(soap, tag, id, *a, nullptr, 0, type, SOAP_TYPE_ICat3_int);
   if (id < 0)
     return soap->error;
   return soap_out_int(soap, tag, id, *a, type);
@@ -138225,21 +138575,21 @@ soap_out_PointerToint(struct soap *soap, const char *tag, int id, int *const *a,
 SOAP_FMAC3 int **SOAP_FMAC4 soap_in_PointerToint(struct soap *soap,
                                                  const char *tag, int **a,
                                                  const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (int **)soap_malloc(soap, sizeof(int *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_int(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (int **)soap_id_lookup(soap, soap->href, (void **)a,
                                SOAP_TYPE_ICat3_int, sizeof(int), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138247,8 +138597,8 @@ SOAP_FMAC3 int **SOAP_FMAC4 soap_in_PointerToint(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerToint(struct soap *soap,
                                                 int *const *a, const char *tag,
                                                 const char *type) {
-  int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat3_PointerToint);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
+                      SOAP_TYPE_ICat3_PointerToint);
   if (soap_out_PointerToint(soap, tag ? tag : "int", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -138259,7 +138609,7 @@ SOAP_FMAC3 int **SOAP_FMAC4 soap_get_PointerToint(struct soap *soap, int **p,
                                                   const char *type) {
   if ((p = soap_in_PointerToint(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138275,7 +138625,7 @@ soap_out_PointerTons1__datafileInclude(struct soap *soap, const char *tag,
                                        int id,
                                        enum ns1__datafileInclude *const *a,
                                        const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__datafileInclude);
   if (id < 0)
     return soap->error;
@@ -138286,23 +138636,23 @@ SOAP_FMAC3 enum ns1__datafileInclude **SOAP_FMAC4
 soap_in_PointerTons1__datafileInclude(struct soap *soap, const char *tag,
                                       enum ns1__datafileInclude **a,
                                       const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__datafileInclude **)soap_malloc(
               soap, sizeof(enum ns1__datafileInclude *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__datafileInclude(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__datafileInclude **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__datafileInclude,
         sizeof(enum ns1__datafileInclude), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138311,7 +138661,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__datafileInclude(struct soap *soap,
                                        enum ns1__datafileInclude *const *a,
                                        const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__datafileInclude);
   if (soap_out_PointerTons1__datafileInclude(
           soap, tag ? tag : "ns1:datafileInclude", id, a, type))
@@ -138325,7 +138675,7 @@ soap_get_PointerTons1__datafileInclude(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__datafileInclude(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138342,7 +138692,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__userDetails(struct soap *soap, const char *tag, int id,
                                    ns1__userDetails *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__userDetails);
   if (id < 0)
     return soap->error;
@@ -138352,28 +138702,28 @@ soap_out_PointerTons1__userDetails(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__userDetails **SOAP_FMAC4
 soap_in_PointerTons1__userDetails(struct soap *soap, const char *tag,
                                   ns1__userDetails **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__userDetails **)soap_malloc(soap,
                                                sizeof(ns1__userDetails *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__userDetails *)soap_instantiate_ns1__userDetails(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__userDetails **p = (ns1__userDetails **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__userDetails,
         sizeof(ns1__userDetails), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138382,7 +138732,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__userDetails(struct soap *soap,
                                    ns1__userDetails *const *a, const char *tag,
                                    const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__userDetails);
   if (soap_out_PointerTons1__userDetails(soap, tag ? tag : "ns1:userDetails",
                                          id, a, type))
@@ -138395,7 +138745,7 @@ soap_get_PointerTons1__userDetails(struct soap *soap, ns1__userDetails **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__userDetails(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138411,7 +138761,7 @@ soap_out_PointerTons1__datasetInclude(struct soap *soap, const char *tag,
                                       int id,
                                       enum ns1__datasetInclude *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__datasetInclude);
   if (id < 0)
     return soap->error;
@@ -138422,23 +138772,23 @@ SOAP_FMAC3 enum ns1__datasetInclude **SOAP_FMAC4
 soap_in_PointerTons1__datasetInclude(struct soap *soap, const char *tag,
                                      enum ns1__datasetInclude **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__datasetInclude **)soap_malloc(
               soap, sizeof(enum ns1__datasetInclude *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__datasetInclude(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__datasetInclude **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__datasetInclude,
         sizeof(enum ns1__datasetInclude), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138447,7 +138797,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__datasetInclude(struct soap *soap,
                                       enum ns1__datasetInclude *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__datasetInclude);
   if (soap_out_PointerTons1__datasetInclude(
           soap, tag ? tag : "ns1:datasetInclude", id, a, type))
@@ -138461,7 +138811,7 @@ soap_get_PointerTons1__datasetInclude(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__datasetInclude(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138478,7 +138828,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__datafileFormat(struct soap *soap, const char *tag,
                                       int id, ns1__datafileFormat *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__datafileFormat);
   if (id < 0)
     return soap->error;
@@ -138489,28 +138839,28 @@ SOAP_FMAC3 ns1__datafileFormat **SOAP_FMAC4
 soap_in_PointerTons1__datafileFormat(struct soap *soap, const char *tag,
                                      ns1__datafileFormat **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__datafileFormat **)soap_malloc(
               soap, sizeof(ns1__datafileFormat *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__datafileFormat *)soap_instantiate_ns1__datafileFormat(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__datafileFormat **p = (ns1__datafileFormat **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__datafileFormat,
         sizeof(ns1__datafileFormat), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138519,7 +138869,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__datafileFormat(struct soap *soap,
                                       ns1__datafileFormat *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__datafileFormat);
   if (soap_out_PointerTons1__datafileFormat(
           soap, tag ? tag : "ns1:datafileFormat", id, a, type))
@@ -138533,7 +138883,7 @@ soap_get_PointerTons1__datafileFormat(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__datafileFormat(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138547,8 +138897,8 @@ soap_serialize_PointerTodouble(struct soap *soap, double *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTodouble(struct soap *soap, const char *tag, int id,
                          double *const *a, const char *type) {
-  id =
-      soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ICat3_double);
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
+                       SOAP_TYPE_ICat3_double);
   if (id < 0)
     return soap->error;
   return soap_out_double(soap, tag, id, *a, type);
@@ -138557,21 +138907,21 @@ soap_out_PointerTodouble(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 double **SOAP_FMAC4
 soap_in_PointerTodouble(struct soap *soap, const char *tag, double **a,
                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (double **)soap_malloc(soap, sizeof(double *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_double(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (double **)soap_id_lookup(soap, soap->href, (void **)a,
                                   SOAP_TYPE_ICat3_double, sizeof(double), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138579,7 +138929,7 @@ soap_in_PointerTodouble(struct soap *soap, const char *tag, double **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTodouble(struct soap *soap, double *const *a, const char *tag,
                          const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTodouble);
   if (soap_out_PointerTodouble(soap, tag ? tag : "double", id, a, type))
     return soap->error;
@@ -138591,7 +138941,7 @@ soap_get_PointerTodouble(struct soap *soap, double **p, const char *tag,
                          const char *type) {
   if ((p = soap_in_PointerTodouble(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138605,7 +138955,8 @@ soap_serialize_PointerTotime(struct soap *soap, time_t *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTotime(struct soap *soap, const char *tag, int id,
                        time_t *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ICat3_time);
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
+                       SOAP_TYPE_ICat3_time);
   if (id < 0)
     return soap->error;
   return soap_out_time(soap, tag, id, *a, type);
@@ -138614,21 +138965,21 @@ soap_out_PointerTotime(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 time_t **SOAP_FMAC4
 soap_in_PointerTotime(struct soap *soap, const char *tag, time_t **a,
                       const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (time_t **)soap_malloc(soap, sizeof(time_t *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_time(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (time_t **)soap_id_lookup(soap, soap->href, (void **)a,
                                   SOAP_TYPE_ICat3_time, sizeof(time_t), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138636,8 +138987,8 @@ soap_in_PointerTotime(struct soap *soap, const char *tag, time_t **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTotime(struct soap *soap, time_t *const *a, const char *tag,
                        const char *type) {
-  int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat3_PointerTotime);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
+                      SOAP_TYPE_ICat3_PointerTotime);
   if (soap_out_PointerTotime(soap, tag ? tag : "dateTime", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -138648,7 +138999,7 @@ soap_get_PointerTotime(struct soap *soap, time_t **p, const char *tag,
                        const char *type) {
   if ((p = soap_in_PointerTotime(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138663,7 +139014,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__advancedSearchDetails(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__advancedSearchDetails(
     struct soap *soap, const char *tag, int id,
     ns1__advancedSearchDetails *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__advancedSearchDetails);
   if (id < 0)
     return soap->error;
@@ -138674,22 +139025,22 @@ SOAP_FMAC3 ns1__advancedSearchDetails **SOAP_FMAC4
 soap_in_PointerTons1__advancedSearchDetails(struct soap *soap, const char *tag,
                                             ns1__advancedSearchDetails **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__advancedSearchDetails **)soap_malloc(
               soap, sizeof(ns1__advancedSearchDetails *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__advancedSearchDetails *)
               soap_instantiate_ns1__advancedSearchDetails(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__advancedSearchDetails **p =
         (ns1__advancedSearchDetails **)soap_id_lookup(
@@ -138698,7 +139049,7 @@ soap_in_PointerTons1__advancedSearchDetails(struct soap *soap, const char *tag,
             sizeof(ns1__advancedSearchDetails), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138706,7 +139057,7 @@ soap_in_PointerTons1__advancedSearchDetails(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__advancedSearchDetails(
     struct soap *soap, ns1__advancedSearchDetails *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__advancedSearchDetails);
   if (soap_out_PointerTons1__advancedSearchDetails(
           soap, tag ? tag : "ns1:advancedSearchDetails", id, a, type))
@@ -138721,7 +139072,7 @@ soap_get_PointerTons1__advancedSearchDetails(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__advancedSearchDetails(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138738,7 +139089,7 @@ soap_out_PointerTons1__icatAuthorisation(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__icatAuthorisation *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__icatAuthorisation);
   if (id < 0)
     return soap->error;
@@ -138749,29 +139100,29 @@ SOAP_FMAC3 ns1__icatAuthorisation **SOAP_FMAC4
 soap_in_PointerTons1__icatAuthorisation(struct soap *soap, const char *tag,
                                         ns1__icatAuthorisation **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__icatAuthorisation **)soap_malloc(
               soap, sizeof(ns1__icatAuthorisation *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__icatAuthorisation *)soap_instantiate_ns1__icatAuthorisation(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__icatAuthorisation **p = (ns1__icatAuthorisation **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__icatAuthorisation,
         sizeof(ns1__icatAuthorisation), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138780,7 +139131,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__icatAuthorisation(struct soap *soap,
                                          ns1__icatAuthorisation *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__icatAuthorisation);
   if (soap_out_PointerTons1__icatAuthorisation(
           soap, tag ? tag : "ns1:icatAuthorisation", id, a, type))
@@ -138794,7 +139145,7 @@ soap_get_PointerTons1__icatAuthorisation(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__icatAuthorisation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138810,7 +139161,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__elementType(struct soap *soap, const char *tag, int id,
                                    enum ns1__elementType *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__elementType);
   if (id < 0)
     return soap->error;
@@ -138820,23 +139171,23 @@ soap_out_PointerTons1__elementType(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 enum ns1__elementType **SOAP_FMAC4
 soap_in_PointerTons1__elementType(struct soap *soap, const char *tag,
                                   enum ns1__elementType **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__elementType **)soap_malloc(
               soap, sizeof(enum ns1__elementType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__elementType(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__elementType **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__elementType,
         sizeof(enum ns1__elementType), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138845,7 +139196,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__elementType(struct soap *soap,
                                    enum ns1__elementType *const *a,
                                    const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__elementType);
   if (soap_out_PointerTons1__elementType(soap, tag ? tag : "ns1:elementType",
                                          id, a, type))
@@ -138858,7 +139209,7 @@ soap_get_PointerTons1__elementType(struct soap *soap, enum ns1__elementType **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__elementType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138874,7 +139225,7 @@ soap_serialize_PointerTons1__keyword(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__keyword(struct soap *soap, const char *tag, int id,
                                ns1__keyword *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__keyword);
   if (id < 0)
     return soap->error;
@@ -138884,27 +139235,27 @@ soap_out_PointerTons1__keyword(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__keyword **SOAP_FMAC4
 soap_in_PointerTons1__keyword(struct soap *soap, const char *tag,
                               ns1__keyword **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__keyword **)soap_malloc(soap, sizeof(ns1__keyword *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__keyword *)soap_instantiate_ns1__keyword(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__keyword **p = (ns1__keyword **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__keyword,
         sizeof(ns1__keyword), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138912,7 +139263,7 @@ soap_in_PointerTons1__keyword(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__keyword(struct soap *soap, ns1__keyword *const *a,
                                const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__keyword);
   if (soap_out_PointerTons1__keyword(soap, tag ? tag : "ns1:keyword", id, a,
                                      type))
@@ -138925,7 +139276,7 @@ soap_get_PointerTons1__keyword(struct soap *soap, ns1__keyword **p,
                                const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__keyword(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -138942,7 +139293,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__datasetParameter(struct soap *soap, const char *tag,
                                         int id, ns1__datasetParameter *const *a,
                                         const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__datasetParameter);
   if (id < 0)
     return soap->error;
@@ -138953,28 +139304,28 @@ SOAP_FMAC3 ns1__datasetParameter **SOAP_FMAC4
 soap_in_PointerTons1__datasetParameter(struct soap *soap, const char *tag,
                                        ns1__datasetParameter **a,
                                        const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__datasetParameter **)soap_malloc(
               soap, sizeof(ns1__datasetParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__datasetParameter *)soap_instantiate_ns1__datasetParameter(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__datasetParameter **p = (ns1__datasetParameter **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__datasetParameter,
         sizeof(ns1__datasetParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -138983,7 +139334,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__datasetParameter(struct soap *soap,
                                         ns1__datasetParameter *const *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__datasetParameter);
   if (soap_out_PointerTons1__datasetParameter(
           soap, tag ? tag : "ns1:datasetParameter", id, a, type))
@@ -138997,7 +139348,7 @@ soap_get_PointerTons1__datasetParameter(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__datasetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139014,7 +139365,7 @@ soap_out_PointerTons1__sampleParameterPK(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__sampleParameterPK *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__sampleParameterPK);
   if (id < 0)
     return soap->error;
@@ -139025,29 +139376,29 @@ SOAP_FMAC3 ns1__sampleParameterPK **SOAP_FMAC4
 soap_in_PointerTons1__sampleParameterPK(struct soap *soap, const char *tag,
                                         ns1__sampleParameterPK **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__sampleParameterPK **)soap_malloc(
               soap, sizeof(ns1__sampleParameterPK *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__sampleParameterPK *)soap_instantiate_ns1__sampleParameterPK(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__sampleParameterPK **p = (ns1__sampleParameterPK **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__sampleParameterPK,
         sizeof(ns1__sampleParameterPK), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -139056,7 +139407,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__sampleParameterPK(struct soap *soap,
                                          ns1__sampleParameterPK *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__sampleParameterPK);
   if (soap_out_PointerTons1__sampleParameterPK(
           soap, tag ? tag : "ns1:sampleParameterPK", id, a, type))
@@ -139070,7 +139421,7 @@ soap_get_PointerTons1__sampleParameterPK(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__sampleParameterPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139087,7 +139438,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__investigator(struct soap *soap, const char *tag, int id,
                                     ns1__investigator *const *a,
                                     const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__investigator);
   if (id < 0)
     return soap->error;
@@ -139097,28 +139448,28 @@ soap_out_PointerTons1__investigator(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__investigator **SOAP_FMAC4
 soap_in_PointerTons1__investigator(struct soap *soap, const char *tag,
                                    ns1__investigator **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__investigator **)soap_malloc(soap,
                                                 sizeof(ns1__investigator *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__investigator *)soap_instantiate_ns1__investigator(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__investigator **p = (ns1__investigator **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__investigator,
         sizeof(ns1__investigator), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -139127,7 +139478,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__investigator(struct soap *soap,
                                     ns1__investigator *const *a,
                                     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__investigator);
   if (soap_out_PointerTons1__investigator(soap, tag ? tag : "ns1:investigator",
                                           id, a, type))
@@ -139140,7 +139491,7 @@ soap_get_PointerTons1__investigator(struct soap *soap, ns1__investigator **p,
                                     const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__investigator(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139157,7 +139508,7 @@ soap_out_PointerTons1__datafileParameterPK(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__datafileParameterPK *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__datafileParameterPK);
   if (id < 0)
     return soap->error;
@@ -139168,29 +139519,29 @@ SOAP_FMAC3 ns1__datafileParameterPK **SOAP_FMAC4
 soap_in_PointerTons1__datafileParameterPK(struct soap *soap, const char *tag,
                                           ns1__datafileParameterPK **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__datafileParameterPK **)soap_malloc(
               soap, sizeof(ns1__datafileParameterPK *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__datafileParameterPK *)
-              soap_instantiate_ns1__datafileParameterPK(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__datafileParameterPK(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__datafileParameterPK **p = (ns1__datafileParameterPK **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__datafileParameterPK,
         sizeof(ns1__datafileParameterPK), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -139199,7 +139550,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__datafileParameterPK(struct soap *soap,
                                            ns1__datafileParameterPK *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__datafileParameterPK);
   if (soap_out_PointerTons1__datafileParameterPK(
           soap, tag ? tag : "ns1:datafileParameterPK", id, a, type))
@@ -139213,7 +139564,7 @@ soap_get_PointerTons1__datafileParameterPK(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__datafileParameterPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139230,7 +139581,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__publication(struct soap *soap, const char *tag, int id,
                                    ns1__publication *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__publication);
   if (id < 0)
     return soap->error;
@@ -139240,28 +139591,28 @@ soap_out_PointerTons1__publication(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__publication **SOAP_FMAC4
 soap_in_PointerTons1__publication(struct soap *soap, const char *tag,
                                   ns1__publication **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__publication **)soap_malloc(soap,
                                                sizeof(ns1__publication *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__publication *)soap_instantiate_ns1__publication(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__publication **p = (ns1__publication **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__publication,
         sizeof(ns1__publication), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -139270,7 +139621,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__publication(struct soap *soap,
                                    ns1__publication *const *a, const char *tag,
                                    const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__publication);
   if (soap_out_PointerTons1__publication(soap, tag ? tag : "ns1:publication",
                                          id, a, type))
@@ -139283,7 +139634,7 @@ soap_get_PointerTons1__publication(struct soap *soap, ns1__publication **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__publication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139300,7 +139651,7 @@ soap_out_PointerTons1__datasetParameterPK(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__datasetParameterPK *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__datasetParameterPK);
   if (id < 0)
     return soap->error;
@@ -139311,29 +139662,29 @@ SOAP_FMAC3 ns1__datasetParameterPK **SOAP_FMAC4
 soap_in_PointerTons1__datasetParameterPK(struct soap *soap, const char *tag,
                                          ns1__datasetParameterPK **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__datasetParameterPK **)soap_malloc(
               soap, sizeof(ns1__datasetParameterPK *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__datasetParameterPK *)
-              soap_instantiate_ns1__datasetParameterPK(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__datasetParameterPK(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__datasetParameterPK **p = (ns1__datasetParameterPK **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__datasetParameterPK,
         sizeof(ns1__datasetParameterPK), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -139342,7 +139693,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__datasetParameterPK(struct soap *soap,
                                           ns1__datasetParameterPK *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__datasetParameterPK);
   if (soap_out_PointerTons1__datasetParameterPK(
           soap, tag ? tag : "ns1:datasetParameterPK", id, a, type))
@@ -139356,7 +139707,7 @@ soap_get_PointerTons1__datasetParameterPK(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__datasetParameterPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139370,7 +139721,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__investigationInclude(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__investigationInclude(
     struct soap *soap, const char *tag, int id,
     enum ns1__investigationInclude *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__investigationInclude);
   if (id < 0)
     return soap->error;
@@ -139381,23 +139732,23 @@ SOAP_FMAC3 enum ns1__investigationInclude **SOAP_FMAC4
 soap_in_PointerTons1__investigationInclude(struct soap *soap, const char *tag,
                                            enum ns1__investigationInclude **a,
                                            const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__investigationInclude **)soap_malloc(
               soap, sizeof(enum ns1__investigationInclude *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__investigationInclude(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__investigationInclude **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__investigationInclude,
         sizeof(enum ns1__investigationInclude), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -139405,7 +139756,7 @@ soap_in_PointerTons1__investigationInclude(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__investigationInclude(
     struct soap *soap, enum ns1__investigationInclude *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__investigationInclude);
   if (soap_out_PointerTons1__investigationInclude(
           soap, tag ? tag : "ns1:investigationInclude", id, a, type))
@@ -139419,7 +139770,7 @@ soap_get_PointerTons1__investigationInclude(struct soap *soap,
                                             const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__investigationInclude(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139436,7 +139787,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__keywordDetails(struct soap *soap, const char *tag,
                                       int id, ns1__keywordDetails *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__keywordDetails);
   if (id < 0)
     return soap->error;
@@ -139447,28 +139798,28 @@ SOAP_FMAC3 ns1__keywordDetails **SOAP_FMAC4
 soap_in_PointerTons1__keywordDetails(struct soap *soap, const char *tag,
                                      ns1__keywordDetails **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__keywordDetails **)soap_malloc(
               soap, sizeof(ns1__keywordDetails *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__keywordDetails *)soap_instantiate_ns1__keywordDetails(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__keywordDetails **p = (ns1__keywordDetails **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__keywordDetails,
         sizeof(ns1__keywordDetails), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -139477,7 +139828,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__keywordDetails(struct soap *soap,
                                       ns1__keywordDetails *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__keywordDetails);
   if (soap_out_PointerTons1__keywordDetails(
           soap, tag ? tag : "ns1:keywordDetails", id, a, type))
@@ -139491,7 +139842,7 @@ soap_get_PointerTons1__keywordDetails(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__keywordDetails(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139508,7 +139859,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__investigation(struct soap *soap, const char *tag, int id,
                                      ns1__investigation *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__investigation);
   if (id < 0)
     return soap->error;
@@ -139518,28 +139869,28 @@ soap_out_PointerTons1__investigation(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__investigation **SOAP_FMAC4
 soap_in_PointerTons1__investigation(struct soap *soap, const char *tag,
                                     ns1__investigation **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__investigation **)soap_malloc(soap,
                                                  sizeof(ns1__investigation *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__investigation *)soap_instantiate_ns1__investigation(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__investigation **p = (ns1__investigation **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__investigation,
         sizeof(ns1__investigation), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -139548,7 +139899,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__investigation(struct soap *soap,
                                      ns1__investigation *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__investigation);
   if (soap_out_PointerTons1__investigation(
           soap, tag ? tag : "ns1:investigation", id, a, type))
@@ -139561,7 +139912,7 @@ soap_get_PointerTons1__investigation(struct soap *soap, ns1__investigation **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__investigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139578,7 +139929,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__downloadInfo(struct soap *soap, const char *tag, int id,
                                     ns1__downloadInfo *const *a,
                                     const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__downloadInfo);
   if (id < 0)
     return soap->error;
@@ -139588,28 +139939,28 @@ soap_out_PointerTons1__downloadInfo(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__downloadInfo **SOAP_FMAC4
 soap_in_PointerTons1__downloadInfo(struct soap *soap, const char *tag,
                                    ns1__downloadInfo **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__downloadInfo **)soap_malloc(soap,
                                                 sizeof(ns1__downloadInfo *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__downloadInfo *)soap_instantiate_ns1__downloadInfo(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__downloadInfo **p = (ns1__downloadInfo **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__downloadInfo,
         sizeof(ns1__downloadInfo), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -139618,7 +139969,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__downloadInfo(struct soap *soap,
                                     ns1__downloadInfo *const *a,
                                     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__downloadInfo);
   if (soap_out_PointerTons1__downloadInfo(soap, tag ? tag : "ns1:downloadInfo",
                                           id, a, type))
@@ -139631,7 +139982,7 @@ soap_get_PointerTons1__downloadInfo(struct soap *soap, ns1__downloadInfo **p,
                                     const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__downloadInfo(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139648,7 +139999,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__sampleParameter(struct soap *soap, const char *tag,
                                        int id, ns1__sampleParameter *const *a,
                                        const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__sampleParameter);
   if (id < 0)
     return soap->error;
@@ -139659,28 +140010,28 @@ SOAP_FMAC3 ns1__sampleParameter **SOAP_FMAC4
 soap_in_PointerTons1__sampleParameter(struct soap *soap, const char *tag,
                                       ns1__sampleParameter **a,
                                       const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__sampleParameter **)soap_malloc(
               soap, sizeof(ns1__sampleParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__sampleParameter *)soap_instantiate_ns1__sampleParameter(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__sampleParameter **p = (ns1__sampleParameter **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__sampleParameter,
         sizeof(ns1__sampleParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -139689,7 +140040,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__sampleParameter(struct soap *soap,
                                        ns1__sampleParameter *const *a,
                                        const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__sampleParameter);
   if (soap_out_PointerTons1__sampleParameter(
           soap, tag ? tag : "ns1:sampleParameter", id, a, type))
@@ -139703,7 +140054,7 @@ soap_get_PointerTons1__sampleParameter(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__sampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139720,7 +140071,7 @@ soap_serialize_PointerTons1__parameterComparisonCondition(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__parameterComparisonCondition(
     struct soap *soap, const char *tag, int id,
     ns1__parameterComparisonCondition *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__parameterComparisonCondition);
   if (id < 0)
     return soap->error;
@@ -139731,22 +140082,22 @@ SOAP_FMAC3 ns1__parameterComparisonCondition **SOAP_FMAC4
 soap_in_PointerTons1__parameterComparisonCondition(
     struct soap *soap, const char *tag, ns1__parameterComparisonCondition **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__parameterComparisonCondition **)soap_malloc(
               soap, sizeof(ns1__parameterComparisonCondition *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__parameterComparisonCondition *)
               soap_instantiate_ns1__parameterComparisonCondition(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__parameterComparisonCondition **p =
         (ns1__parameterComparisonCondition **)soap_id_lookup(
@@ -139755,7 +140106,7 @@ soap_in_PointerTons1__parameterComparisonCondition(
             sizeof(ns1__parameterComparisonCondition), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -139764,7 +140115,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__parameterComparisonCondition(
     struct soap *soap, ns1__parameterComparisonCondition *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__parameterComparisonCondition);
   if (soap_out_PointerTons1__parameterComparisonCondition(
           soap, tag ? tag : "ns1:parameterComparisonCondition", id, a, type))
@@ -139779,7 +140130,7 @@ soap_get_PointerTons1__parameterComparisonCondition(
   if ((p = soap_in_PointerTons1__parameterComparisonCondition(soap, tag, p,
                                                               type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139796,7 +140147,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__parameterSearch(struct soap *soap, const char *tag,
                                        int id, ns1__parameterSearch *const *a,
                                        const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__parameterSearch);
   if (id < 0)
     return soap->error;
@@ -139807,28 +140158,28 @@ SOAP_FMAC3 ns1__parameterSearch **SOAP_FMAC4
 soap_in_PointerTons1__parameterSearch(struct soap *soap, const char *tag,
                                       ns1__parameterSearch **a,
                                       const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__parameterSearch **)soap_malloc(
               soap, sizeof(ns1__parameterSearch *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__parameterSearch *)soap_instantiate_ns1__parameterSearch(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__parameterSearch **p = (ns1__parameterSearch **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__parameterSearch,
         sizeof(ns1__parameterSearch), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -139837,7 +140188,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__parameterSearch(struct soap *soap,
                                        ns1__parameterSearch *const *a,
                                        const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__parameterSearch);
   if (soap_out_PointerTons1__parameterSearch(
           soap, tag ? tag : "ns1:parameterSearch", id, a, type))
@@ -139851,7 +140202,7 @@ soap_get_PointerTons1__parameterSearch(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__parameterSearch(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139867,7 +140218,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__keywordType(struct soap *soap, const char *tag, int id,
                                    enum ns1__keywordType *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__keywordType);
   if (id < 0)
     return soap->error;
@@ -139877,23 +140228,23 @@ soap_out_PointerTons1__keywordType(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 enum ns1__keywordType **SOAP_FMAC4
 soap_in_PointerTons1__keywordType(struct soap *soap, const char *tag,
                                   enum ns1__keywordType **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__keywordType **)soap_malloc(
               soap, sizeof(enum ns1__keywordType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__keywordType(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__keywordType **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__keywordType,
         sizeof(enum ns1__keywordType), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -139902,7 +140253,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__keywordType(struct soap *soap,
                                    enum ns1__keywordType *const *a,
                                    const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__keywordType);
   if (soap_out_PointerTons1__keywordType(soap, tag ? tag : "ns1:keywordType",
                                          id, a, type))
@@ -139915,7 +140266,7 @@ soap_get_PointerTons1__keywordType(struct soap *soap, enum ns1__keywordType **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__keywordType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139931,7 +140282,7 @@ soap_serialize_PointerTons1__dataset(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__dataset(struct soap *soap, const char *tag, int id,
                                ns1__dataset *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__dataset);
   if (id < 0)
     return soap->error;
@@ -139941,27 +140292,27 @@ soap_out_PointerTons1__dataset(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__dataset **SOAP_FMAC4
 soap_in_PointerTons1__dataset(struct soap *soap, const char *tag,
                               ns1__dataset **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__dataset **)soap_malloc(soap, sizeof(ns1__dataset *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__dataset *)soap_instantiate_ns1__dataset(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__dataset **p = (ns1__dataset **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__dataset,
         sizeof(ns1__dataset), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -139969,7 +140320,7 @@ soap_in_PointerTons1__dataset(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__dataset(struct soap *soap, ns1__dataset *const *a,
                                const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__dataset);
   if (soap_out_PointerTons1__dataset(soap, tag ? tag : "ns1:dataset", id, a,
                                      type))
@@ -139982,7 +140333,7 @@ soap_get_PointerTons1__dataset(struct soap *soap, ns1__dataset **p,
                                const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__dataset(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -139998,7 +140349,7 @@ soap_serialize_PointerTons1__keywordPK(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__keywordPK(struct soap *soap, const char *tag, int id,
                                  ns1__keywordPK *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__keywordPK);
   if (id < 0)
     return soap->error;
@@ -140008,27 +140359,27 @@ soap_out_PointerTons1__keywordPK(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__keywordPK **SOAP_FMAC4
 soap_in_PointerTons1__keywordPK(struct soap *soap, const char *tag,
                                 ns1__keywordPK **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__keywordPK **)soap_malloc(soap, sizeof(ns1__keywordPK *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__keywordPK *)soap_instantiate_ns1__keywordPK(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__keywordPK **p = (ns1__keywordPK **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__keywordPK,
         sizeof(ns1__keywordPK), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -140036,7 +140387,7 @@ soap_in_PointerTons1__keywordPK(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__keywordPK(struct soap *soap, ns1__keywordPK *const *a,
                                  const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__keywordPK);
   if (soap_out_PointerTons1__keywordPK(soap, tag ? tag : "ns1:keywordPK", id, a,
                                        type))
@@ -140049,7 +140400,7 @@ soap_get_PointerTons1__keywordPK(struct soap *soap, ns1__keywordPK **p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__keywordPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -140066,7 +140417,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__investigatorPK(struct soap *soap, const char *tag,
                                       int id, ns1__investigatorPK *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__investigatorPK);
   if (id < 0)
     return soap->error;
@@ -140077,28 +140428,28 @@ SOAP_FMAC3 ns1__investigatorPK **SOAP_FMAC4
 soap_in_PointerTons1__investigatorPK(struct soap *soap, const char *tag,
                                      ns1__investigatorPK **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__investigatorPK **)soap_malloc(
               soap, sizeof(ns1__investigatorPK *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__investigatorPK *)soap_instantiate_ns1__investigatorPK(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__investigatorPK **p = (ns1__investigatorPK **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__investigatorPK,
         sizeof(ns1__investigatorPK), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -140107,7 +140458,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__investigatorPK(struct soap *soap,
                                       ns1__investigatorPK *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__investigatorPK);
   if (soap_out_PointerTons1__investigatorPK(
           soap, tag ? tag : "ns1:investigatorPK", id, a, type))
@@ -140121,7 +140472,7 @@ soap_get_PointerTons1__investigatorPK(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__investigatorPK(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -140137,7 +140488,7 @@ soap_serialize_PointerTons1__instrument(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__instrument(struct soap *soap, const char *tag, int id,
                                   ns1__instrument *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__instrument);
   if (id < 0)
     return soap->error;
@@ -140147,27 +140498,27 @@ soap_out_PointerTons1__instrument(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__instrument **SOAP_FMAC4
 soap_in_PointerTons1__instrument(struct soap *soap, const char *tag,
                                  ns1__instrument **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__instrument **)soap_malloc(soap, sizeof(ns1__instrument *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__instrument *)soap_instantiate_ns1__instrument(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__instrument **p = (ns1__instrument **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__instrument,
         sizeof(ns1__instrument), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -140175,7 +140526,7 @@ soap_in_PointerTons1__instrument(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__instrument(struct soap *soap, ns1__instrument *const *a,
                                   const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__instrument);
   if (soap_out_PointerTons1__instrument(soap, tag ? tag : "ns1:instrument", id,
                                         a, type))
@@ -140188,7 +140539,7 @@ soap_get_PointerTons1__instrument(struct soap *soap, ns1__instrument **p,
                                   const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__instrument(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -140205,7 +140556,7 @@ soap_out_PointerTons1__datafileParameter(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__datafileParameter *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__datafileParameter);
   if (id < 0)
     return soap->error;
@@ -140216,29 +140567,29 @@ SOAP_FMAC3 ns1__datafileParameter **SOAP_FMAC4
 soap_in_PointerTons1__datafileParameter(struct soap *soap, const char *tag,
                                         ns1__datafileParameter **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__datafileParameter **)soap_malloc(
               soap, sizeof(ns1__datafileParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__datafileParameter *)soap_instantiate_ns1__datafileParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__datafileParameter **p = (ns1__datafileParameter **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__datafileParameter,
         sizeof(ns1__datafileParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -140247,7 +140598,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__datafileParameter(struct soap *soap,
                                          ns1__datafileParameter *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__datafileParameter);
   if (soap_out_PointerTons1__datafileParameter(
           soap, tag ? tag : "ns1:datafileParameter", id, a, type))
@@ -140261,7 +140612,7 @@ soap_get_PointerTons1__datafileParameter(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__datafileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -140278,7 +140629,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__facilityCycle(struct soap *soap, const char *tag, int id,
                                      ns1__facilityCycle *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__facilityCycle);
   if (id < 0)
     return soap->error;
@@ -140288,28 +140639,28 @@ soap_out_PointerTons1__facilityCycle(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__facilityCycle **SOAP_FMAC4
 soap_in_PointerTons1__facilityCycle(struct soap *soap, const char *tag,
                                     ns1__facilityCycle **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__facilityCycle **)soap_malloc(soap,
                                                  sizeof(ns1__facilityCycle *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__facilityCycle *)soap_instantiate_ns1__facilityCycle(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__facilityCycle **p = (ns1__facilityCycle **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__facilityCycle,
         sizeof(ns1__facilityCycle), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -140318,7 +140669,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__facilityCycle(struct soap *soap,
                                      ns1__facilityCycle *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__facilityCycle);
   if (soap_out_PointerTons1__facilityCycle(
           soap, tag ? tag : "ns1:facilityCycle", id, a, type))
@@ -140331,7 +140682,7 @@ soap_get_PointerTons1__facilityCycle(struct soap *soap, ns1__facilityCycle **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__facilityCycle(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -140347,7 +140698,7 @@ soap_serialize_PointerTons1__parameter(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__parameter(struct soap *soap, const char *tag, int id,
                                  ns1__parameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__parameter);
   if (id < 0)
     return soap->error;
@@ -140357,27 +140708,27 @@ soap_out_PointerTons1__parameter(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__parameter **SOAP_FMAC4
 soap_in_PointerTons1__parameter(struct soap *soap, const char *tag,
                                 ns1__parameter **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__parameter **)soap_malloc(soap, sizeof(ns1__parameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__parameter *)soap_instantiate_ns1__parameter(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__parameter **p = (ns1__parameter **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__parameter,
         sizeof(ns1__parameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -140385,7 +140736,7 @@ soap_in_PointerTons1__parameter(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__parameter(struct soap *soap, ns1__parameter *const *a,
                                  const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__parameter);
   if (soap_out_PointerTons1__parameter(soap, tag ? tag : "ns1:parameter", id, a,
                                        type))
@@ -140398,7 +140749,7 @@ soap_get_PointerTons1__parameter(struct soap *soap, ns1__parameter **p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__parameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -140414,7 +140765,7 @@ soap_serialize_PointerTons1__parameterLogicalCondition(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__parameterLogicalCondition(
     struct soap *soap, const char *tag, int id,
     ns1__parameterLogicalCondition *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__parameterLogicalCondition);
   if (id < 0)
     return soap->error;
@@ -140425,22 +140776,22 @@ SOAP_FMAC3 ns1__parameterLogicalCondition **SOAP_FMAC4
 soap_in_PointerTons1__parameterLogicalCondition(
     struct soap *soap, const char *tag, ns1__parameterLogicalCondition **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__parameterLogicalCondition **)soap_malloc(
               soap, sizeof(ns1__parameterLogicalCondition *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__parameterLogicalCondition *)
               soap_instantiate_ns1__parameterLogicalCondition(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__parameterLogicalCondition **p =
         (ns1__parameterLogicalCondition **)soap_id_lookup(
@@ -140449,7 +140800,7 @@ soap_in_PointerTons1__parameterLogicalCondition(
             sizeof(ns1__parameterLogicalCondition), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -140457,7 +140808,7 @@ soap_in_PointerTons1__parameterLogicalCondition(
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__parameterLogicalCondition(
     struct soap *soap, ns1__parameterLogicalCondition *const *a,
     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__parameterLogicalCondition);
   if (soap_out_PointerTons1__parameterLogicalCondition(
           soap, tag ? tag : "ns1:parameterLogicalCondition", id, a, type))
@@ -140471,7 +140822,7 @@ soap_get_PointerTons1__parameterLogicalCondition(
     const char *type) {
   if ((p = soap_in_PointerTons1__parameterLogicalCondition(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -140487,7 +140838,7 @@ soap_serialize_PointerTons1__datafile(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__datafile(struct soap *soap, const char *tag, int id,
                                 ns1__datafile *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__datafile);
   if (id < 0)
     return soap->error;
@@ -140497,27 +140848,27 @@ soap_out_PointerTons1__datafile(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__datafile **SOAP_FMAC4
 soap_in_PointerTons1__datafile(struct soap *soap, const char *tag,
                                ns1__datafile **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__datafile **)soap_malloc(soap, sizeof(ns1__datafile *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__datafile *)soap_instantiate_ns1__datafile(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__datafile **p = (ns1__datafile **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__datafile,
         sizeof(ns1__datafile), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -140525,7 +140876,7 @@ soap_in_PointerTons1__datafile(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__datafile(struct soap *soap, ns1__datafile *const *a,
                                 const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__datafile);
   if (soap_out_PointerTons1__datafile(soap, tag ? tag : "ns1:datafile", id, a,
                                       type))
@@ -140538,7 +140889,7 @@ soap_get_PointerTons1__datafile(struct soap *soap, ns1__datafile **p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__datafile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -140552,8 +140903,8 @@ soap_serialize_PointerToLONG64(struct soap *soap, LONG64 *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerToLONG64(struct soap *soap, const char *tag, int id,
                          LONG64 *const *a, const char *type) {
-  id =
-      soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ICat3_LONG64);
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
+                       SOAP_TYPE_ICat3_LONG64);
   if (id < 0)
     return soap->error;
   return soap_out_LONG64(soap, tag, id, *a, type);
@@ -140562,21 +140913,21 @@ soap_out_PointerToLONG64(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 LONG64 **SOAP_FMAC4
 soap_in_PointerToLONG64(struct soap *soap, const char *tag, LONG64 **a,
                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (LONG64 **)soap_malloc(soap, sizeof(LONG64 *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_LONG64(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (LONG64 **)soap_id_lookup(soap, soap->href, (void **)a,
                                   SOAP_TYPE_ICat3_LONG64, sizeof(LONG64), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -140584,7 +140935,7 @@ soap_in_PointerToLONG64(struct soap *soap, const char *tag, LONG64 **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerToLONG64(struct soap *soap, LONG64 *const *a, const char *tag,
                          const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerToLONG64);
   if (soap_out_PointerToLONG64(soap, tag ? tag : "long", id, a, type))
     return soap->error;
@@ -140596,7 +140947,7 @@ soap_get_PointerToLONG64(struct soap *soap, LONG64 **p, const char *tag,
                          const char *type) {
   if ((p = soap_in_PointerToLONG64(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -140613,7 +140964,7 @@ soap_serialize_PointerTons1__restrictionComparisonCondition(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__restrictionComparisonCondition(
     struct soap *soap, const char *tag, int id,
     ns1__restrictionComparisonCondition *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__restrictionComparisonCondition);
   if (id < 0)
     return soap->error;
@@ -140624,22 +140975,22 @@ SOAP_FMAC3 ns1__restrictionComparisonCondition **SOAP_FMAC4
 soap_in_PointerTons1__restrictionComparisonCondition(
     struct soap *soap, const char *tag, ns1__restrictionComparisonCondition **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__restrictionComparisonCondition **)soap_malloc(
               soap, sizeof(ns1__restrictionComparisonCondition *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__restrictionComparisonCondition *)
               soap_instantiate_ns1__restrictionComparisonCondition(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__restrictionComparisonCondition **p =
         (ns1__restrictionComparisonCondition **)soap_id_lookup(
@@ -140648,7 +140999,7 @@ soap_in_PointerTons1__restrictionComparisonCondition(
             sizeof(ns1__restrictionComparisonCondition), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -140657,7 +141008,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__restrictionComparisonCondition(
     struct soap *soap, ns1__restrictionComparisonCondition *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__restrictionComparisonCondition);
   if (soap_out_PointerTons1__restrictionComparisonCondition(
           soap, tag ? tag : "ns1:restrictionComparisonCondition", id, a, type))
@@ -140672,7 +141023,7 @@ soap_get_PointerTons1__restrictionComparisonCondition(
   if ((p = soap_in_PointerTons1__restrictionComparisonCondition(soap, tag, p,
                                                                 type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -140687,7 +141038,7 @@ soap_serialize_PointerTons1__sample(struct soap *soap, ns1__sample *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__sample(struct soap *soap, const char *tag, int id,
                               ns1__sample *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__sample);
   if (id < 0)
     return soap->error;
@@ -140697,27 +141048,27 @@ soap_out_PointerTons1__sample(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__sample **SOAP_FMAC4
 soap_in_PointerTons1__sample(struct soap *soap, const char *tag,
                              ns1__sample **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__sample **)soap_malloc(soap, sizeof(ns1__sample *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__sample *)soap_instantiate_ns1__sample(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__sample **p = (ns1__sample **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__sample,
         sizeof(ns1__sample), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -140725,7 +141076,7 @@ soap_in_PointerTons1__sample(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__sample(struct soap *soap, ns1__sample *const *a,
                               const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__sample);
   if (soap_out_PointerTons1__sample(soap, tag ? tag : "ns1:sample", id, a,
                                     type))
@@ -140738,7 +141089,7 @@ soap_get_PointerTons1__sample(struct soap *soap, ns1__sample **p,
                               const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__sample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -140754,7 +141105,7 @@ soap_serialize_PointerTons1__icatRole(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__icatRole(struct soap *soap, const char *tag, int id,
                                 ns1__icatRole *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__icatRole);
   if (id < 0)
     return soap->error;
@@ -140764,27 +141115,27 @@ soap_out_PointerTons1__icatRole(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__icatRole **SOAP_FMAC4
 soap_in_PointerTons1__icatRole(struct soap *soap, const char *tag,
                                ns1__icatRole **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__icatRole **)soap_malloc(soap, sizeof(ns1__icatRole *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__icatRole *)soap_instantiate_ns1__icatRole(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__icatRole **p = (ns1__icatRole **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__icatRole,
         sizeof(ns1__icatRole), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -140792,7 +141143,7 @@ soap_in_PointerTons1__icatRole(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__icatRole(struct soap *soap, ns1__icatRole *const *a,
                                 const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__icatRole);
   if (soap_out_PointerTons1__icatRole(soap, tag ? tag : "ns1:icatRole", id, a,
                                       type))
@@ -140805,7 +141156,7 @@ soap_get_PointerTons1__icatRole(struct soap *soap, ns1__icatRole **p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__icatRole(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -140822,7 +141173,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__facilityUser(struct soap *soap, const char *tag, int id,
                                     ns1__facilityUser *const *a,
                                     const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__facilityUser);
   if (id < 0)
     return soap->error;
@@ -140832,28 +141183,28 @@ soap_out_PointerTons1__facilityUser(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__facilityUser **SOAP_FMAC4
 soap_in_PointerTons1__facilityUser(struct soap *soap, const char *tag,
                                    ns1__facilityUser **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__facilityUser **)soap_malloc(soap,
                                                 sizeof(ns1__facilityUser *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__facilityUser *)soap_instantiate_ns1__facilityUser(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__facilityUser **p = (ns1__facilityUser **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__facilityUser,
         sizeof(ns1__facilityUser), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -140862,7 +141213,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__facilityUser(struct soap *soap,
                                     ns1__facilityUser *const *a,
                                     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__facilityUser);
   if (soap_out_PointerTons1__facilityUser(soap, tag ? tag : "ns1:facilityUser",
                                           id, a, type))
@@ -140875,7 +141226,7 @@ soap_get_PointerTons1__facilityUser(struct soap *soap, ns1__facilityUser **p,
                                     const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__facilityUser(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -140892,7 +141243,7 @@ soap_out_PointerTons1__restrictionCondition(struct soap *soap, const char *tag,
                                             int id,
                                             ns1__restrictionCondition *const *a,
                                             const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__restrictionCondition);
   if (id < 0)
     return soap->error;
@@ -140903,22 +141254,22 @@ SOAP_FMAC3 ns1__restrictionCondition **SOAP_FMAC4
 soap_in_PointerTons1__restrictionCondition(struct soap *soap, const char *tag,
                                            ns1__restrictionCondition **a,
                                            const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__restrictionCondition **)soap_malloc(
               soap, sizeof(ns1__restrictionCondition *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__restrictionCondition *)
               soap_instantiate_ns1__restrictionCondition(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__restrictionCondition **p =
         (ns1__restrictionCondition **)soap_id_lookup(
@@ -140941,7 +141292,7 @@ soap_in_PointerTons1__restrictionCondition(struct soap *soap, const char *tag,
     }
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -140950,7 +141301,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__restrictionCondition(struct soap *soap,
                                             ns1__restrictionCondition *const *a,
                                             const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__restrictionCondition);
   if (soap_out_PointerTons1__restrictionCondition(
           soap, tag ? tag : "ns1:restrictionCondition", id, a, type))
@@ -140964,7 +141315,7 @@ soap_get_PointerTons1__restrictionCondition(struct soap *soap,
                                             const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__restrictionCondition(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -140981,7 +141332,7 @@ soap_out_PointerTons1__parameterCondition(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__parameterCondition *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__parameterCondition);
   if (id < 0)
     return soap->error;
@@ -140992,22 +141343,22 @@ SOAP_FMAC3 ns1__parameterCondition **SOAP_FMAC4
 soap_in_PointerTons1__parameterCondition(struct soap *soap, const char *tag,
                                          ns1__parameterCondition **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__parameterCondition **)soap_malloc(
               soap, sizeof(ns1__parameterCondition *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__parameterCondition *)
-              soap_instantiate_ns1__parameterCondition(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__parameterCondition(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__parameterCondition **p = (ns1__parameterCondition **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_ns1__parameterCondition,
@@ -141034,7 +141385,7 @@ soap_in_PointerTons1__parameterCondition(struct soap *soap, const char *tag,
     }
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -141043,7 +141394,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__parameterCondition(struct soap *soap,
                                           ns1__parameterCondition *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTons1__parameterCondition);
   if (soap_out_PointerTons1__parameterCondition(
           soap, tag ? tag : "ns1:parameterCondition", id, a, type))
@@ -141057,7 +141408,7 @@ soap_get_PointerTons1__parameterCondition(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__parameterCondition(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -141073,7 +141424,7 @@ soap_serialize_PointerToxsd__anyType(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerToxsd__anyType(struct soap *soap, const char *tag, int id,
                                xsd__anyType *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_xsd__anyType);
   if (id < 0)
     return soap->error;
@@ -141083,20 +141434,20 @@ soap_out_PointerToxsd__anyType(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 xsd__anyType **SOAP_FMAC4
 soap_in_PointerToxsd__anyType(struct soap *soap, const char *tag,
                               xsd__anyType **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (xsd__anyType **)soap_malloc(soap, sizeof(xsd__anyType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (xsd__anyType *)soap_instantiate_xsd__anyType(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     xsd__anyType **p = (xsd__anyType **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat3_xsd__anyType,
@@ -143409,7 +143760,7 @@ soap_in_PointerToxsd__anyType(struct soap *soap, const char *tag,
     }
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -143417,7 +143768,7 @@ soap_in_PointerToxsd__anyType(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerToxsd__anyType(struct soap *soap, xsd__anyType *const *a,
                                const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerToxsd__anyType);
   if (soap_out_PointerToxsd__anyType(soap, tag ? tag : "xsd:anyType", id, a,
                                      type))
@@ -143430,7 +143781,7 @@ soap_get_PointerToxsd__anyType(struct soap *soap, xsd__anyType **p,
                                const char *tag, const char *type) {
   if ((p = soap_in_PointerToxsd__anyType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -143447,7 +143798,7 @@ soap_serialize_PointerTons1__restrictionLogicalCondition(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__restrictionLogicalCondition(
     struct soap *soap, const char *tag, int id,
     ns1__restrictionLogicalCondition *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_ns1__restrictionLogicalCondition);
   if (id < 0)
     return soap->error;
@@ -143458,22 +143809,22 @@ SOAP_FMAC3 ns1__restrictionLogicalCondition **SOAP_FMAC4
 soap_in_PointerTons1__restrictionLogicalCondition(
     struct soap *soap, const char *tag, ns1__restrictionLogicalCondition **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__restrictionLogicalCondition **)soap_malloc(
               soap, sizeof(ns1__restrictionLogicalCondition *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__restrictionLogicalCondition *)
               soap_instantiate_ns1__restrictionLogicalCondition(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__restrictionLogicalCondition **p =
         (ns1__restrictionLogicalCondition **)soap_id_lookup(
@@ -143482,7 +143833,7 @@ soap_in_PointerTons1__restrictionLogicalCondition(
             sizeof(ns1__restrictionLogicalCondition), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -143491,7 +143842,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__restrictionLogicalCondition(
     struct soap *soap, ns1__restrictionLogicalCondition *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat3_PointerTons1__restrictionLogicalCondition);
   if (soap_out_PointerTons1__restrictionLogicalCondition(
           soap, tag ? tag : "ns1:restrictionLogicalCondition", id, a, type))
@@ -143506,7 +143857,7 @@ soap_get_PointerTons1__restrictionLogicalCondition(
   if ((p = soap_in_PointerTons1__restrictionLogicalCondition(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -143521,7 +143872,7 @@ soap_serialize_PointerTostd__string(struct soap *soap, std::string *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTostd__string(struct soap *soap, const char *tag, int id,
                               std::string *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat3_std__string);
   if (id < 0)
     return soap->error;
@@ -143531,22 +143882,22 @@ soap_out_PointerTostd__string(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 std::string **SOAP_FMAC4
 soap_in_PointerTostd__string(struct soap *soap, const char *tag,
                              std::string **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (std::string **)soap_malloc(soap, sizeof(std::string *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_std__string(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (std::string **)soap_id_lookup(soap, soap->href, (void **)a,
                                        SOAP_TYPE_ICat3_std__string,
                                        sizeof(std::string), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -143554,7 +143905,7 @@ soap_in_PointerTostd__string(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTostd__string(struct soap *soap, std::string *const *a,
                               const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat3_PointerTostd__string);
   if (soap_out_PointerTostd__string(soap, tag ? tag : "string", id, a, type))
     return soap->error;
@@ -143566,7 +143917,7 @@ soap_get_PointerTostd__string(struct soap *soap, std::string **p,
                               const char *tag, const char *type) {
   if ((p = soap_in_PointerTostd__string(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -143592,7 +143943,7 @@ soap_in__QName(struct soap *soap, const char *tag, char **a, const char *type) {
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put__QName(struct soap *soap, char *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat3__QName);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat3__QName);
   if (soap_out__QName(soap, tag ? tag : "byte", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -143603,7 +143954,7 @@ SOAP_FMAC3 char **SOAP_FMAC4 soap_get__QName(struct soap *soap, char **p,
                                              const char *type) {
   if ((p = soap_in__QName(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -143612,7 +143963,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_string(struct soap *soap, char **a) {
 #ifdef SOAP_DEFAULT_string
   *a = SOAP_DEFAULT_string;
 #else
-  *a = (char *)0;
+  *a = (char *)nullptr;
 #endif
 }
 
@@ -143638,7 +143989,7 @@ soap_in_string(struct soap *soap, const char *tag, char **a, const char *type) {
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_string(struct soap *soap, char *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat3_string);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat3_string);
   if (soap_out_string(soap, tag ? tag : "byte", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -143649,7 +144000,7 @@ SOAP_FMAC3 char **SOAP_FMAC4 soap_get_string(struct soap *soap, char **p,
                                              const char *type) {
   if ((p = soap_in_string(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -143690,11 +144041,11 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterCondition(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__parameterCondition *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -143702,7 +144053,7 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterCondition(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__parameterCondition,
               sizeof(ns1__parameterCondition), 1))
         break;
-      if (!soap_in_PointerTons1__parameterCondition(soap, tag, NULL,
+      if (!soap_in_PointerTons1__parameterCondition(soap, tag, nullptr,
                                                     "ns1:parameterCondition"))
         break;
     } else if (!soap_in_PointerTons1__parameterCondition(
@@ -143711,7 +144062,7 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterCondition(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__parameterCondition(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -143721,7 +144072,7 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterCondition(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__parameterCondition *> *SOAP_FMAC2
@@ -143735,11 +144086,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__parameterCondition(
                                     "parameterCondition(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__parameterCondition, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__parameterCondition *>);
     if (size)
@@ -143809,11 +144160,11 @@ soap_in_std__vectorTemplateOfPointerTons1__restrictionCondition(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__restrictionCondition *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -143822,7 +144173,7 @@ soap_in_std__vectorTemplateOfPointerTons1__restrictionCondition(
               sizeof(ns1__restrictionCondition), 1))
         break;
       if (!soap_in_PointerTons1__restrictionCondition(
-              soap, tag, NULL, "ns1:restrictionCondition"))
+              soap, tag, nullptr, "ns1:restrictionCondition"))
         break;
     } else if (!soap_in_PointerTons1__restrictionCondition(
                    soap, tag, &n, "ns1:restrictionCondition"))
@@ -143830,7 +144181,7 @@ soap_in_std__vectorTemplateOfPointerTons1__restrictionCondition(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__restrictionCondition(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -143840,7 +144191,7 @@ soap_in_std__vectorTemplateOfPointerTons1__restrictionCondition(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__restrictionCondition *> *SOAP_FMAC2
@@ -143854,11 +144205,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__restrictionCondition(
                                     "restrictionCondition(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__restrictionCondition,
       n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__restrictionCondition *>);
     if (size)
@@ -143930,11 +144281,11 @@ soap_in_std__vectorTemplateOfPointerTons1__shift(struct soap *soap,
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__shift *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -143942,13 +144293,13 @@ soap_in_std__vectorTemplateOfPointerTons1__shift(struct soap *soap,
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__shift,
               sizeof(ns1__shift), 1))
         break;
-      if (!soap_in_PointerTons1__shift(soap, tag, NULL, "ns1:shift"))
+      if (!soap_in_PointerTons1__shift(soap, tag, nullptr, "ns1:shift"))
         break;
     } else if (!soap_in_PointerTons1__shift(soap, tag, &n, "ns1:shift"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__shift(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -143958,7 +144309,7 @@ soap_in_std__vectorTemplateOfPointerTons1__shift(struct soap *soap,
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__shift *> *SOAP_FMAC2
@@ -143974,10 +144325,10 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__shift(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__shift, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__shift,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__shift *>);
     if (size)
@@ -144045,11 +144396,11 @@ soap_in_std__vectorTemplateOfPointerTons1__publication(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__publication *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -144057,7 +144408,7 @@ soap_in_std__vectorTemplateOfPointerTons1__publication(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__publication,
               sizeof(ns1__publication), 1))
         break;
-      if (!soap_in_PointerTons1__publication(soap, tag, NULL,
+      if (!soap_in_PointerTons1__publication(soap, tag, nullptr,
                                              "ns1:publication"))
         break;
     } else if (!soap_in_PointerTons1__publication(soap, tag, &n,
@@ -144066,7 +144417,7 @@ soap_in_std__vectorTemplateOfPointerTons1__publication(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__publication(soap,
                                                                       -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -144076,7 +144427,7 @@ soap_in_std__vectorTemplateOfPointerTons1__publication(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__publication *> *SOAP_FMAC2
@@ -144090,11 +144441,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__publication(
                                     "%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__publication,
                 n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__publication *>);
     if (size)
@@ -144164,11 +144515,11 @@ soap_in_std__vectorTemplateOfPointerTons1__keyword(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__keyword *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -144176,13 +144527,13 @@ soap_in_std__vectorTemplateOfPointerTons1__keyword(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__keyword,
               sizeof(ns1__keyword), 1))
         break;
-      if (!soap_in_PointerTons1__keyword(soap, tag, NULL, "ns1:keyword"))
+      if (!soap_in_PointerTons1__keyword(soap, tag, nullptr, "ns1:keyword"))
         break;
     } else if (!soap_in_PointerTons1__keyword(soap, tag, &n, "ns1:keyword"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__keyword(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -144192,7 +144543,7 @@ soap_in_std__vectorTemplateOfPointerTons1__keyword(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__keyword *> *SOAP_FMAC2
@@ -144206,10 +144557,10 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__keyword(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__keyword, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__keyword,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__keyword *>);
     if (size)
@@ -144278,11 +144629,11 @@ soap_in_std__vectorTemplateOfPointerTons1__investigator(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__investigator *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -144290,7 +144641,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigator(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__investigator,
               sizeof(ns1__investigator), 1))
         break;
-      if (!soap_in_PointerTons1__investigator(soap, tag, NULL,
+      if (!soap_in_PointerTons1__investigator(soap, tag, nullptr,
                                               "ns1:investigator"))
         break;
     } else if (!soap_in_PointerTons1__investigator(soap, tag, &n,
@@ -144299,7 +144650,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigator(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__investigator(soap,
                                                                        -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -144309,7 +144660,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigator(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__investigator *> *SOAP_FMAC2
@@ -144323,11 +144674,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__investigator(
                                     "investigator(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__investigator,
                 n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__investigator *>);
     if (size)
@@ -144399,11 +144750,11 @@ soap_in_std__vectorTemplateOfPointerTons1__relatedDatafiles(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__relatedDatafiles *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -144411,7 +144762,7 @@ soap_in_std__vectorTemplateOfPointerTons1__relatedDatafiles(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__relatedDatafiles,
               sizeof(ns1__relatedDatafiles), 1))
         break;
-      if (!soap_in_PointerTons1__relatedDatafiles(soap, tag, NULL,
+      if (!soap_in_PointerTons1__relatedDatafiles(soap, tag, nullptr,
                                                   "ns1:relatedDatafiles"))
         break;
     } else if (!soap_in_PointerTons1__relatedDatafiles(soap, tag, &n,
@@ -144420,7 +144771,7 @@ soap_in_std__vectorTemplateOfPointerTons1__relatedDatafiles(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__relatedDatafiles(soap,
                                                                            -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -144430,7 +144781,7 @@ soap_in_std__vectorTemplateOfPointerTons1__relatedDatafiles(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__relatedDatafiles *> *SOAP_FMAC2
@@ -144444,11 +144795,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__relatedDatafiles(
                                     "relatedDatafiles(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__relatedDatafiles, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__relatedDatafiles *>);
     if (size)
@@ -144518,11 +144869,11 @@ soap_in_std__vectorTemplateOfPointerTons1__sampleParameter(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__sampleParameter *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -144530,7 +144881,7 @@ soap_in_std__vectorTemplateOfPointerTons1__sampleParameter(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__sampleParameter,
               sizeof(ns1__sampleParameter), 1))
         break;
-      if (!soap_in_PointerTons1__sampleParameter(soap, tag, NULL,
+      if (!soap_in_PointerTons1__sampleParameter(soap, tag, nullptr,
                                                  "ns1:sampleParameter"))
         break;
     } else if (!soap_in_PointerTons1__sampleParameter(soap, tag, &n,
@@ -144539,7 +144890,7 @@ soap_in_std__vectorTemplateOfPointerTons1__sampleParameter(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__sampleParameter(soap,
                                                                           -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -144549,7 +144900,7 @@ soap_in_std__vectorTemplateOfPointerTons1__sampleParameter(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__sampleParameter *> *SOAP_FMAC2
@@ -144563,11 +144914,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__sampleParameter(
                                     "sampleParameter(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__sampleParameter, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__sampleParameter *>);
     if (size)
@@ -144636,11 +144987,11 @@ soap_in_std__vectorTemplateOfPointerTons1__icatRole(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__icatRole *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -144648,13 +144999,13 @@ soap_in_std__vectorTemplateOfPointerTons1__icatRole(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__icatRole,
               sizeof(ns1__icatRole), 1))
         break;
-      if (!soap_in_PointerTons1__icatRole(soap, tag, NULL, "ns1:icatRole"))
+      if (!soap_in_PointerTons1__icatRole(soap, tag, nullptr, "ns1:icatRole"))
         break;
     } else if (!soap_in_PointerTons1__icatRole(soap, tag, &n, "ns1:icatRole"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__icatRole(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -144664,7 +145015,7 @@ soap_in_std__vectorTemplateOfPointerTons1__icatRole(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__icatRole *> *SOAP_FMAC2
@@ -144677,11 +145028,12 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__icatRole(
                                     "vectorTemplateOfPointerTons1__icatRole(%d,"
                                     " %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__icatRole,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__icatRole, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__icatRole *>);
     if (size)
@@ -144750,11 +145102,11 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileFormat(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__datafileFormat *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -144762,7 +145114,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileFormat(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__datafileFormat,
               sizeof(ns1__datafileFormat), 1))
         break;
-      if (!soap_in_PointerTons1__datafileFormat(soap, tag, NULL,
+      if (!soap_in_PointerTons1__datafileFormat(soap, tag, nullptr,
                                                 "ns1:datafileFormat"))
         break;
     } else if (!soap_in_PointerTons1__datafileFormat(soap, tag, &n,
@@ -144771,7 +145123,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileFormat(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__datafileFormat(soap,
                                                                          -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -144781,7 +145133,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileFormat(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__datafileFormat *> *SOAP_FMAC2
@@ -144795,11 +145147,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__datafileFormat(
                                     "datafileFormat(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__datafileFormat, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__datafileFormat *>);
     if (size)
@@ -144871,11 +145223,11 @@ soap_in_std__vectorTemplateOfPointerTons1__datasetParameter(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__datasetParameter *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -144883,7 +145235,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datasetParameter(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__datasetParameter,
               sizeof(ns1__datasetParameter), 1))
         break;
-      if (!soap_in_PointerTons1__datasetParameter(soap, tag, NULL,
+      if (!soap_in_PointerTons1__datasetParameter(soap, tag, nullptr,
                                                   "ns1:datasetParameter"))
         break;
     } else if (!soap_in_PointerTons1__datasetParameter(soap, tag, &n,
@@ -144892,7 +145244,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datasetParameter(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__datasetParameter(soap,
                                                                            -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -144902,7 +145254,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datasetParameter(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__datasetParameter *> *SOAP_FMAC2
@@ -144916,11 +145268,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__datasetParameter(
                                     "datasetParameter(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__datasetParameter, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__datasetParameter *>);
     if (size)
@@ -144990,11 +145342,11 @@ soap_in_std__vectorTemplateOfPointerTons1__icatAuthorisation(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__icatAuthorisation *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -145002,7 +145354,7 @@ soap_in_std__vectorTemplateOfPointerTons1__icatAuthorisation(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__icatAuthorisation,
               sizeof(ns1__icatAuthorisation), 1))
         break;
-      if (!soap_in_PointerTons1__icatAuthorisation(soap, tag, NULL,
+      if (!soap_in_PointerTons1__icatAuthorisation(soap, tag, nullptr,
                                                    "ns1:icatAuthorisation"))
         break;
     } else if (!soap_in_PointerTons1__icatAuthorisation(
@@ -145011,7 +145363,7 @@ soap_in_std__vectorTemplateOfPointerTons1__icatAuthorisation(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__icatAuthorisation(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -145021,7 +145373,7 @@ soap_in_std__vectorTemplateOfPointerTons1__icatAuthorisation(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__icatAuthorisation *> *SOAP_FMAC2
@@ -145035,11 +145387,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__icatAuthorisation(
                                     "icatAuthorisation(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__icatAuthorisation, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__icatAuthorisation *>);
     if (size)
@@ -145108,11 +145460,11 @@ soap_in_std__vectorTemplateOfPointerTons1__datafile(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__datafile *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -145120,13 +145472,13 @@ soap_in_std__vectorTemplateOfPointerTons1__datafile(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__datafile,
               sizeof(ns1__datafile), 1))
         break;
-      if (!soap_in_PointerTons1__datafile(soap, tag, NULL, "ns1:datafile"))
+      if (!soap_in_PointerTons1__datafile(soap, tag, nullptr, "ns1:datafile"))
         break;
     } else if (!soap_in_PointerTons1__datafile(soap, tag, &n, "ns1:datafile"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__datafile(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -145136,7 +145488,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datafile(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__datafile *> *SOAP_FMAC2
@@ -145149,11 +145501,12 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__datafile(
                                     "vectorTemplateOfPointerTons1__datafile(%d,"
                                     " %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__datafile,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__datafile, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__datafile *>);
     if (size)
@@ -145222,11 +145575,11 @@ soap_in_std__vectorTemplateOfPointerTons1__investigation(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__investigation *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -145234,7 +145587,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigation(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__investigation,
               sizeof(ns1__investigation), 1))
         break;
-      if (!soap_in_PointerTons1__investigation(soap, tag, NULL,
+      if (!soap_in_PointerTons1__investigation(soap, tag, nullptr,
                                                "ns1:investigation"))
         break;
     } else if (!soap_in_PointerTons1__investigation(soap, tag, &n,
@@ -145243,7 +145596,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigation(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__investigation(soap,
                                                                         -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -145253,7 +145606,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigation(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__investigation *> *SOAP_FMAC2
@@ -145267,11 +145620,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__investigation(
                                     "investigation(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__investigation, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__investigation *>);
     if (size)
@@ -145348,11 +145701,11 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterComparisonCondition(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__parameterComparisonCondition *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -145361,7 +145714,7 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterComparisonCondition(
               sizeof(ns1__parameterComparisonCondition), 1))
         break;
       if (!soap_in_PointerTons1__parameterComparisonCondition(
-              soap, tag, NULL, "ns1:parameterComparisonCondition"))
+              soap, tag, nullptr, "ns1:parameterComparisonCondition"))
         break;
     } else if (!soap_in_PointerTons1__parameterComparisonCondition(
                    soap, tag, &n, "ns1:parameterComparisonCondition"))
@@ -145369,7 +145722,7 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterComparisonCondition(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__parameterComparisonCondition(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -145379,7 +145732,7 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterComparisonCondition(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__parameterComparisonCondition *> *SOAP_FMAC2
@@ -145393,11 +145746,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__parameterComparisonCondition
                            "_parameterComparisonCondition(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__parameterComparisonCondition,
       n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(std::vector<ns1__parameterComparisonCondition *>);
@@ -145465,7 +145818,7 @@ soap_in_std__vectorTemplateOfLONG64(struct soap *soap, const char *tag,
   for (soap_flag = 0;; soap_flag = 1) {
     LONG64 n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
@@ -145476,12 +145829,12 @@ soap_in_std__vectorTemplateOfLONG64(struct soap *soap, const char *tag,
               SOAP_TYPE_ICat3_LONG64,
               SOAP_TYPE_ICat3_std__vectorTemplateOfLONG64, sizeof(LONG64), 0))
         break;
-      if (!soap_in_LONG64(soap, tag, NULL, "xsd:long"))
+      if (!soap_in_LONG64(soap, tag, nullptr, "xsd:long"))
         break;
     } else if (!soap_in_LONG64(soap, tag, &n, "xsd:long"))
       break;
     if (!a && !(a = soap_new_std__vectorTemplateOfLONG64(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -145491,7 +145844,7 @@ soap_in_std__vectorTemplateOfLONG64(struct soap *soap, const char *tag,
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<LONG64> *SOAP_FMAC2
@@ -145506,10 +145859,10 @@ soap_instantiate_std__vectorTemplateOfLONG64(struct soap *soap, int n,
                    "soap_instantiate_std__vectorTemplateOfLONG64(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_std__vectorTemplateOfLONG64, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_std__vectorTemplateOfLONG64, n,
                 ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<LONG64>);
     if (size)
@@ -145576,11 +145929,11 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterSearch(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__parameterSearch *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -145588,7 +145941,7 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterSearch(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__parameterSearch,
               sizeof(ns1__parameterSearch), 1))
         break;
-      if (!soap_in_PointerTons1__parameterSearch(soap, tag, NULL,
+      if (!soap_in_PointerTons1__parameterSearch(soap, tag, nullptr,
                                                  "ns1:parameterSearch"))
         break;
     } else if (!soap_in_PointerTons1__parameterSearch(soap, tag, &n,
@@ -145597,7 +145950,7 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterSearch(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__parameterSearch(soap,
                                                                           -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -145607,7 +145960,7 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterSearch(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__parameterSearch *> *SOAP_FMAC2
@@ -145621,11 +145974,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__parameterSearch(
                                     "parameterSearch(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__parameterSearch, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__parameterSearch *>);
     if (size)
@@ -145694,11 +146047,11 @@ soap_in_std__vectorTemplateOfPointerTons1__dataset(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__dataset *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -145706,13 +146059,13 @@ soap_in_std__vectorTemplateOfPointerTons1__dataset(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__dataset,
               sizeof(ns1__dataset), 1))
         break;
-      if (!soap_in_PointerTons1__dataset(soap, tag, NULL, "ns1:dataset"))
+      if (!soap_in_PointerTons1__dataset(soap, tag, nullptr, "ns1:dataset"))
         break;
     } else if (!soap_in_PointerTons1__dataset(soap, tag, &n, "ns1:dataset"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__dataset(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -145722,7 +146075,7 @@ soap_in_std__vectorTemplateOfPointerTons1__dataset(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__dataset *> *SOAP_FMAC2
@@ -145736,10 +146089,10 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__dataset(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__dataset, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__dataset,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__dataset *>);
     if (size)
@@ -145808,11 +146161,11 @@ soap_in_std__vectorTemplateOfPointerTons1__instrument(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__instrument *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -145820,14 +146173,15 @@ soap_in_std__vectorTemplateOfPointerTons1__instrument(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__instrument,
               sizeof(ns1__instrument), 1))
         break;
-      if (!soap_in_PointerTons1__instrument(soap, tag, NULL, "ns1:instrument"))
+      if (!soap_in_PointerTons1__instrument(soap, tag, nullptr,
+                                            "ns1:instrument"))
         break;
     } else if (!soap_in_PointerTons1__instrument(soap, tag, &n,
                                                  "ns1:instrument"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__instrument(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -145837,7 +146191,7 @@ soap_in_std__vectorTemplateOfPointerTons1__instrument(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__instrument *> *SOAP_FMAC2
@@ -145850,11 +146204,12 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__instrument(
                                     "vectorTemplateOfPointerTons1__instrument(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__instrument,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__instrument,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__instrument *>);
     if (size)
@@ -145924,11 +146279,11 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileParameter(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__datafileParameter *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -145936,7 +146291,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileParameter(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__datafileParameter,
               sizeof(ns1__datafileParameter), 1))
         break;
-      if (!soap_in_PointerTons1__datafileParameter(soap, tag, NULL,
+      if (!soap_in_PointerTons1__datafileParameter(soap, tag, nullptr,
                                                    "ns1:datafileParameter"))
         break;
     } else if (!soap_in_PointerTons1__datafileParameter(
@@ -145945,7 +146300,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileParameter(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__datafileParameter(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -145955,7 +146310,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileParameter(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__datafileParameter *> *SOAP_FMAC2
@@ -145969,11 +146324,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__datafileParameter(
                                     "datafileParameter(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__datafileParameter, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__datafileParameter *>);
     if (size)
@@ -146043,11 +146398,11 @@ soap_in_std__vectorTemplateOfPointerTons1__facilityCycle(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__facilityCycle *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -146055,7 +146410,7 @@ soap_in_std__vectorTemplateOfPointerTons1__facilityCycle(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__facilityCycle,
               sizeof(ns1__facilityCycle), 1))
         break;
-      if (!soap_in_PointerTons1__facilityCycle(soap, tag, NULL,
+      if (!soap_in_PointerTons1__facilityCycle(soap, tag, nullptr,
                                                "ns1:facilityCycle"))
         break;
     } else if (!soap_in_PointerTons1__facilityCycle(soap, tag, &n,
@@ -146064,7 +146419,7 @@ soap_in_std__vectorTemplateOfPointerTons1__facilityCycle(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__facilityCycle(soap,
                                                                         -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -146074,7 +146429,7 @@ soap_in_std__vectorTemplateOfPointerTons1__facilityCycle(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__facilityCycle *> *SOAP_FMAC2
@@ -146088,11 +146443,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__facilityCycle(
                                     "facilityCycle(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__facilityCycle, n,
       ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__facilityCycle *>);
     if (size)
@@ -146163,11 +146518,11 @@ soap_in_std__vectorTemplateOfPointerTons1__parameter(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__parameter *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -146175,13 +146530,13 @@ soap_in_std__vectorTemplateOfPointerTons1__parameter(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__parameter,
               sizeof(ns1__parameter), 1))
         break;
-      if (!soap_in_PointerTons1__parameter(soap, tag, NULL, "ns1:parameter"))
+      if (!soap_in_PointerTons1__parameter(soap, tag, nullptr, "ns1:parameter"))
         break;
     } else if (!soap_in_PointerTons1__parameter(soap, tag, &n, "ns1:parameter"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__parameter(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -146191,7 +146546,7 @@ soap_in_std__vectorTemplateOfPointerTons1__parameter(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__parameter *> *SOAP_FMAC2
@@ -146204,11 +146559,12 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__parameter(
                                     "vectorTemplateOfPointerTons1__parameter(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__parameter,
-      n, ICat3_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__parameter, n,
+                ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__parameter *>);
     if (size)
@@ -146283,11 +146639,11 @@ soap_in_std__vectorTemplateOfPointerTons1__restrictionComparisonCondition(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__restrictionComparisonCondition *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -146296,7 +146652,7 @@ soap_in_std__vectorTemplateOfPointerTons1__restrictionComparisonCondition(
               sizeof(ns1__restrictionComparisonCondition), 1))
         break;
       if (!soap_in_PointerTons1__restrictionComparisonCondition(
-              soap, tag, NULL, "ns1:restrictionComparisonCondition"))
+              soap, tag, nullptr, "ns1:restrictionComparisonCondition"))
         break;
     } else if (!soap_in_PointerTons1__restrictionComparisonCondition(
                    soap, tag, &n, "ns1:restrictionComparisonCondition"))
@@ -146304,7 +146660,7 @@ soap_in_std__vectorTemplateOfPointerTons1__restrictionComparisonCondition(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__restrictionComparisonCondition(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -146314,7 +146670,7 @@ soap_in_std__vectorTemplateOfPointerTons1__restrictionComparisonCondition(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__restrictionComparisonCondition *> *SOAP_FMAC2
@@ -146328,11 +146684,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__restrictionComparisonConditi
                            "_restrictionComparisonCondition(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__restrictionComparisonCondition,
       n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr =
         (void *)SOAP_NEW(std::vector<ns1__restrictionComparisonCondition *>);
@@ -146405,11 +146761,11 @@ soap_in_std__vectorTemplateOfPointerTons1__sample(struct soap *soap,
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__sample *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -146417,13 +146773,13 @@ soap_in_std__vectorTemplateOfPointerTons1__sample(struct soap *soap,
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__sample,
               sizeof(ns1__sample), 1))
         break;
-      if (!soap_in_PointerTons1__sample(soap, tag, NULL, "ns1:sample"))
+      if (!soap_in_PointerTons1__sample(soap, tag, nullptr, "ns1:sample"))
         break;
     } else if (!soap_in_PointerTons1__sample(soap, tag, &n, "ns1:sample"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__sample(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -146433,7 +146789,7 @@ soap_in_std__vectorTemplateOfPointerTons1__sample(struct soap *soap,
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__sample *> *SOAP_FMAC2
@@ -146447,10 +146803,10 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__sample(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__sample, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__sample,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__sample *>);
     if (size)
@@ -146518,11 +146874,11 @@ soap_in_std__vectorTemplateOfPointerTons1__facilityUser(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__facilityUser *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -146530,7 +146886,7 @@ soap_in_std__vectorTemplateOfPointerTons1__facilityUser(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__facilityUser,
               sizeof(ns1__facilityUser), 1))
         break;
-      if (!soap_in_PointerTons1__facilityUser(soap, tag, NULL,
+      if (!soap_in_PointerTons1__facilityUser(soap, tag, nullptr,
                                               "ns1:facilityUser"))
         break;
     } else if (!soap_in_PointerTons1__facilityUser(soap, tag, &n,
@@ -146539,7 +146895,7 @@ soap_in_std__vectorTemplateOfPointerTons1__facilityUser(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__facilityUser(soap,
                                                                        -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -146549,7 +146905,7 @@ soap_in_std__vectorTemplateOfPointerTons1__facilityUser(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__facilityUser *> *SOAP_FMAC2
@@ -146563,11 +146919,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__facilityUser(
                                     "facilityUser(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat3_std__vectorTemplateOfPointerTons1__facilityUser,
                 n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__facilityUser *>);
     if (size)
@@ -146639,7 +146995,7 @@ soap_in_std__vectorTemplateOfstd__string(struct soap *soap, const char *tag,
   for (soap_flag = 0;; soap_flag = 1) {
     std::string n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
@@ -146651,12 +147007,12 @@ soap_in_std__vectorTemplateOfstd__string(struct soap *soap, const char *tag,
               SOAP_TYPE_ICat3_std__vectorTemplateOfstd__string,
               sizeof(std::string), 0))
         break;
-      if (!soap_in_std__string(soap, tag, NULL, "xsd:string"))
+      if (!soap_in_std__string(soap, tag, nullptr, "xsd:string"))
         break;
     } else if (!soap_in_std__string(soap, tag, &n, "xsd:string"))
       break;
     if (!a && !(a = soap_new_std__vectorTemplateOfstd__string(soap, -1)))
-      return NULL;
+      return nullptr;
     soap_update_pointers(soap, (char *)&n, (char *)&n + sizeof(n),
                          (char *)&(*a->insert(a->end(), n)), (char *)&n);
     if (!tag || *tag == '-')
@@ -146667,7 +147023,7 @@ soap_in_std__vectorTemplateOfstd__string(struct soap *soap, const char *tag,
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<std::string> *SOAP_FMAC2
@@ -146683,10 +147039,10 @@ soap_instantiate_std__vectorTemplateOfstd__string(struct soap *soap, int n,
              "soap_instantiate_std__vectorTemplateOfstd__string(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat3_std__vectorTemplateOfstd__string, n,
-                ICat3_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat3_std__vectorTemplateOfstd__string,
+                n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<std::string>);
     if (size)
@@ -146753,11 +147109,11 @@ soap_in_std__vectorTemplateOfPointerToxsd__anyType(
   for (soap_flag = 0;; soap_flag = 1) {
     xsd__anyType *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -146765,13 +147121,13 @@ soap_in_std__vectorTemplateOfPointerToxsd__anyType(
               SOAP_TYPE_ICat3_std__vectorTemplateOfPointerToxsd__anyType,
               sizeof(xsd__anyType), 1))
         break;
-      if (!soap_in_PointerToxsd__anyType(soap, tag, NULL, "xsd:anyType"))
+      if (!soap_in_PointerToxsd__anyType(soap, tag, nullptr, "xsd:anyType"))
         break;
     } else if (!soap_in_PointerToxsd__anyType(soap, tag, &n, "xsd:anyType"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerToxsd__anyType(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -146781,7 +147137,7 @@ soap_in_std__vectorTemplateOfPointerToxsd__anyType(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<xsd__anyType *> *SOAP_FMAC2
@@ -146795,10 +147151,10 @@ soap_instantiate_std__vectorTemplateOfPointerToxsd__anyType(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat3_std__vectorTemplateOfPointerToxsd__anyType, n,
-      ICat3_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat3_std__vectorTemplateOfPointerToxsd__anyType,
+      n, ICat3_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<xsd__anyType *>);
     if (size)
diff --git a/Framework/ICat/src/ICat3/GSoapGenerated/ICat3ICATPortBindingProxy.cpp b/Framework/ICat/src/ICat3/GSoapGenerated/ICat3ICATPortBindingProxy.cpp
index e082f36750a..caaf3411fb9 100644
--- a/Framework/ICat/src/ICat3/GSoapGenerated/ICat3ICATPortBindingProxy.cpp
+++ b/Framework/ICat/src/ICat3/GSoapGenerated/ICat3ICATPortBindingProxy.cpp
@@ -41,19 +41,19 @@ void ICATPortBindingProxy::ICATPortBindingProxy_init(soap_mode imode,
                                                      soap_mode omode) {
   soap_imode(this, imode);
   soap_omode(this, omode);
-  soap_endpoint = NULL;
+  soap_endpoint = nullptr;
   static const struct Namespace namespaces[] = {
       {"SOAP-ENV", "http://schemas.xmlsoap.org/soap/envelope/",
-       "http://www.w3.org/*/soap-envelope", NULL},
+       "http://www.w3.org/*/soap-envelope", nullptr},
       {"SOAP-ENC", "http://schemas.xmlsoap.org/soap/encoding/",
-       "http://www.w3.org/*/soap-encoding", NULL},
+       "http://www.w3.org/*/soap-encoding", nullptr},
       {"xsi", "http://www.w3.org/2001/XMLSchema-instance",
-       "http://www.w3.org/*/XMLSchema-instance", NULL},
+       "http://www.w3.org/*/XMLSchema-instance", nullptr},
       {"xsd", "http://www.w3.org/2001/XMLSchema",
-       "http://www.w3.org/*/XMLSchema", NULL},
-      {"ns3", "admin.client.icat3.uk", NULL, NULL},
-      {"ns1", "client.icat3.uk", NULL, NULL},
-      {NULL, NULL, NULL, NULL}};
+       "http://www.w3.org/*/XMLSchema", nullptr},
+      {"ns3", "admin.client.icat3.uk", nullptr, nullptr},
+      {"ns1", "client.icat3.uk", nullptr, nullptr},
+      {nullptr, nullptr, nullptr, nullptr}};
   soap_set_namespaces(this, namespaces);
 }
 
@@ -69,7 +69,7 @@ void ICATPortBindingProxy::reset() {
   ICATPortBindingProxy_init(SOAP_IO_DEFAULT, SOAP_IO_DEFAULT);
 }
 
-void ICATPortBindingProxy::soap_noheader() { this->header = NULL; }
+void ICATPortBindingProxy::soap_noheader() { this->header = nullptr; }
 
 const SOAP_ENV__Header *ICATPortBindingProxy::soap_header() {
   return this->header;
@@ -116,11 +116,11 @@ int ICATPortBindingProxy::login(const char *endpoint, const char *soap_action,
   struct __ns1__login soap_tmp___ns1__login;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/loginRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__login.ns1__login_ = ns1__login_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -131,16 +131,17 @@ int ICATPortBindingProxy::login(const char *endpoint, const char *soap_action,
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__login(soap, &soap_tmp___ns1__login, "-ns1:login",
-                              NULL) ||
+                              nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__login(soap, &soap_tmp___ns1__login, "-ns1:login", NULL) ||
+      soap_put___ns1__login(soap, &soap_tmp___ns1__login, "-ns1:login",
+                            nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -167,11 +168,11 @@ int ICATPortBindingProxy::loginLifetime(
   struct __ns1__loginLifetime soap_tmp___ns1__loginLifetime;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/loginLifetimeRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__loginLifetime.ns1__loginLifetime_ = ns1__loginLifetime_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -182,17 +183,17 @@ int ICATPortBindingProxy::loginLifetime(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__loginLifetime(soap, &soap_tmp___ns1__loginLifetime,
-                                      "-ns1:loginLifetime", NULL) ||
+                                      "-ns1:loginLifetime", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__loginLifetime(soap, &soap_tmp___ns1__loginLifetime,
-                                    "-ns1:loginLifetime", NULL) ||
+                                    "-ns1:loginLifetime", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -219,11 +220,11 @@ int ICATPortBindingProxy::logout(const char *endpoint, const char *soap_action,
   struct __ns1__logout soap_tmp___ns1__logout;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/logoutRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__logout.ns1__logout_ = ns1__logout_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -234,17 +235,17 @@ int ICATPortBindingProxy::logout(const char *endpoint, const char *soap_action,
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__logout(soap, &soap_tmp___ns1__logout, "-ns1:logout",
-                               NULL) ||
+                               nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__logout(soap, &soap_tmp___ns1__logout, "-ns1:logout",
-                             NULL) ||
+                             nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -272,11 +273,11 @@ int ICATPortBindingProxy::getUserDetails(
   struct __ns1__getUserDetails soap_tmp___ns1__getUserDetails;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getUserDetailsRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getUserDetails.ns1__getUserDetails = ns1__getUserDetails;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -287,17 +288,17 @@ int ICATPortBindingProxy::getUserDetails(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__getUserDetails(soap, &soap_tmp___ns1__getUserDetails,
-                                       "-ns1:getUserDetails", NULL) ||
+                                       "-ns1:getUserDetails", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getUserDetails(soap, &soap_tmp___ns1__getUserDetails,
-                                     "-ns1:getUserDetails", NULL) ||
+                                     "-ns1:getUserDetails", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -325,11 +326,11 @@ int ICATPortBindingProxy::isSessionValid(
   struct __ns1__isSessionValid soap_tmp___ns1__isSessionValid;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/isSessionValidRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__isSessionValid.ns1__isSessionValid_ = ns1__isSessionValid_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -340,17 +341,17 @@ int ICATPortBindingProxy::isSessionValid(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__isSessionValid(soap, &soap_tmp___ns1__isSessionValid,
-                                       "-ns1:isSessionValid", NULL) ||
+                                       "-ns1:isSessionValid", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__isSessionValid(soap, &soap_tmp___ns1__isSessionValid,
-                                     "-ns1:isSessionValid", NULL) ||
+                                     "-ns1:isSessionValid", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -378,11 +379,11 @@ int ICATPortBindingProxy::getKeywordsForUser(
   struct __ns1__getKeywordsForUser soap_tmp___ns1__getKeywordsForUser;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getKeywordsForUserRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getKeywordsForUser.ns1__getKeywordsForUser_ =
       ns1__getKeywordsForUser_;
   soap_begin(soap);
@@ -394,20 +395,20 @@ int ICATPortBindingProxy::getKeywordsForUser(
   if (soap->mode & SOAP_IO_LENGTH) {
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
-        soap_put___ns1__getKeywordsForUser(soap,
-                                           &soap_tmp___ns1__getKeywordsForUser,
-                                           "-ns1:getKeywordsForUser", NULL) ||
+        soap_put___ns1__getKeywordsForUser(
+            soap, &soap_tmp___ns1__getKeywordsForUser,
+            "-ns1:getKeywordsForUser", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getKeywordsForUser(soap,
                                          &soap_tmp___ns1__getKeywordsForUser,
-                                         "-ns1:getKeywordsForUser", NULL) ||
+                                         "-ns1:getKeywordsForUser", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -437,11 +438,11 @@ int ICATPortBindingProxy::getKeywordsForUserStartWithMax(
       soap_tmp___ns1__getKeywordsForUserStartWithMax;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getKeywordsForUserStartWithMaxRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getKeywordsForUserStartWithMax
       .ns1__getKeywordsForUserStartWithMax_ =
       ns1__getKeywordsForUserStartWithMax_;
@@ -456,18 +457,18 @@ int ICATPortBindingProxy::getKeywordsForUserStartWithMax(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getKeywordsForUserStartWithMax(
             soap, &soap_tmp___ns1__getKeywordsForUserStartWithMax,
-            "-ns1:getKeywordsForUserStartWithMax", NULL) ||
+            "-ns1:getKeywordsForUserStartWithMax", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getKeywordsForUserStartWithMax(
           soap, &soap_tmp___ns1__getKeywordsForUserStartWithMax,
-          "-ns1:getKeywordsForUserStartWithMax", NULL) ||
+          "-ns1:getKeywordsForUserStartWithMax", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -496,11 +497,11 @@ int ICATPortBindingProxy::getKeywordsForUserMax(
   struct __ns1__getKeywordsForUserMax soap_tmp___ns1__getKeywordsForUserMax;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getKeywordsForUserMaxRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getKeywordsForUserMax.ns1__getKeywordsForUserMax_ =
       ns1__getKeywordsForUserMax_;
   soap_begin(soap);
@@ -514,18 +515,18 @@ int ICATPortBindingProxy::getKeywordsForUserMax(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getKeywordsForUserMax(
             soap, &soap_tmp___ns1__getKeywordsForUserMax,
-            "-ns1:getKeywordsForUserMax", NULL) ||
+            "-ns1:getKeywordsForUserMax", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getKeywordsForUserMax(
           soap, &soap_tmp___ns1__getKeywordsForUserMax,
-          "-ns1:getKeywordsForUserMax", NULL) ||
+          "-ns1:getKeywordsForUserMax", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -554,11 +555,11 @@ int ICATPortBindingProxy::getKeywordsForUserType(
   struct __ns1__getKeywordsForUserType soap_tmp___ns1__getKeywordsForUserType;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getKeywordsForUserTypeRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getKeywordsForUserType.ns1__getKeywordsForUserType_ =
       ns1__getKeywordsForUserType_;
   soap_begin(soap);
@@ -572,18 +573,18 @@ int ICATPortBindingProxy::getKeywordsForUserType(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getKeywordsForUserType(
             soap, &soap_tmp___ns1__getKeywordsForUserType,
-            "-ns1:getKeywordsForUserType", NULL) ||
+            "-ns1:getKeywordsForUserType", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getKeywordsForUserType(
           soap, &soap_tmp___ns1__getKeywordsForUserType,
-          "-ns1:getKeywordsForUserType", NULL) ||
+          "-ns1:getKeywordsForUserType", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -612,11 +613,11 @@ int ICATPortBindingProxy::getAllKeywords(
   struct __ns1__getAllKeywords soap_tmp___ns1__getAllKeywords;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getAllKeywordsRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getAllKeywords.ns1__getAllKeywords_ = ns1__getAllKeywords_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -627,17 +628,17 @@ int ICATPortBindingProxy::getAllKeywords(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__getAllKeywords(soap, &soap_tmp___ns1__getAllKeywords,
-                                       "-ns1:getAllKeywords", NULL) ||
+                                       "-ns1:getAllKeywords", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getAllKeywords(soap, &soap_tmp___ns1__getAllKeywords,
-                                     "-ns1:getAllKeywords", NULL) ||
+                                     "-ns1:getAllKeywords", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -665,11 +666,11 @@ int ICATPortBindingProxy::searchByAdvanced(
   struct __ns1__searchByAdvanced soap_tmp___ns1__searchByAdvanced;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchByAdvancedRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchByAdvanced.ns1__searchByAdvanced_ =
       ns1__searchByAdvanced_;
   soap_begin(soap);
@@ -683,17 +684,17 @@ int ICATPortBindingProxy::searchByAdvanced(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchByAdvanced(soap,
                                          &soap_tmp___ns1__searchByAdvanced,
-                                         "-ns1:searchByAdvanced", NULL) ||
+                                         "-ns1:searchByAdvanced", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchByAdvanced(soap, &soap_tmp___ns1__searchByAdvanced,
-                                       "-ns1:searchByAdvanced", NULL) ||
+                                       "-ns1:searchByAdvanced", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -723,11 +724,11 @@ int ICATPortBindingProxy::searchByAdvancedPagination(
       soap_tmp___ns1__searchByAdvancedPagination;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchByAdvancedPaginationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchByAdvancedPagination.ns1__searchByAdvancedPagination_ =
       ns1__searchByAdvancedPagination_;
   soap_begin(soap);
@@ -741,18 +742,18 @@ int ICATPortBindingProxy::searchByAdvancedPagination(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchByAdvancedPagination(
             soap, &soap_tmp___ns1__searchByAdvancedPagination,
-            "-ns1:searchByAdvancedPagination", NULL) ||
+            "-ns1:searchByAdvancedPagination", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchByAdvancedPagination(
           soap, &soap_tmp___ns1__searchByAdvancedPagination,
-          "-ns1:searchByAdvancedPagination", NULL) ||
+          "-ns1:searchByAdvancedPagination", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -781,11 +782,11 @@ int ICATPortBindingProxy::searchByKeywords(
   struct __ns1__searchByKeywords soap_tmp___ns1__searchByKeywords;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchByKeywordsRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchByKeywords.ns1__searchByKeywords_ =
       ns1__searchByKeywords_;
   soap_begin(soap);
@@ -799,17 +800,17 @@ int ICATPortBindingProxy::searchByKeywords(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchByKeywords(soap,
                                          &soap_tmp___ns1__searchByKeywords,
-                                         "-ns1:searchByKeywords", NULL) ||
+                                         "-ns1:searchByKeywords", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchByKeywords(soap, &soap_tmp___ns1__searchByKeywords,
-                                       "-ns1:searchByKeywords", NULL) ||
+                                       "-ns1:searchByKeywords", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -837,11 +838,11 @@ int ICATPortBindingProxy::searchByKeywordsAll(
   struct __ns1__searchByKeywordsAll soap_tmp___ns1__searchByKeywordsAll;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchByKeywordsAllRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchByKeywordsAll.ns1__searchByKeywordsAll_ =
       ns1__searchByKeywordsAll_;
   soap_begin(soap);
@@ -855,18 +856,18 @@ int ICATPortBindingProxy::searchByKeywordsAll(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchByKeywordsAll(
             soap, &soap_tmp___ns1__searchByKeywordsAll,
-            "-ns1:searchByKeywordsAll", NULL) ||
+            "-ns1:searchByKeywordsAll", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__searchByKeywordsAll(soap,
-                                          &soap_tmp___ns1__searchByKeywordsAll,
-                                          "-ns1:searchByKeywordsAll", NULL) ||
+      soap_put___ns1__searchByKeywordsAll(
+          soap, &soap_tmp___ns1__searchByKeywordsAll,
+          "-ns1:searchByKeywordsAll", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -895,11 +896,11 @@ int ICATPortBindingProxy::getMyInvestigations(
   struct __ns1__getMyInvestigations soap_tmp___ns1__getMyInvestigations;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getMyInvestigationsRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getMyInvestigations.ns1__getMyInvestigations_ =
       ns1__getMyInvestigations_;
   soap_begin(soap);
@@ -913,18 +914,18 @@ int ICATPortBindingProxy::getMyInvestigations(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getMyInvestigations(
             soap, &soap_tmp___ns1__getMyInvestigations,
-            "-ns1:getMyInvestigations", NULL) ||
+            "-ns1:getMyInvestigations", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__getMyInvestigations(soap,
-                                          &soap_tmp___ns1__getMyInvestigations,
-                                          "-ns1:getMyInvestigations", NULL) ||
+      soap_put___ns1__getMyInvestigations(
+          soap, &soap_tmp___ns1__getMyInvestigations,
+          "-ns1:getMyInvestigations", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -955,11 +956,11 @@ int ICATPortBindingProxy::getMyInvestigationsIncludes(
       soap_tmp___ns1__getMyInvestigationsIncludes;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getMyInvestigationsIncludesRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getMyInvestigationsIncludes
       .ns1__getMyInvestigationsIncludes_ = ns1__getMyInvestigationsIncludes_;
   soap_begin(soap);
@@ -973,18 +974,18 @@ int ICATPortBindingProxy::getMyInvestigationsIncludes(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getMyInvestigationsIncludes(
             soap, &soap_tmp___ns1__getMyInvestigationsIncludes,
-            "-ns1:getMyInvestigationsIncludes", NULL) ||
+            "-ns1:getMyInvestigationsIncludes", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getMyInvestigationsIncludes(
           soap, &soap_tmp___ns1__getMyInvestigationsIncludes,
-          "-ns1:getMyInvestigationsIncludes", NULL) ||
+          "-ns1:getMyInvestigationsIncludes", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1016,12 +1017,12 @@ int ICATPortBindingProxy::getMyInvestigationsIncludesPagination(
       soap_tmp___ns1__getMyInvestigationsIncludesPagination;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/getMyInvestigationsIncludesPaginationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getMyInvestigationsIncludesPagination
       .ns1__getMyInvestigationsIncludesPagination_ =
       ns1__getMyInvestigationsIncludesPagination_;
@@ -1036,18 +1037,18 @@ int ICATPortBindingProxy::getMyInvestigationsIncludesPagination(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getMyInvestigationsIncludesPagination(
             soap, &soap_tmp___ns1__getMyInvestigationsIncludesPagination,
-            "-ns1:getMyInvestigationsIncludesPagination", NULL) ||
+            "-ns1:getMyInvestigationsIncludesPagination", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getMyInvestigationsIncludesPagination(
           soap, &soap_tmp___ns1__getMyInvestigationsIncludesPagination,
-          "-ns1:getMyInvestigationsIncludesPagination", NULL) ||
+          "-ns1:getMyInvestigationsIncludesPagination", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1076,11 +1077,11 @@ int ICATPortBindingProxy::searchByUserID(
   struct __ns1__searchByUserID soap_tmp___ns1__searchByUserID;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchByUserIDRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchByUserID.ns1__searchByUserID_ = ns1__searchByUserID_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -1091,17 +1092,17 @@ int ICATPortBindingProxy::searchByUserID(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchByUserID(soap, &soap_tmp___ns1__searchByUserID,
-                                       "-ns1:searchByUserID", NULL) ||
+                                       "-ns1:searchByUserID", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchByUserID(soap, &soap_tmp___ns1__searchByUserID,
-                                     "-ns1:searchByUserID", NULL) ||
+                                     "-ns1:searchByUserID", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1131,11 +1132,11 @@ int ICATPortBindingProxy::searchByUserIDPagination(
       soap_tmp___ns1__searchByUserIDPagination;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchByUserIDPaginationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchByUserIDPagination.ns1__searchByUserIDPagination_ =
       ns1__searchByUserIDPagination_;
   soap_begin(soap);
@@ -1149,18 +1150,18 @@ int ICATPortBindingProxy::searchByUserIDPagination(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchByUserIDPagination(
             soap, &soap_tmp___ns1__searchByUserIDPagination,
-            "-ns1:searchByUserIDPagination", NULL) ||
+            "-ns1:searchByUserIDPagination", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchByUserIDPagination(
           soap, &soap_tmp___ns1__searchByUserIDPagination,
-          "-ns1:searchByUserIDPagination", NULL) ||
+          "-ns1:searchByUserIDPagination", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1189,11 +1190,11 @@ int ICATPortBindingProxy::searchByUserSurname(
   struct __ns1__searchByUserSurname soap_tmp___ns1__searchByUserSurname;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchByUserSurnameRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchByUserSurname.ns1__searchByUserSurname_ =
       ns1__searchByUserSurname_;
   soap_begin(soap);
@@ -1207,18 +1208,18 @@ int ICATPortBindingProxy::searchByUserSurname(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchByUserSurname(
             soap, &soap_tmp___ns1__searchByUserSurname,
-            "-ns1:searchByUserSurname", NULL) ||
+            "-ns1:searchByUserSurname", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__searchByUserSurname(soap,
-                                          &soap_tmp___ns1__searchByUserSurname,
-                                          "-ns1:searchByUserSurname", NULL) ||
+      soap_put___ns1__searchByUserSurname(
+          soap, &soap_tmp___ns1__searchByUserSurname,
+          "-ns1:searchByUserSurname", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1249,11 +1250,11 @@ int ICATPortBindingProxy::searchByUserSurnamePagination(
       soap_tmp___ns1__searchByUserSurnamePagination;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchByUserSurnamePaginationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchByUserSurnamePagination
       .ns1__searchByUserSurnamePagination_ =
       ns1__searchByUserSurnamePagination_;
@@ -1268,18 +1269,18 @@ int ICATPortBindingProxy::searchByUserSurnamePagination(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchByUserSurnamePagination(
             soap, &soap_tmp___ns1__searchByUserSurnamePagination,
-            "-ns1:searchByUserSurnamePagination", NULL) ||
+            "-ns1:searchByUserSurnamePagination", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchByUserSurnamePagination(
           soap, &soap_tmp___ns1__searchByUserSurnamePagination,
-          "-ns1:searchByUserSurnamePagination", NULL) ||
+          "-ns1:searchByUserSurnamePagination", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1308,11 +1309,11 @@ int ICATPortBindingProxy::listInstruments(
   struct __ns1__listInstruments soap_tmp___ns1__listInstruments;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/listInstrumentsRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__listInstruments.ns1__listInstruments_ = ns1__listInstruments_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -1323,17 +1324,17 @@ int ICATPortBindingProxy::listInstruments(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__listInstruments(soap, &soap_tmp___ns1__listInstruments,
-                                        "-ns1:listInstruments", NULL) ||
+                                        "-ns1:listInstruments", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__listInstruments(soap, &soap_tmp___ns1__listInstruments,
-                                      "-ns1:listInstruments", NULL) ||
+                                      "-ns1:listInstruments", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1361,11 +1362,11 @@ int ICATPortBindingProxy::getAllInstruments(
   struct __ns1__getAllInstruments soap_tmp___ns1__getAllInstruments;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getAllInstrumentsRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getAllInstruments.ns1__getAllInstruments_ =
       ns1__getAllInstruments_;
   soap_begin(soap);
@@ -1379,17 +1380,17 @@ int ICATPortBindingProxy::getAllInstruments(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getAllInstruments(soap,
                                           &soap_tmp___ns1__getAllInstruments,
-                                          "-ns1:getAllInstruments", NULL) ||
+                                          "-ns1:getAllInstruments", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) || soap_put___ns1__getAllInstruments(
                                        soap, &soap_tmp___ns1__getAllInstruments,
-                                       "-ns1:getAllInstruments", NULL) ||
+                                       "-ns1:getAllInstruments", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1417,11 +1418,11 @@ int ICATPortBindingProxy::listRoles(
   struct __ns1__listRoles soap_tmp___ns1__listRoles;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/listRolesRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__listRoles.ns1__listRoles_ = ns1__listRoles_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -1432,17 +1433,17 @@ int ICATPortBindingProxy::listRoles(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__listRoles(soap, &soap_tmp___ns1__listRoles,
-                                  "-ns1:listRoles", NULL) ||
+                                  "-ns1:listRoles", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__listRoles(soap, &soap_tmp___ns1__listRoles,
-                                "-ns1:listRoles", NULL) ||
+                                "-ns1:listRoles", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1470,11 +1471,11 @@ int ICATPortBindingProxy::listParameters(
   struct __ns1__listParameters soap_tmp___ns1__listParameters;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/listParametersRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__listParameters.ns1__listParameters_ = ns1__listParameters_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -1485,17 +1486,17 @@ int ICATPortBindingProxy::listParameters(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__listParameters(soap, &soap_tmp___ns1__listParameters,
-                                       "-ns1:listParameters", NULL) ||
+                                       "-ns1:listParameters", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__listParameters(soap, &soap_tmp___ns1__listParameters,
-                                     "-ns1:listParameters", NULL) ||
+                                     "-ns1:listParameters", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1523,11 +1524,11 @@ int ICATPortBindingProxy::listFacilityCycles(
   struct __ns1__listFacilityCycles soap_tmp___ns1__listFacilityCycles;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/listFacilityCyclesRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__listFacilityCycles.ns1__listFacilityCycles_ =
       ns1__listFacilityCycles_;
   soap_begin(soap);
@@ -1539,20 +1540,20 @@ int ICATPortBindingProxy::listFacilityCycles(
   if (soap->mode & SOAP_IO_LENGTH) {
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
-        soap_put___ns1__listFacilityCycles(soap,
-                                           &soap_tmp___ns1__listFacilityCycles,
-                                           "-ns1:listFacilityCycles", NULL) ||
+        soap_put___ns1__listFacilityCycles(
+            soap, &soap_tmp___ns1__listFacilityCycles,
+            "-ns1:listFacilityCycles", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__listFacilityCycles(soap,
                                          &soap_tmp___ns1__listFacilityCycles,
-                                         "-ns1:listFacilityCycles", NULL) ||
+                                         "-ns1:listFacilityCycles", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1583,12 +1584,12 @@ int ICATPortBindingProxy::getFacilityCyclesWithDataForInstrument(
       soap_tmp___ns1__getFacilityCyclesWithDataForInstrument;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/getFacilityCyclesWithDataForInstrumentRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getFacilityCyclesWithDataForInstrument
       .ns1__getFacilityCyclesWithDataForInstrument_ =
       ns1__getFacilityCyclesWithDataForInstrument_;
@@ -1603,18 +1604,18 @@ int ICATPortBindingProxy::getFacilityCyclesWithDataForInstrument(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getFacilityCyclesWithDataForInstrument(
             soap, &soap_tmp___ns1__getFacilityCyclesWithDataForInstrument,
-            "-ns1:getFacilityCyclesWithDataForInstrument", NULL) ||
+            "-ns1:getFacilityCyclesWithDataForInstrument", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getFacilityCyclesWithDataForInstrument(
           soap, &soap_tmp___ns1__getFacilityCyclesWithDataForInstrument,
-          "-ns1:getFacilityCyclesWithDataForInstrument", NULL) ||
+          "-ns1:getFacilityCyclesWithDataForInstrument", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1643,11 +1644,11 @@ int ICATPortBindingProxy::getInstrumentsWithData(
   struct __ns1__getInstrumentsWithData soap_tmp___ns1__getInstrumentsWithData;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getInstrumentsWithDataRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getInstrumentsWithData.ns1__getInstrumentsWithData_ =
       ns1__getInstrumentsWithData_;
   soap_begin(soap);
@@ -1661,18 +1662,18 @@ int ICATPortBindingProxy::getInstrumentsWithData(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getInstrumentsWithData(
             soap, &soap_tmp___ns1__getInstrumentsWithData,
-            "-ns1:getInstrumentsWithData", NULL) ||
+            "-ns1:getInstrumentsWithData", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getInstrumentsWithData(
           soap, &soap_tmp___ns1__getInstrumentsWithData,
-          "-ns1:getInstrumentsWithData", NULL) ||
+          "-ns1:getInstrumentsWithData", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1701,11 +1702,11 @@ int ICATPortBindingProxy::listInvestigationTypes(
   struct __ns1__listInvestigationTypes soap_tmp___ns1__listInvestigationTypes;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/listInvestigationTypesRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__listInvestigationTypes.ns1__listInvestigationTypes_ =
       ns1__listInvestigationTypes_;
   soap_begin(soap);
@@ -1719,18 +1720,18 @@ int ICATPortBindingProxy::listInvestigationTypes(
         soap_body_begin_out(soap) ||
         soap_put___ns1__listInvestigationTypes(
             soap, &soap_tmp___ns1__listInvestigationTypes,
-            "-ns1:listInvestigationTypes", NULL) ||
+            "-ns1:listInvestigationTypes", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__listInvestigationTypes(
           soap, &soap_tmp___ns1__listInvestigationTypes,
-          "-ns1:listInvestigationTypes", NULL) ||
+          "-ns1:listInvestigationTypes", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1761,11 +1762,11 @@ int ICATPortBindingProxy::searchSamplesBySampleName(
       soap_tmp___ns1__searchSamplesBySampleName;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchSamplesBySampleNameRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchSamplesBySampleName.ns1__searchSamplesBySampleName_ =
       ns1__searchSamplesBySampleName_;
   soap_begin(soap);
@@ -1779,18 +1780,18 @@ int ICATPortBindingProxy::searchSamplesBySampleName(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchSamplesBySampleName(
             soap, &soap_tmp___ns1__searchSamplesBySampleName,
-            "-ns1:searchSamplesBySampleName", NULL) ||
+            "-ns1:searchSamplesBySampleName", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchSamplesBySampleName(
           soap, &soap_tmp___ns1__searchSamplesBySampleName,
-          "-ns1:searchSamplesBySampleName", NULL) ||
+          "-ns1:searchSamplesBySampleName", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1819,11 +1820,11 @@ int ICATPortBindingProxy::searchDatasetsBySample(
   struct __ns1__searchDatasetsBySample soap_tmp___ns1__searchDatasetsBySample;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchDatasetsBySampleRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatasetsBySample.ns1__searchDatasetsBySample_ =
       ns1__searchDatasetsBySample_;
   soap_begin(soap);
@@ -1837,18 +1838,18 @@ int ICATPortBindingProxy::searchDatasetsBySample(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatasetsBySample(
             soap, &soap_tmp___ns1__searchDatasetsBySample,
-            "-ns1:searchDatasetsBySample", NULL) ||
+            "-ns1:searchDatasetsBySample", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatasetsBySample(
           soap, &soap_tmp___ns1__searchDatasetsBySample,
-          "-ns1:searchDatasetsBySample", NULL) ||
+          "-ns1:searchDatasetsBySample", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1877,11 +1878,11 @@ int ICATPortBindingProxy::listDatasetTypes(
   struct __ns1__listDatasetTypes soap_tmp___ns1__listDatasetTypes;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/listDatasetTypesRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__listDatasetTypes.ns1__listDatasetTypes_ =
       ns1__listDatasetTypes_;
   soap_begin(soap);
@@ -1895,17 +1896,17 @@ int ICATPortBindingProxy::listDatasetTypes(
         soap_body_begin_out(soap) ||
         soap_put___ns1__listDatasetTypes(soap,
                                          &soap_tmp___ns1__listDatasetTypes,
-                                         "-ns1:listDatasetTypes", NULL) ||
+                                         "-ns1:listDatasetTypes", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__listDatasetTypes(soap, &soap_tmp___ns1__listDatasetTypes,
-                                       "-ns1:listDatasetTypes", NULL) ||
+                                       "-ns1:listDatasetTypes", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1933,11 +1934,11 @@ int ICATPortBindingProxy::listDatasetStatus(
   struct __ns1__listDatasetStatus soap_tmp___ns1__listDatasetStatus;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/listDatasetStatusRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__listDatasetStatus.ns1__listDatasetStatus_ =
       ns1__listDatasetStatus_;
   soap_begin(soap);
@@ -1951,17 +1952,17 @@ int ICATPortBindingProxy::listDatasetStatus(
         soap_body_begin_out(soap) ||
         soap_put___ns1__listDatasetStatus(soap,
                                           &soap_tmp___ns1__listDatasetStatus,
-                                          "-ns1:listDatasetStatus", NULL) ||
+                                          "-ns1:listDatasetStatus", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) || soap_put___ns1__listDatasetStatus(
                                        soap, &soap_tmp___ns1__listDatasetStatus,
-                                       "-ns1:listDatasetStatus", NULL) ||
+                                       "-ns1:listDatasetStatus", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1989,11 +1990,11 @@ int ICATPortBindingProxy::searchByRunNumber(
   struct __ns1__searchByRunNumber soap_tmp___ns1__searchByRunNumber;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchByRunNumberRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchByRunNumber.ns1__searchByRunNumber_ =
       ns1__searchByRunNumber_;
   soap_begin(soap);
@@ -2007,17 +2008,17 @@ int ICATPortBindingProxy::searchByRunNumber(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchByRunNumber(soap,
                                           &soap_tmp___ns1__searchByRunNumber,
-                                          "-ns1:searchByRunNumber", NULL) ||
+                                          "-ns1:searchByRunNumber", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) || soap_put___ns1__searchByRunNumber(
                                        soap, &soap_tmp___ns1__searchByRunNumber,
-                                       "-ns1:searchByRunNumber", NULL) ||
+                                       "-ns1:searchByRunNumber", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2047,11 +2048,11 @@ int ICATPortBindingProxy::searchByRunNumberPagination(
       soap_tmp___ns1__searchByRunNumberPagination;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchByRunNumberPaginationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchByRunNumberPagination
       .ns1__searchByRunNumberPagination_ = ns1__searchByRunNumberPagination_;
   soap_begin(soap);
@@ -2065,18 +2066,18 @@ int ICATPortBindingProxy::searchByRunNumberPagination(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchByRunNumberPagination(
             soap, &soap_tmp___ns1__searchByRunNumberPagination,
-            "-ns1:searchByRunNumberPagination", NULL) ||
+            "-ns1:searchByRunNumberPagination", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchByRunNumberPagination(
           soap, &soap_tmp___ns1__searchByRunNumberPagination,
-          "-ns1:searchByRunNumberPagination", NULL) ||
+          "-ns1:searchByRunNumberPagination", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2105,11 +2106,11 @@ int ICATPortBindingProxy::listDatafileFormats(
   struct __ns1__listDatafileFormats soap_tmp___ns1__listDatafileFormats;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/listDatafileFormatsRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__listDatafileFormats.ns1__listDatafileFormats_ =
       ns1__listDatafileFormats_;
   soap_begin(soap);
@@ -2123,18 +2124,18 @@ int ICATPortBindingProxy::listDatafileFormats(
         soap_body_begin_out(soap) ||
         soap_put___ns1__listDatafileFormats(
             soap, &soap_tmp___ns1__listDatafileFormats,
-            "-ns1:listDatafileFormats", NULL) ||
+            "-ns1:listDatafileFormats", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__listDatafileFormats(soap,
-                                          &soap_tmp___ns1__listDatafileFormats,
-                                          "-ns1:listDatafileFormats", NULL) ||
+      soap_put___ns1__listDatafileFormats(
+          soap, &soap_tmp___ns1__listDatafileFormats,
+          "-ns1:listDatafileFormats", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2163,11 +2164,11 @@ int ICATPortBindingProxy::getInvestigation(
   struct __ns1__getInvestigation soap_tmp___ns1__getInvestigation;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getInvestigationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getInvestigation.ns1__getInvestigation_ =
       ns1__getInvestigation_;
   soap_begin(soap);
@@ -2181,17 +2182,17 @@ int ICATPortBindingProxy::getInvestigation(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getInvestigation(soap,
                                          &soap_tmp___ns1__getInvestigation,
-                                         "-ns1:getInvestigation", NULL) ||
+                                         "-ns1:getInvestigation", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getInvestigation(soap, &soap_tmp___ns1__getInvestigation,
-                                       "-ns1:getInvestigation", NULL) ||
+                                       "-ns1:getInvestigation", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2221,11 +2222,11 @@ int ICATPortBindingProxy::getInvestigationIncludes(
       soap_tmp___ns1__getInvestigationIncludes;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getInvestigationIncludesRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getInvestigationIncludes.ns1__getInvestigationIncludes_ =
       ns1__getInvestigationIncludes_;
   soap_begin(soap);
@@ -2239,18 +2240,18 @@ int ICATPortBindingProxy::getInvestigationIncludes(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getInvestigationIncludes(
             soap, &soap_tmp___ns1__getInvestigationIncludes,
-            "-ns1:getInvestigationIncludes", NULL) ||
+            "-ns1:getInvestigationIncludes", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getInvestigationIncludes(
           soap, &soap_tmp___ns1__getInvestigationIncludes,
-          "-ns1:getInvestigationIncludes", NULL) ||
+          "-ns1:getInvestigationIncludes", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2279,11 +2280,11 @@ int ICATPortBindingProxy::getInvestigations(
   struct __ns1__getInvestigations soap_tmp___ns1__getInvestigations;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getInvestigationsRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getInvestigations.ns1__getInvestigations_ =
       ns1__getInvestigations_;
   soap_begin(soap);
@@ -2297,17 +2298,17 @@ int ICATPortBindingProxy::getInvestigations(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getInvestigations(soap,
                                           &soap_tmp___ns1__getInvestigations,
-                                          "-ns1:getInvestigations", NULL) ||
+                                          "-ns1:getInvestigations", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) || soap_put___ns1__getInvestigations(
                                        soap, &soap_tmp___ns1__getInvestigations,
-                                       "-ns1:getInvestigations", NULL) ||
+                                       "-ns1:getInvestigations", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2337,11 +2338,11 @@ int ICATPortBindingProxy::getInvestigationsIncludes(
       soap_tmp___ns1__getInvestigationsIncludes;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getInvestigationsIncludesRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getInvestigationsIncludes.ns1__getInvestigationsIncludes_ =
       ns1__getInvestigationsIncludes_;
   soap_begin(soap);
@@ -2355,18 +2356,18 @@ int ICATPortBindingProxy::getInvestigationsIncludes(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getInvestigationsIncludes(
             soap, &soap_tmp___ns1__getInvestigationsIncludes,
-            "-ns1:getInvestigationsIncludes", NULL) ||
+            "-ns1:getInvestigationsIncludes", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getInvestigationsIncludes(
           soap, &soap_tmp___ns1__getInvestigationsIncludes,
-          "-ns1:getInvestigationsIncludes", NULL) ||
+          "-ns1:getInvestigationsIncludes", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2395,11 +2396,11 @@ int ICATPortBindingProxy::createInvestigation(
   struct __ns1__createInvestigation soap_tmp___ns1__createInvestigation;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/createInvestigationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__createInvestigation.ns1__createInvestigation_ =
       ns1__createInvestigation_;
   soap_begin(soap);
@@ -2413,18 +2414,18 @@ int ICATPortBindingProxy::createInvestigation(
         soap_body_begin_out(soap) ||
         soap_put___ns1__createInvestigation(
             soap, &soap_tmp___ns1__createInvestigation,
-            "-ns1:createInvestigation", NULL) ||
+            "-ns1:createInvestigation", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__createInvestigation(soap,
-                                          &soap_tmp___ns1__createInvestigation,
-                                          "-ns1:createInvestigation", NULL) ||
+      soap_put___ns1__createInvestigation(
+          soap, &soap_tmp___ns1__createInvestigation,
+          "-ns1:createInvestigation", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2455,11 +2456,11 @@ int ICATPortBindingProxy::deleteInvestigation(
       soap_tmp___ns1__deleteInvestigationResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/deleteInvestigationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__deleteInvestigation.ns1__deleteInvestigation_ =
       ns1__deleteInvestigation_;
   soap_begin(soap);
@@ -2473,18 +2474,18 @@ int ICATPortBindingProxy::deleteInvestigation(
         soap_body_begin_out(soap) ||
         soap_put___ns1__deleteInvestigation(
             soap, &soap_tmp___ns1__deleteInvestigation,
-            "-ns1:deleteInvestigation", NULL) ||
+            "-ns1:deleteInvestigation", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__deleteInvestigation(soap,
-                                          &soap_tmp___ns1__deleteInvestigation,
-                                          "-ns1:deleteInvestigation", NULL) ||
+      soap_put___ns1__deleteInvestigation(
+          soap, &soap_tmp___ns1__deleteInvestigation,
+          "-ns1:deleteInvestigation", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2496,7 +2497,7 @@ int ICATPortBindingProxy::deleteInvestigation(
     return soap_closesock(soap);
   soap_tmp___ns1__deleteInvestigationResponse =
       soap_get___ns1__deleteInvestigationResponse(
-          soap, NULL, "-ns1:deleteInvestigationResponse",
+          soap, nullptr, "-ns1:deleteInvestigationResponse",
           "ns1:deleteInvestigationResponse");
   if (!soap_tmp___ns1__deleteInvestigationResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -2522,11 +2523,11 @@ int ICATPortBindingProxy::removeInvestigation(
       soap_tmp___ns1__removeInvestigationResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/removeInvestigationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__removeInvestigation.ns1__removeInvestigation_ =
       ns1__removeInvestigation_;
   soap_begin(soap);
@@ -2540,18 +2541,18 @@ int ICATPortBindingProxy::removeInvestigation(
         soap_body_begin_out(soap) ||
         soap_put___ns1__removeInvestigation(
             soap, &soap_tmp___ns1__removeInvestigation,
-            "-ns1:removeInvestigation", NULL) ||
+            "-ns1:removeInvestigation", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__removeInvestigation(soap,
-                                          &soap_tmp___ns1__removeInvestigation,
-                                          "-ns1:removeInvestigation", NULL) ||
+      soap_put___ns1__removeInvestigation(
+          soap, &soap_tmp___ns1__removeInvestigation,
+          "-ns1:removeInvestigation", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2563,7 +2564,7 @@ int ICATPortBindingProxy::removeInvestigation(
     return soap_closesock(soap);
   soap_tmp___ns1__removeInvestigationResponse =
       soap_get___ns1__removeInvestigationResponse(
-          soap, NULL, "-ns1:removeInvestigationResponse",
+          soap, nullptr, "-ns1:removeInvestigationResponse",
           "ns1:removeInvestigationResponse");
   if (!soap_tmp___ns1__removeInvestigationResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -2587,11 +2588,11 @@ int ICATPortBindingProxy::addKeyword(
   struct __ns1__addKeyword soap_tmp___ns1__addKeyword;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/addKeywordRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__addKeyword.ns1__addKeyword_ = ns1__addKeyword_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -2602,17 +2603,17 @@ int ICATPortBindingProxy::addKeyword(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__addKeyword(soap, &soap_tmp___ns1__addKeyword,
-                                   "-ns1:addKeyword", NULL) ||
+                                   "-ns1:addKeyword", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__addKeyword(soap, &soap_tmp___ns1__addKeyword,
-                                 "-ns1:addKeyword", NULL) ||
+                                 "-ns1:addKeyword", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2640,11 +2641,11 @@ int ICATPortBindingProxy::addInvestigator(
   struct __ns1__addInvestigator soap_tmp___ns1__addInvestigator;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/addInvestigatorRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__addInvestigator.ns1__addInvestigator_ = ns1__addInvestigator_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -2655,17 +2656,17 @@ int ICATPortBindingProxy::addInvestigator(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__addInvestigator(soap, &soap_tmp___ns1__addInvestigator,
-                                        "-ns1:addInvestigator", NULL) ||
+                                        "-ns1:addInvestigator", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__addInvestigator(soap, &soap_tmp___ns1__addInvestigator,
-                                      "-ns1:addInvestigator", NULL) ||
+                                      "-ns1:addInvestigator", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2693,11 +2694,11 @@ int ICATPortBindingProxy::addSample(
   struct __ns1__addSample soap_tmp___ns1__addSample;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/addSampleRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__addSample.ns1__addSample_ = ns1__addSample_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -2708,17 +2709,17 @@ int ICATPortBindingProxy::addSample(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__addSample(soap, &soap_tmp___ns1__addSample,
-                                  "-ns1:addSample", NULL) ||
+                                  "-ns1:addSample", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__addSample(soap, &soap_tmp___ns1__addSample,
-                                "-ns1:addSample", NULL) ||
+                                "-ns1:addSample", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2746,11 +2747,11 @@ int ICATPortBindingProxy::addPublication(
   struct __ns1__addPublication soap_tmp___ns1__addPublication;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/addPublicationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__addPublication.ns1__addPublication_ = ns1__addPublication_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -2761,17 +2762,17 @@ int ICATPortBindingProxy::addPublication(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__addPublication(soap, &soap_tmp___ns1__addPublication,
-                                       "-ns1:addPublication", NULL) ||
+                                       "-ns1:addPublication", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__addPublication(soap, &soap_tmp___ns1__addPublication,
-                                     "-ns1:addPublication", NULL) ||
+                                     "-ns1:addPublication", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2799,11 +2800,11 @@ int ICATPortBindingProxy::addSampleParameter(
   struct __ns1__addSampleParameter soap_tmp___ns1__addSampleParameter;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/addSampleParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__addSampleParameter.ns1__addSampleParameter_ =
       ns1__addSampleParameter_;
   soap_begin(soap);
@@ -2815,20 +2816,20 @@ int ICATPortBindingProxy::addSampleParameter(
   if (soap->mode & SOAP_IO_LENGTH) {
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
-        soap_put___ns1__addSampleParameter(soap,
-                                           &soap_tmp___ns1__addSampleParameter,
-                                           "-ns1:addSampleParameter", NULL) ||
+        soap_put___ns1__addSampleParameter(
+            soap, &soap_tmp___ns1__addSampleParameter,
+            "-ns1:addSampleParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__addSampleParameter(soap,
                                          &soap_tmp___ns1__addSampleParameter,
-                                         "-ns1:addSampleParameter", NULL) ||
+                                         "-ns1:addSampleParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2858,11 +2859,11 @@ int ICATPortBindingProxy::deleteInvestigator(
       soap_tmp___ns1__deleteInvestigatorResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/deleteInvestigatorRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__deleteInvestigator.ns1__deleteInvestigator_ =
       ns1__deleteInvestigator_;
   soap_begin(soap);
@@ -2874,20 +2875,20 @@ int ICATPortBindingProxy::deleteInvestigator(
   if (soap->mode & SOAP_IO_LENGTH) {
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
-        soap_put___ns1__deleteInvestigator(soap,
-                                           &soap_tmp___ns1__deleteInvestigator,
-                                           "-ns1:deleteInvestigator", NULL) ||
+        soap_put___ns1__deleteInvestigator(
+            soap, &soap_tmp___ns1__deleteInvestigator,
+            "-ns1:deleteInvestigator", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__deleteInvestigator(soap,
                                          &soap_tmp___ns1__deleteInvestigator,
-                                         "-ns1:deleteInvestigator", NULL) ||
+                                         "-ns1:deleteInvestigator", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2899,7 +2900,7 @@ int ICATPortBindingProxy::deleteInvestigator(
     return soap_closesock(soap);
   soap_tmp___ns1__deleteInvestigatorResponse =
       soap_get___ns1__deleteInvestigatorResponse(
-          soap, NULL, "-ns1:deleteInvestigatorResponse",
+          soap, nullptr, "-ns1:deleteInvestigatorResponse",
           "ns1:deleteInvestigatorResponse");
   if (!soap_tmp___ns1__deleteInvestigatorResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -2924,11 +2925,11 @@ int ICATPortBindingProxy::deleteKeyword(
   struct __ns1__deleteKeywordResponse *soap_tmp___ns1__deleteKeywordResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/deleteKeywordRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__deleteKeyword.ns1__deleteKeyword_ = ns1__deleteKeyword_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -2939,17 +2940,17 @@ int ICATPortBindingProxy::deleteKeyword(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__deleteKeyword(soap, &soap_tmp___ns1__deleteKeyword,
-                                      "-ns1:deleteKeyword", NULL) ||
+                                      "-ns1:deleteKeyword", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__deleteKeyword(soap, &soap_tmp___ns1__deleteKeyword,
-                                    "-ns1:deleteKeyword", NULL) ||
+                                    "-ns1:deleteKeyword", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -2960,7 +2961,7 @@ int ICATPortBindingProxy::deleteKeyword(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__deleteKeywordResponse = soap_get___ns1__deleteKeywordResponse(
-      soap, NULL, "-ns1:deleteKeywordResponse", "ns1:deleteKeywordResponse");
+      soap, nullptr, "-ns1:deleteKeywordResponse", "ns1:deleteKeywordResponse");
   if (!soap_tmp___ns1__deleteKeywordResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -2983,11 +2984,11 @@ int ICATPortBindingProxy::deletePublication(
       soap_tmp___ns1__deletePublicationResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/deletePublicationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__deletePublication.ns1__deletePublication_ =
       ns1__deletePublication_;
   soap_begin(soap);
@@ -3001,17 +3002,17 @@ int ICATPortBindingProxy::deletePublication(
         soap_body_begin_out(soap) ||
         soap_put___ns1__deletePublication(soap,
                                           &soap_tmp___ns1__deletePublication,
-                                          "-ns1:deletePublication", NULL) ||
+                                          "-ns1:deletePublication", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) || soap_put___ns1__deletePublication(
                                        soap, &soap_tmp___ns1__deletePublication,
-                                       "-ns1:deletePublication", NULL) ||
+                                       "-ns1:deletePublication", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3023,7 +3024,7 @@ int ICATPortBindingProxy::deletePublication(
     return soap_closesock(soap);
   soap_tmp___ns1__deletePublicationResponse =
       soap_get___ns1__deletePublicationResponse(
-          soap, NULL, "-ns1:deletePublicationResponse",
+          soap, nullptr, "-ns1:deletePublicationResponse",
           "ns1:deletePublicationResponse");
   if (!soap_tmp___ns1__deletePublicationResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -3048,11 +3049,11 @@ int ICATPortBindingProxy::deleteSample(
   struct __ns1__deleteSampleResponse *soap_tmp___ns1__deleteSampleResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/deleteSampleRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__deleteSample.ns1__deleteSample_ = ns1__deleteSample_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -3063,17 +3064,17 @@ int ICATPortBindingProxy::deleteSample(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__deleteSample(soap, &soap_tmp___ns1__deleteSample,
-                                     "-ns1:deleteSample", NULL) ||
+                                     "-ns1:deleteSample", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__deleteSample(soap, &soap_tmp___ns1__deleteSample,
-                                   "-ns1:deleteSample", NULL) ||
+                                   "-ns1:deleteSample", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3084,7 +3085,7 @@ int ICATPortBindingProxy::deleteSample(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__deleteSampleResponse = soap_get___ns1__deleteSampleResponse(
-      soap, NULL, "-ns1:deleteSampleResponse", "ns1:deleteSampleResponse");
+      soap, nullptr, "-ns1:deleteSampleResponse", "ns1:deleteSampleResponse");
   if (!soap_tmp___ns1__deleteSampleResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -3107,11 +3108,11 @@ int ICATPortBindingProxy::deleteSampleParameter(
       soap_tmp___ns1__deleteSampleParameterResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/deleteSampleParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__deleteSampleParameter.ns1__deleteSampleParameter_ =
       ns1__deleteSampleParameter_;
   soap_begin(soap);
@@ -3125,18 +3126,18 @@ int ICATPortBindingProxy::deleteSampleParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__deleteSampleParameter(
             soap, &soap_tmp___ns1__deleteSampleParameter,
-            "-ns1:deleteSampleParameter", NULL) ||
+            "-ns1:deleteSampleParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__deleteSampleParameter(
           soap, &soap_tmp___ns1__deleteSampleParameter,
-          "-ns1:deleteSampleParameter", NULL) ||
+          "-ns1:deleteSampleParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3148,7 +3149,7 @@ int ICATPortBindingProxy::deleteSampleParameter(
     return soap_closesock(soap);
   soap_tmp___ns1__deleteSampleParameterResponse =
       soap_get___ns1__deleteSampleParameterResponse(
-          soap, NULL, "-ns1:deleteSampleParameterResponse",
+          soap, nullptr, "-ns1:deleteSampleParameterResponse",
           "ns1:deleteSampleParameterResponse");
   if (!soap_tmp___ns1__deleteSampleParameterResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -3174,11 +3175,11 @@ int ICATPortBindingProxy::modifyInvestigation(
       soap_tmp___ns1__modifyInvestigationResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/modifyInvestigationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__modifyInvestigation.ns1__modifyInvestigation_ =
       ns1__modifyInvestigation_;
   soap_begin(soap);
@@ -3192,18 +3193,18 @@ int ICATPortBindingProxy::modifyInvestigation(
         soap_body_begin_out(soap) ||
         soap_put___ns1__modifyInvestigation(
             soap, &soap_tmp___ns1__modifyInvestigation,
-            "-ns1:modifyInvestigation", NULL) ||
+            "-ns1:modifyInvestigation", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__modifyInvestigation(soap,
-                                          &soap_tmp___ns1__modifyInvestigation,
-                                          "-ns1:modifyInvestigation", NULL) ||
+      soap_put___ns1__modifyInvestigation(
+          soap, &soap_tmp___ns1__modifyInvestigation,
+          "-ns1:modifyInvestigation", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3215,7 +3216,7 @@ int ICATPortBindingProxy::modifyInvestigation(
     return soap_closesock(soap);
   soap_tmp___ns1__modifyInvestigationResponse =
       soap_get___ns1__modifyInvestigationResponse(
-          soap, NULL, "-ns1:modifyInvestigationResponse",
+          soap, nullptr, "-ns1:modifyInvestigationResponse",
           "ns1:modifyInvestigationResponse");
   if (!soap_tmp___ns1__modifyInvestigationResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -3241,11 +3242,11 @@ int ICATPortBindingProxy::modifyInvestigator(
       soap_tmp___ns1__modifyInvestigatorResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/modifyInvestigatorRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__modifyInvestigator.ns1__modifyInvestigator_ =
       ns1__modifyInvestigator_;
   soap_begin(soap);
@@ -3257,20 +3258,20 @@ int ICATPortBindingProxy::modifyInvestigator(
   if (soap->mode & SOAP_IO_LENGTH) {
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
-        soap_put___ns1__modifyInvestigator(soap,
-                                           &soap_tmp___ns1__modifyInvestigator,
-                                           "-ns1:modifyInvestigator", NULL) ||
+        soap_put___ns1__modifyInvestigator(
+            soap, &soap_tmp___ns1__modifyInvestigator,
+            "-ns1:modifyInvestigator", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__modifyInvestigator(soap,
                                          &soap_tmp___ns1__modifyInvestigator,
-                                         "-ns1:modifyInvestigator", NULL) ||
+                                         "-ns1:modifyInvestigator", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3282,7 +3283,7 @@ int ICATPortBindingProxy::modifyInvestigator(
     return soap_closesock(soap);
   soap_tmp___ns1__modifyInvestigatorResponse =
       soap_get___ns1__modifyInvestigatorResponse(
-          soap, NULL, "-ns1:modifyInvestigatorResponse",
+          soap, nullptr, "-ns1:modifyInvestigatorResponse",
           "ns1:modifyInvestigatorResponse");
   if (!soap_tmp___ns1__modifyInvestigatorResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -3307,11 +3308,11 @@ int ICATPortBindingProxy::modifySample(
   struct __ns1__modifySampleResponse *soap_tmp___ns1__modifySampleResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/modifySampleRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__modifySample.ns1__modifySample_ = ns1__modifySample_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -3322,17 +3323,17 @@ int ICATPortBindingProxy::modifySample(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__modifySample(soap, &soap_tmp___ns1__modifySample,
-                                     "-ns1:modifySample", NULL) ||
+                                     "-ns1:modifySample", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__modifySample(soap, &soap_tmp___ns1__modifySample,
-                                   "-ns1:modifySample", NULL) ||
+                                   "-ns1:modifySample", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3343,7 +3344,7 @@ int ICATPortBindingProxy::modifySample(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__modifySampleResponse = soap_get___ns1__modifySampleResponse(
-      soap, NULL, "-ns1:modifySampleResponse", "ns1:modifySampleResponse");
+      soap, nullptr, "-ns1:modifySampleResponse", "ns1:modifySampleResponse");
   if (!soap_tmp___ns1__modifySampleResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -3366,11 +3367,11 @@ int ICATPortBindingProxy::modifyPublication(
       soap_tmp___ns1__modifyPublicationResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/modifyPublicationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__modifyPublication.ns1__modifyPublication_ =
       ns1__modifyPublication_;
   soap_begin(soap);
@@ -3384,17 +3385,17 @@ int ICATPortBindingProxy::modifyPublication(
         soap_body_begin_out(soap) ||
         soap_put___ns1__modifyPublication(soap,
                                           &soap_tmp___ns1__modifyPublication,
-                                          "-ns1:modifyPublication", NULL) ||
+                                          "-ns1:modifyPublication", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) || soap_put___ns1__modifyPublication(
                                        soap, &soap_tmp___ns1__modifyPublication,
-                                       "-ns1:modifyPublication", NULL) ||
+                                       "-ns1:modifyPublication", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3406,7 +3407,7 @@ int ICATPortBindingProxy::modifyPublication(
     return soap_closesock(soap);
   soap_tmp___ns1__modifyPublicationResponse =
       soap_get___ns1__modifyPublicationResponse(
-          soap, NULL, "-ns1:modifyPublicationResponse",
+          soap, nullptr, "-ns1:modifyPublicationResponse",
           "ns1:modifyPublicationResponse");
   if (!soap_tmp___ns1__modifyPublicationResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -3432,11 +3433,11 @@ int ICATPortBindingProxy::modifySampleParameter(
       soap_tmp___ns1__modifySampleParameterResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/modifySampleParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__modifySampleParameter.ns1__modifySampleParameter_ =
       ns1__modifySampleParameter_;
   soap_begin(soap);
@@ -3450,18 +3451,18 @@ int ICATPortBindingProxy::modifySampleParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__modifySampleParameter(
             soap, &soap_tmp___ns1__modifySampleParameter,
-            "-ns1:modifySampleParameter", NULL) ||
+            "-ns1:modifySampleParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__modifySampleParameter(
           soap, &soap_tmp___ns1__modifySampleParameter,
-          "-ns1:modifySampleParameter", NULL) ||
+          "-ns1:modifySampleParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3473,7 +3474,7 @@ int ICATPortBindingProxy::modifySampleParameter(
     return soap_closesock(soap);
   soap_tmp___ns1__modifySampleParameterResponse =
       soap_get___ns1__modifySampleParameterResponse(
-          soap, NULL, "-ns1:modifySampleParameterResponse",
+          soap, nullptr, "-ns1:modifySampleParameterResponse",
           "ns1:modifySampleParameterResponse");
   if (!soap_tmp___ns1__modifySampleParameterResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -3498,11 +3499,11 @@ int ICATPortBindingProxy::removeKeyword(
   struct __ns1__removeKeywordResponse *soap_tmp___ns1__removeKeywordResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/removeKeywordRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__removeKeyword.ns1__removeKeyword_ = ns1__removeKeyword_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -3513,17 +3514,17 @@ int ICATPortBindingProxy::removeKeyword(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__removeKeyword(soap, &soap_tmp___ns1__removeKeyword,
-                                      "-ns1:removeKeyword", NULL) ||
+                                      "-ns1:removeKeyword", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__removeKeyword(soap, &soap_tmp___ns1__removeKeyword,
-                                    "-ns1:removeKeyword", NULL) ||
+                                    "-ns1:removeKeyword", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3534,7 +3535,7 @@ int ICATPortBindingProxy::removeKeyword(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__removeKeywordResponse = soap_get___ns1__removeKeywordResponse(
-      soap, NULL, "-ns1:removeKeywordResponse", "ns1:removeKeywordResponse");
+      soap, nullptr, "-ns1:removeKeywordResponse", "ns1:removeKeywordResponse");
   if (!soap_tmp___ns1__removeKeywordResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -3557,11 +3558,11 @@ int ICATPortBindingProxy::removeInvestigator(
       soap_tmp___ns1__removeInvestigatorResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/removeInvestigatorRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__removeInvestigator.ns1__removeInvestigator_ =
       ns1__removeInvestigator_;
   soap_begin(soap);
@@ -3573,20 +3574,20 @@ int ICATPortBindingProxy::removeInvestigator(
   if (soap->mode & SOAP_IO_LENGTH) {
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
-        soap_put___ns1__removeInvestigator(soap,
-                                           &soap_tmp___ns1__removeInvestigator,
-                                           "-ns1:removeInvestigator", NULL) ||
+        soap_put___ns1__removeInvestigator(
+            soap, &soap_tmp___ns1__removeInvestigator,
+            "-ns1:removeInvestigator", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__removeInvestigator(soap,
                                          &soap_tmp___ns1__removeInvestigator,
-                                         "-ns1:removeInvestigator", NULL) ||
+                                         "-ns1:removeInvestigator", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3598,7 +3599,7 @@ int ICATPortBindingProxy::removeInvestigator(
     return soap_closesock(soap);
   soap_tmp___ns1__removeInvestigatorResponse =
       soap_get___ns1__removeInvestigatorResponse(
-          soap, NULL, "-ns1:removeInvestigatorResponse",
+          soap, nullptr, "-ns1:removeInvestigatorResponse",
           "ns1:removeInvestigatorResponse");
   if (!soap_tmp___ns1__removeInvestigatorResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -3624,11 +3625,11 @@ int ICATPortBindingProxy::removePublication(
       soap_tmp___ns1__removePublicationResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/removePublicationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__removePublication.ns1__removePublication_ =
       ns1__removePublication_;
   soap_begin(soap);
@@ -3642,17 +3643,17 @@ int ICATPortBindingProxy::removePublication(
         soap_body_begin_out(soap) ||
         soap_put___ns1__removePublication(soap,
                                           &soap_tmp___ns1__removePublication,
-                                          "-ns1:removePublication", NULL) ||
+                                          "-ns1:removePublication", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) || soap_put___ns1__removePublication(
                                        soap, &soap_tmp___ns1__removePublication,
-                                       "-ns1:removePublication", NULL) ||
+                                       "-ns1:removePublication", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3664,7 +3665,7 @@ int ICATPortBindingProxy::removePublication(
     return soap_closesock(soap);
   soap_tmp___ns1__removePublicationResponse =
       soap_get___ns1__removePublicationResponse(
-          soap, NULL, "-ns1:removePublicationResponse",
+          soap, nullptr, "-ns1:removePublicationResponse",
           "ns1:removePublicationResponse");
   if (!soap_tmp___ns1__removePublicationResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -3689,11 +3690,11 @@ int ICATPortBindingProxy::removeSample(
   struct __ns1__removeSampleResponse *soap_tmp___ns1__removeSampleResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/removeSampleRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__removeSample.ns1__removeSample_ = ns1__removeSample_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -3704,17 +3705,17 @@ int ICATPortBindingProxy::removeSample(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__removeSample(soap, &soap_tmp___ns1__removeSample,
-                                     "-ns1:removeSample", NULL) ||
+                                     "-ns1:removeSample", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__removeSample(soap, &soap_tmp___ns1__removeSample,
-                                   "-ns1:removeSample", NULL) ||
+                                   "-ns1:removeSample", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3725,7 +3726,7 @@ int ICATPortBindingProxy::removeSample(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__removeSampleResponse = soap_get___ns1__removeSampleResponse(
-      soap, NULL, "-ns1:removeSampleResponse", "ns1:removeSampleResponse");
+      soap, nullptr, "-ns1:removeSampleResponse", "ns1:removeSampleResponse");
   if (!soap_tmp___ns1__removeSampleResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -3748,11 +3749,11 @@ int ICATPortBindingProxy::removeSampleParameter(
       soap_tmp___ns1__removeSampleParameterResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/removeSampleParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__removeSampleParameter.ns1__removeSampleParameter_ =
       ns1__removeSampleParameter_;
   soap_begin(soap);
@@ -3766,18 +3767,18 @@ int ICATPortBindingProxy::removeSampleParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__removeSampleParameter(
             soap, &soap_tmp___ns1__removeSampleParameter,
-            "-ns1:removeSampleParameter", NULL) ||
+            "-ns1:removeSampleParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__removeSampleParameter(
           soap, &soap_tmp___ns1__removeSampleParameter,
-          "-ns1:removeSampleParameter", NULL) ||
+          "-ns1:removeSampleParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3789,7 +3790,7 @@ int ICATPortBindingProxy::removeSampleParameter(
     return soap_closesock(soap);
   soap_tmp___ns1__removeSampleParameterResponse =
       soap_get___ns1__removeSampleParameterResponse(
-          soap, NULL, "-ns1:removeSampleParameterResponse",
+          soap, nullptr, "-ns1:removeSampleParameterResponse",
           "ns1:removeSampleParameterResponse");
   if (!soap_tmp___ns1__removeSampleParameterResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -3813,11 +3814,11 @@ int ICATPortBindingProxy::getDataset(
   struct __ns1__getDataset soap_tmp___ns1__getDataset;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getDatasetRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getDataset.ns1__getDataset_ = ns1__getDataset_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -3828,17 +3829,17 @@ int ICATPortBindingProxy::getDataset(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__getDataset(soap, &soap_tmp___ns1__getDataset,
-                                   "-ns1:getDataset", NULL) ||
+                                   "-ns1:getDataset", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getDataset(soap, &soap_tmp___ns1__getDataset,
-                                 "-ns1:getDataset", NULL) ||
+                                 "-ns1:getDataset", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3866,11 +3867,11 @@ int ICATPortBindingProxy::getDatasetIncludes(
   struct __ns1__getDatasetIncludes soap_tmp___ns1__getDatasetIncludes;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getDatasetIncludesRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getDatasetIncludes.ns1__getDatasetIncludes_ =
       ns1__getDatasetIncludes_;
   soap_begin(soap);
@@ -3882,20 +3883,20 @@ int ICATPortBindingProxy::getDatasetIncludes(
   if (soap->mode & SOAP_IO_LENGTH) {
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
-        soap_put___ns1__getDatasetIncludes(soap,
-                                           &soap_tmp___ns1__getDatasetIncludes,
-                                           "-ns1:getDatasetIncludes", NULL) ||
+        soap_put___ns1__getDatasetIncludes(
+            soap, &soap_tmp___ns1__getDatasetIncludes,
+            "-ns1:getDatasetIncludes", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getDatasetIncludes(soap,
                                          &soap_tmp___ns1__getDatasetIncludes,
-                                         "-ns1:getDatasetIncludes", NULL) ||
+                                         "-ns1:getDatasetIncludes", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3923,11 +3924,11 @@ int ICATPortBindingProxy::getDatasets(
   struct __ns1__getDatasets soap_tmp___ns1__getDatasets;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getDatasetsRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getDatasets.ns1__getDatasets_ = ns1__getDatasets_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -3938,17 +3939,17 @@ int ICATPortBindingProxy::getDatasets(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__getDatasets(soap, &soap_tmp___ns1__getDatasets,
-                                    "-ns1:getDatasets", NULL) ||
+                                    "-ns1:getDatasets", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getDatasets(soap, &soap_tmp___ns1__getDatasets,
-                                  "-ns1:getDatasets", NULL) ||
+                                  "-ns1:getDatasets", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -3976,11 +3977,11 @@ int ICATPortBindingProxy::createDataSet(
   struct __ns1__createDataSet soap_tmp___ns1__createDataSet;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/createDataSetRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__createDataSet.ns1__createDataSet_ = ns1__createDataSet_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -3991,17 +3992,17 @@ int ICATPortBindingProxy::createDataSet(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__createDataSet(soap, &soap_tmp___ns1__createDataSet,
-                                      "-ns1:createDataSet", NULL) ||
+                                      "-ns1:createDataSet", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__createDataSet(soap, &soap_tmp___ns1__createDataSet,
-                                    "-ns1:createDataSet", NULL) ||
+                                    "-ns1:createDataSet", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4029,11 +4030,11 @@ int ICATPortBindingProxy::createDataSets(
   struct __ns1__createDataSets soap_tmp___ns1__createDataSets;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/createDataSetsRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__createDataSets.ns1__createDataSets_ = ns1__createDataSets_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -4044,17 +4045,17 @@ int ICATPortBindingProxy::createDataSets(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__createDataSets(soap, &soap_tmp___ns1__createDataSets,
-                                       "-ns1:createDataSets", NULL) ||
+                                       "-ns1:createDataSets", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__createDataSets(soap, &soap_tmp___ns1__createDataSets,
-                                     "-ns1:createDataSets", NULL) ||
+                                     "-ns1:createDataSets", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4083,11 +4084,11 @@ int ICATPortBindingProxy::deleteDataSet(
   struct __ns1__deleteDataSetResponse *soap_tmp___ns1__deleteDataSetResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/deleteDataSetRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__deleteDataSet.ns1__deleteDataSet_ = ns1__deleteDataSet_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -4098,17 +4099,17 @@ int ICATPortBindingProxy::deleteDataSet(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__deleteDataSet(soap, &soap_tmp___ns1__deleteDataSet,
-                                      "-ns1:deleteDataSet", NULL) ||
+                                      "-ns1:deleteDataSet", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__deleteDataSet(soap, &soap_tmp___ns1__deleteDataSet,
-                                    "-ns1:deleteDataSet", NULL) ||
+                                    "-ns1:deleteDataSet", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4119,7 +4120,7 @@ int ICATPortBindingProxy::deleteDataSet(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__deleteDataSetResponse = soap_get___ns1__deleteDataSetResponse(
-      soap, NULL, "-ns1:deleteDataSetResponse", "ns1:deleteDataSetResponse");
+      soap, nullptr, "-ns1:deleteDataSetResponse", "ns1:deleteDataSetResponse");
   if (!soap_tmp___ns1__deleteDataSetResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -4142,11 +4143,11 @@ int ICATPortBindingProxy::deleteDataSetParameter(
       soap_tmp___ns1__deleteDataSetParameterResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/deleteDataSetParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__deleteDataSetParameter.ns1__deleteDataSetParameter_ =
       ns1__deleteDataSetParameter_;
   soap_begin(soap);
@@ -4160,18 +4161,18 @@ int ICATPortBindingProxy::deleteDataSetParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__deleteDataSetParameter(
             soap, &soap_tmp___ns1__deleteDataSetParameter,
-            "-ns1:deleteDataSetParameter", NULL) ||
+            "-ns1:deleteDataSetParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__deleteDataSetParameter(
           soap, &soap_tmp___ns1__deleteDataSetParameter,
-          "-ns1:deleteDataSetParameter", NULL) ||
+          "-ns1:deleteDataSetParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4183,7 +4184,7 @@ int ICATPortBindingProxy::deleteDataSetParameter(
     return soap_closesock(soap);
   soap_tmp___ns1__deleteDataSetParameterResponse =
       soap_get___ns1__deleteDataSetParameterResponse(
-          soap, NULL, "-ns1:deleteDataSetParameterResponse",
+          soap, nullptr, "-ns1:deleteDataSetParameterResponse",
           "ns1:deleteDataSetParameterResponse");
   if (!soap_tmp___ns1__deleteDataSetParameterResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -4208,11 +4209,11 @@ int ICATPortBindingProxy::modifyDataSet(
   struct __ns1__modifyDataSetResponse *soap_tmp___ns1__modifyDataSetResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/modifyDataSetRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__modifyDataSet.ns1__modifyDataSet_ = ns1__modifyDataSet_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -4223,17 +4224,17 @@ int ICATPortBindingProxy::modifyDataSet(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__modifyDataSet(soap, &soap_tmp___ns1__modifyDataSet,
-                                      "-ns1:modifyDataSet", NULL) ||
+                                      "-ns1:modifyDataSet", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__modifyDataSet(soap, &soap_tmp___ns1__modifyDataSet,
-                                    "-ns1:modifyDataSet", NULL) ||
+                                    "-ns1:modifyDataSet", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4244,7 +4245,7 @@ int ICATPortBindingProxy::modifyDataSet(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__modifyDataSetResponse = soap_get___ns1__modifyDataSetResponse(
-      soap, NULL, "-ns1:modifyDataSetResponse", "ns1:modifyDataSetResponse");
+      soap, nullptr, "-ns1:modifyDataSetResponse", "ns1:modifyDataSetResponse");
   if (!soap_tmp___ns1__modifyDataSetResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -4267,11 +4268,11 @@ int ICATPortBindingProxy::modifyDataSetParameter(
       soap_tmp___ns1__modifyDataSetParameterResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/modifyDataSetParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__modifyDataSetParameter.ns1__modifyDataSetParameter_ =
       ns1__modifyDataSetParameter_;
   soap_begin(soap);
@@ -4285,18 +4286,18 @@ int ICATPortBindingProxy::modifyDataSetParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__modifyDataSetParameter(
             soap, &soap_tmp___ns1__modifyDataSetParameter,
-            "-ns1:modifyDataSetParameter", NULL) ||
+            "-ns1:modifyDataSetParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__modifyDataSetParameter(
           soap, &soap_tmp___ns1__modifyDataSetParameter,
-          "-ns1:modifyDataSetParameter", NULL) ||
+          "-ns1:modifyDataSetParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4308,7 +4309,7 @@ int ICATPortBindingProxy::modifyDataSetParameter(
     return soap_closesock(soap);
   soap_tmp___ns1__modifyDataSetParameterResponse =
       soap_get___ns1__modifyDataSetParameterResponse(
-          soap, NULL, "-ns1:modifyDataSetParameterResponse",
+          soap, nullptr, "-ns1:modifyDataSetParameterResponse",
           "ns1:modifyDataSetParameterResponse");
   if (!soap_tmp___ns1__modifyDataSetParameterResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -4334,11 +4335,11 @@ int ICATPortBindingProxy::setDataSetSample(
       soap_tmp___ns1__setDataSetSampleResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/setDataSetSampleRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__setDataSetSample.ns1__setDataSetSample_ =
       ns1__setDataSetSample_;
   soap_begin(soap);
@@ -4352,17 +4353,17 @@ int ICATPortBindingProxy::setDataSetSample(
         soap_body_begin_out(soap) ||
         soap_put___ns1__setDataSetSample(soap,
                                          &soap_tmp___ns1__setDataSetSample,
-                                         "-ns1:setDataSetSample", NULL) ||
+                                         "-ns1:setDataSetSample", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__setDataSetSample(soap, &soap_tmp___ns1__setDataSetSample,
-                                       "-ns1:setDataSetSample", NULL) ||
+                                       "-ns1:setDataSetSample", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4373,7 +4374,7 @@ int ICATPortBindingProxy::setDataSetSample(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__setDataSetSampleResponse =
-      soap_get___ns1__setDataSetSampleResponse(soap, NULL,
+      soap_get___ns1__setDataSetSampleResponse(soap, nullptr,
                                                "-ns1:setDataSetSampleResponse",
                                                "ns1:setDataSetSampleResponse");
   if (!soap_tmp___ns1__setDataSetSampleResponse || soap->error)
@@ -4396,11 +4397,11 @@ int ICATPortBindingProxy::addDataSetParameter(
   struct __ns1__addDataSetParameter soap_tmp___ns1__addDataSetParameter;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/addDataSetParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__addDataSetParameter.ns1__addDataSetParameter_ =
       ns1__addDataSetParameter_;
   soap_begin(soap);
@@ -4414,18 +4415,18 @@ int ICATPortBindingProxy::addDataSetParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__addDataSetParameter(
             soap, &soap_tmp___ns1__addDataSetParameter,
-            "-ns1:addDataSetParameter", NULL) ||
+            "-ns1:addDataSetParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__addDataSetParameter(soap,
-                                          &soap_tmp___ns1__addDataSetParameter,
-                                          "-ns1:addDataSetParameter", NULL) ||
+      soap_put___ns1__addDataSetParameter(
+          soap, &soap_tmp___ns1__addDataSetParameter,
+          "-ns1:addDataSetParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4454,11 +4455,11 @@ int ICATPortBindingProxy::addDataSetParameters(
   struct __ns1__addDataSetParameters soap_tmp___ns1__addDataSetParameters;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/addDataSetParametersRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__addDataSetParameters.ns1__addDataSetParameters_ =
       ns1__addDataSetParameters_;
   soap_begin(soap);
@@ -4472,18 +4473,18 @@ int ICATPortBindingProxy::addDataSetParameters(
         soap_body_begin_out(soap) ||
         soap_put___ns1__addDataSetParameters(
             soap, &soap_tmp___ns1__addDataSetParameters,
-            "-ns1:addDataSetParameters", NULL) ||
+            "-ns1:addDataSetParameters", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__addDataSetParameters(
           soap, &soap_tmp___ns1__addDataSetParameters,
-          "-ns1:addDataSetParameters", NULL) ||
+          "-ns1:addDataSetParameters", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4513,11 +4514,11 @@ int ICATPortBindingProxy::removeDataSet(
   struct __ns1__removeDataSetResponse *soap_tmp___ns1__removeDataSetResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/removeDataSetRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__removeDataSet.ns1__removeDataSet_ = ns1__removeDataSet_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -4528,17 +4529,17 @@ int ICATPortBindingProxy::removeDataSet(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__removeDataSet(soap, &soap_tmp___ns1__removeDataSet,
-                                      "-ns1:removeDataSet", NULL) ||
+                                      "-ns1:removeDataSet", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__removeDataSet(soap, &soap_tmp___ns1__removeDataSet,
-                                    "-ns1:removeDataSet", NULL) ||
+                                    "-ns1:removeDataSet", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4549,7 +4550,7 @@ int ICATPortBindingProxy::removeDataSet(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__removeDataSetResponse = soap_get___ns1__removeDataSetResponse(
-      soap, NULL, "-ns1:removeDataSetResponse", "ns1:removeDataSetResponse");
+      soap, nullptr, "-ns1:removeDataSetResponse", "ns1:removeDataSetResponse");
   if (!soap_tmp___ns1__removeDataSetResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -4572,11 +4573,11 @@ int ICATPortBindingProxy::removeDataSetParameter(
       soap_tmp___ns1__removeDataSetParameterResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/removeDataSetParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__removeDataSetParameter.ns1__removeDataSetParameter_ =
       ns1__removeDataSetParameter_;
   soap_begin(soap);
@@ -4590,18 +4591,18 @@ int ICATPortBindingProxy::removeDataSetParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__removeDataSetParameter(
             soap, &soap_tmp___ns1__removeDataSetParameter,
-            "-ns1:removeDataSetParameter", NULL) ||
+            "-ns1:removeDataSetParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__removeDataSetParameter(
           soap, &soap_tmp___ns1__removeDataSetParameter,
-          "-ns1:removeDataSetParameter", NULL) ||
+          "-ns1:removeDataSetParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4613,7 +4614,7 @@ int ICATPortBindingProxy::removeDataSetParameter(
     return soap_closesock(soap);
   soap_tmp___ns1__removeDataSetParameterResponse =
       soap_get___ns1__removeDataSetParameterResponse(
-          soap, NULL, "-ns1:removeDataSetParameterResponse",
+          soap, nullptr, "-ns1:removeDataSetParameterResponse",
           "ns1:removeDataSetParameterResponse");
   if (!soap_tmp___ns1__removeDataSetParameterResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -4637,11 +4638,11 @@ int ICATPortBindingProxy::getDatafile(
   struct __ns1__getDatafile soap_tmp___ns1__getDatafile;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getDatafileRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getDatafile.ns1__getDatafile_ = ns1__getDatafile_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -4652,17 +4653,17 @@ int ICATPortBindingProxy::getDatafile(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__getDatafile(soap, &soap_tmp___ns1__getDatafile,
-                                    "-ns1:getDatafile", NULL) ||
+                                    "-ns1:getDatafile", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getDatafile(soap, &soap_tmp___ns1__getDatafile,
-                                  "-ns1:getDatafile", NULL) ||
+                                  "-ns1:getDatafile", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4690,11 +4691,11 @@ int ICATPortBindingProxy::getDatafiles(
   struct __ns1__getDatafiles soap_tmp___ns1__getDatafiles;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getDatafilesRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getDatafiles.ns1__getDatafiles_ = ns1__getDatafiles_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -4705,17 +4706,17 @@ int ICATPortBindingProxy::getDatafiles(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__getDatafiles(soap, &soap_tmp___ns1__getDatafiles,
-                                     "-ns1:getDatafiles", NULL) ||
+                                     "-ns1:getDatafiles", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getDatafiles(soap, &soap_tmp___ns1__getDatafiles,
-                                   "-ns1:getDatafiles", NULL) ||
+                                   "-ns1:getDatafiles", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4743,11 +4744,11 @@ int ICATPortBindingProxy::createDataFile(
   struct __ns1__createDataFile soap_tmp___ns1__createDataFile;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/createDataFileRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__createDataFile.ns1__createDataFile_ = ns1__createDataFile_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -4758,17 +4759,17 @@ int ICATPortBindingProxy::createDataFile(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__createDataFile(soap, &soap_tmp___ns1__createDataFile,
-                                       "-ns1:createDataFile", NULL) ||
+                                       "-ns1:createDataFile", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__createDataFile(soap, &soap_tmp___ns1__createDataFile,
-                                     "-ns1:createDataFile", NULL) ||
+                                     "-ns1:createDataFile", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4796,11 +4797,11 @@ int ICATPortBindingProxy::createDataFiles(
   struct __ns1__createDataFiles soap_tmp___ns1__createDataFiles;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/createDataFilesRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__createDataFiles.ns1__createDataFiles_ = ns1__createDataFiles_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -4811,17 +4812,17 @@ int ICATPortBindingProxy::createDataFiles(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__createDataFiles(soap, &soap_tmp___ns1__createDataFiles,
-                                        "-ns1:createDataFiles", NULL) ||
+                                        "-ns1:createDataFiles", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__createDataFiles(soap, &soap_tmp___ns1__createDataFiles,
-                                      "-ns1:createDataFiles", NULL) ||
+                                      "-ns1:createDataFiles", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4850,11 +4851,11 @@ int ICATPortBindingProxy::deleteDataFile(
   struct __ns1__deleteDataFileResponse *soap_tmp___ns1__deleteDataFileResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/deleteDataFileRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__deleteDataFile.ns1__deleteDataFile_ = ns1__deleteDataFile_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -4865,17 +4866,17 @@ int ICATPortBindingProxy::deleteDataFile(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__deleteDataFile(soap, &soap_tmp___ns1__deleteDataFile,
-                                       "-ns1:deleteDataFile", NULL) ||
+                                       "-ns1:deleteDataFile", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__deleteDataFile(soap, &soap_tmp___ns1__deleteDataFile,
-                                     "-ns1:deleteDataFile", NULL) ||
+                                     "-ns1:deleteDataFile", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4886,7 +4887,7 @@ int ICATPortBindingProxy::deleteDataFile(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__deleteDataFileResponse =
-      soap_get___ns1__deleteDataFileResponse(soap, NULL,
+      soap_get___ns1__deleteDataFileResponse(soap, nullptr,
                                              "-ns1:deleteDataFileResponse",
                                              "ns1:deleteDataFileResponse");
   if (!soap_tmp___ns1__deleteDataFileResponse || soap->error)
@@ -4910,11 +4911,11 @@ int ICATPortBindingProxy::modifyDataFile(
   struct __ns1__modifyDataFileResponse *soap_tmp___ns1__modifyDataFileResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/modifyDataFileRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__modifyDataFile.ns1__modifyDataFile_ = ns1__modifyDataFile_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -4925,17 +4926,17 @@ int ICATPortBindingProxy::modifyDataFile(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__modifyDataFile(soap, &soap_tmp___ns1__modifyDataFile,
-                                       "-ns1:modifyDataFile", NULL) ||
+                                       "-ns1:modifyDataFile", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__modifyDataFile(soap, &soap_tmp___ns1__modifyDataFile,
-                                     "-ns1:modifyDataFile", NULL) ||
+                                     "-ns1:modifyDataFile", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -4946,7 +4947,7 @@ int ICATPortBindingProxy::modifyDataFile(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__modifyDataFileResponse =
-      soap_get___ns1__modifyDataFileResponse(soap, NULL,
+      soap_get___ns1__modifyDataFileResponse(soap, nullptr,
                                              "-ns1:modifyDataFileResponse",
                                              "ns1:modifyDataFileResponse");
   if (!soap_tmp___ns1__modifyDataFileResponse || soap->error)
@@ -4969,11 +4970,11 @@ int ICATPortBindingProxy::addDataFileParameter(
   struct __ns1__addDataFileParameter soap_tmp___ns1__addDataFileParameter;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/addDataFileParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__addDataFileParameter.ns1__addDataFileParameter_ =
       ns1__addDataFileParameter_;
   soap_begin(soap);
@@ -4987,18 +4988,18 @@ int ICATPortBindingProxy::addDataFileParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__addDataFileParameter(
             soap, &soap_tmp___ns1__addDataFileParameter,
-            "-ns1:addDataFileParameter", NULL) ||
+            "-ns1:addDataFileParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__addDataFileParameter(
           soap, &soap_tmp___ns1__addDataFileParameter,
-          "-ns1:addDataFileParameter", NULL) ||
+          "-ns1:addDataFileParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5027,11 +5028,11 @@ int ICATPortBindingProxy::addDataFileParameters(
   struct __ns1__addDataFileParameters soap_tmp___ns1__addDataFileParameters;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/addDataFileParametersRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__addDataFileParameters.ns1__addDataFileParameters_ =
       ns1__addDataFileParameters_;
   soap_begin(soap);
@@ -5045,18 +5046,18 @@ int ICATPortBindingProxy::addDataFileParameters(
         soap_body_begin_out(soap) ||
         soap_put___ns1__addDataFileParameters(
             soap, &soap_tmp___ns1__addDataFileParameters,
-            "-ns1:addDataFileParameters", NULL) ||
+            "-ns1:addDataFileParameters", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__addDataFileParameters(
           soap, &soap_tmp___ns1__addDataFileParameters,
-          "-ns1:addDataFileParameters", NULL) ||
+          "-ns1:addDataFileParameters", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5088,11 +5089,11 @@ int ICATPortBindingProxy::modifyDataFileParameter(
       soap_tmp___ns1__modifyDataFileParameterResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/modifyDataFileParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__modifyDataFileParameter.ns1__modifyDataFileParameter_ =
       ns1__modifyDataFileParameter_;
   soap_begin(soap);
@@ -5106,18 +5107,18 @@ int ICATPortBindingProxy::modifyDataFileParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__modifyDataFileParameter(
             soap, &soap_tmp___ns1__modifyDataFileParameter,
-            "-ns1:modifyDataFileParameter", NULL) ||
+            "-ns1:modifyDataFileParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__modifyDataFileParameter(
           soap, &soap_tmp___ns1__modifyDataFileParameter,
-          "-ns1:modifyDataFileParameter", NULL) ||
+          "-ns1:modifyDataFileParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5129,7 +5130,7 @@ int ICATPortBindingProxy::modifyDataFileParameter(
     return soap_closesock(soap);
   soap_tmp___ns1__modifyDataFileParameterResponse =
       soap_get___ns1__modifyDataFileParameterResponse(
-          soap, NULL, "-ns1:modifyDataFileParameterResponse",
+          soap, nullptr, "-ns1:modifyDataFileParameterResponse",
           "ns1:modifyDataFileParameterResponse");
   if (!soap_tmp___ns1__modifyDataFileParameterResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -5156,11 +5157,11 @@ int ICATPortBindingProxy::deleteDataFileParameter(
       soap_tmp___ns1__deleteDataFileParameterResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/deleteDataFileParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__deleteDataFileParameter.ns1__deleteDataFileParameter_ =
       ns1__deleteDataFileParameter_;
   soap_begin(soap);
@@ -5174,18 +5175,18 @@ int ICATPortBindingProxy::deleteDataFileParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__deleteDataFileParameter(
             soap, &soap_tmp___ns1__deleteDataFileParameter,
-            "-ns1:deleteDataFileParameter", NULL) ||
+            "-ns1:deleteDataFileParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__deleteDataFileParameter(
           soap, &soap_tmp___ns1__deleteDataFileParameter,
-          "-ns1:deleteDataFileParameter", NULL) ||
+          "-ns1:deleteDataFileParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5197,7 +5198,7 @@ int ICATPortBindingProxy::deleteDataFileParameter(
     return soap_closesock(soap);
   soap_tmp___ns1__deleteDataFileParameterResponse =
       soap_get___ns1__deleteDataFileParameterResponse(
-          soap, NULL, "-ns1:deleteDataFileParameterResponse",
+          soap, nullptr, "-ns1:deleteDataFileParameterResponse",
           "ns1:deleteDataFileParameterResponse");
   if (!soap_tmp___ns1__deleteDataFileParameterResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -5222,11 +5223,11 @@ int ICATPortBindingProxy::removeDataFile(
   struct __ns1__removeDataFileResponse *soap_tmp___ns1__removeDataFileResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/removeDataFileRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__removeDataFile.ns1__removeDataFile_ = ns1__removeDataFile_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -5237,17 +5238,17 @@ int ICATPortBindingProxy::removeDataFile(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__removeDataFile(soap, &soap_tmp___ns1__removeDataFile,
-                                       "-ns1:removeDataFile", NULL) ||
+                                       "-ns1:removeDataFile", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__removeDataFile(soap, &soap_tmp___ns1__removeDataFile,
-                                     "-ns1:removeDataFile", NULL) ||
+                                     "-ns1:removeDataFile", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5258,7 +5259,7 @@ int ICATPortBindingProxy::removeDataFile(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__removeDataFileResponse =
-      soap_get___ns1__removeDataFileResponse(soap, NULL,
+      soap_get___ns1__removeDataFileResponse(soap, nullptr,
                                              "-ns1:removeDataFileResponse",
                                              "ns1:removeDataFileResponse");
   if (!soap_tmp___ns1__removeDataFileResponse || soap->error)
@@ -5284,11 +5285,11 @@ int ICATPortBindingProxy::removeDataFileParameter(
       soap_tmp___ns1__removeDataFileParameterResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/removeDataFileParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__removeDataFileParameter.ns1__removeDataFileParameter_ =
       ns1__removeDataFileParameter_;
   soap_begin(soap);
@@ -5302,18 +5303,18 @@ int ICATPortBindingProxy::removeDataFileParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__removeDataFileParameter(
             soap, &soap_tmp___ns1__removeDataFileParameter,
-            "-ns1:removeDataFileParameter", NULL) ||
+            "-ns1:removeDataFileParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__removeDataFileParameter(
           soap, &soap_tmp___ns1__removeDataFileParameter,
-          "-ns1:removeDataFileParameter", NULL) ||
+          "-ns1:removeDataFileParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5325,7 +5326,7 @@ int ICATPortBindingProxy::removeDataFileParameter(
     return soap_closesock(soap);
   soap_tmp___ns1__removeDataFileParameterResponse =
       soap_get___ns1__removeDataFileParameterResponse(
-          soap, NULL, "-ns1:removeDataFileParameterResponse",
+          soap, nullptr, "-ns1:removeDataFileParameterResponse",
           "ns1:removeDataFileParameterResponse");
   if (!soap_tmp___ns1__removeDataFileParameterResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -5349,11 +5350,11 @@ int ICATPortBindingProxy::getAuthorisations(
   struct __ns1__getAuthorisations soap_tmp___ns1__getAuthorisations;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getAuthorisationsRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getAuthorisations.ns1__getAuthorisations_ =
       ns1__getAuthorisations_;
   soap_begin(soap);
@@ -5367,17 +5368,17 @@ int ICATPortBindingProxy::getAuthorisations(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getAuthorisations(soap,
                                           &soap_tmp___ns1__getAuthorisations,
-                                          "-ns1:getAuthorisations", NULL) ||
+                                          "-ns1:getAuthorisations", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) || soap_put___ns1__getAuthorisations(
                                        soap, &soap_tmp___ns1__getAuthorisations,
-                                       "-ns1:getAuthorisations", NULL) ||
+                                       "-ns1:getAuthorisations", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5405,11 +5406,11 @@ int ICATPortBindingProxy::addAuthorisation(
   struct __ns1__addAuthorisation soap_tmp___ns1__addAuthorisation;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/addAuthorisationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__addAuthorisation.ns1__addAuthorisation_ =
       ns1__addAuthorisation_;
   soap_begin(soap);
@@ -5423,17 +5424,17 @@ int ICATPortBindingProxy::addAuthorisation(
         soap_body_begin_out(soap) ||
         soap_put___ns1__addAuthorisation(soap,
                                          &soap_tmp___ns1__addAuthorisation,
-                                         "-ns1:addAuthorisation", NULL) ||
+                                         "-ns1:addAuthorisation", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__addAuthorisation(soap, &soap_tmp___ns1__addAuthorisation,
-                                       "-ns1:addAuthorisation", NULL) ||
+                                       "-ns1:addAuthorisation", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5463,11 +5464,11 @@ int ICATPortBindingProxy::deleteAuthorisation(
       soap_tmp___ns1__deleteAuthorisationResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/deleteAuthorisationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__deleteAuthorisation.ns1__deleteAuthorisation_ =
       ns1__deleteAuthorisation_;
   soap_begin(soap);
@@ -5481,18 +5482,18 @@ int ICATPortBindingProxy::deleteAuthorisation(
         soap_body_begin_out(soap) ||
         soap_put___ns1__deleteAuthorisation(
             soap, &soap_tmp___ns1__deleteAuthorisation,
-            "-ns1:deleteAuthorisation", NULL) ||
+            "-ns1:deleteAuthorisation", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__deleteAuthorisation(soap,
-                                          &soap_tmp___ns1__deleteAuthorisation,
-                                          "-ns1:deleteAuthorisation", NULL) ||
+      soap_put___ns1__deleteAuthorisation(
+          soap, &soap_tmp___ns1__deleteAuthorisation,
+          "-ns1:deleteAuthorisation", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5504,7 +5505,7 @@ int ICATPortBindingProxy::deleteAuthorisation(
     return soap_closesock(soap);
   soap_tmp___ns1__deleteAuthorisationResponse =
       soap_get___ns1__deleteAuthorisationResponse(
-          soap, NULL, "-ns1:deleteAuthorisationResponse",
+          soap, nullptr, "-ns1:deleteAuthorisationResponse",
           "ns1:deleteAuthorisationResponse");
   if (!soap_tmp___ns1__deleteAuthorisationResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -5530,11 +5531,11 @@ int ICATPortBindingProxy::removeAuthorisation(
       soap_tmp___ns1__removeAuthorisationResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/removeAuthorisationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__removeAuthorisation.ns1__removeAuthorisation_ =
       ns1__removeAuthorisation_;
   soap_begin(soap);
@@ -5548,18 +5549,18 @@ int ICATPortBindingProxy::removeAuthorisation(
         soap_body_begin_out(soap) ||
         soap_put___ns1__removeAuthorisation(
             soap, &soap_tmp___ns1__removeAuthorisation,
-            "-ns1:removeAuthorisation", NULL) ||
+            "-ns1:removeAuthorisation", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__removeAuthorisation(soap,
-                                          &soap_tmp___ns1__removeAuthorisation,
-                                          "-ns1:removeAuthorisation", NULL) ||
+      soap_put___ns1__removeAuthorisation(
+          soap, &soap_tmp___ns1__removeAuthorisation,
+          "-ns1:removeAuthorisation", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5571,7 +5572,7 @@ int ICATPortBindingProxy::removeAuthorisation(
     return soap_closesock(soap);
   soap_tmp___ns1__removeAuthorisationResponse =
       soap_get___ns1__removeAuthorisationResponse(
-          soap, NULL, "-ns1:removeAuthorisationResponse",
+          soap, nullptr, "-ns1:removeAuthorisationResponse",
           "ns1:removeAuthorisationResponse");
   if (!soap_tmp___ns1__removeAuthorisationResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -5597,11 +5598,11 @@ int ICATPortBindingProxy::updateAuthorisation(
       soap_tmp___ns1__updateAuthorisationResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/updateAuthorisationRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__updateAuthorisation.ns1__updateAuthorisation_ =
       ns1__updateAuthorisation_;
   soap_begin(soap);
@@ -5615,18 +5616,18 @@ int ICATPortBindingProxy::updateAuthorisation(
         soap_body_begin_out(soap) ||
         soap_put___ns1__updateAuthorisation(
             soap, &soap_tmp___ns1__updateAuthorisation,
-            "-ns1:updateAuthorisation", NULL) ||
+            "-ns1:updateAuthorisation", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__updateAuthorisation(soap,
-                                          &soap_tmp___ns1__updateAuthorisation,
-                                          "-ns1:updateAuthorisation", NULL) ||
+      soap_put___ns1__updateAuthorisation(
+          soap, &soap_tmp___ns1__updateAuthorisation,
+          "-ns1:updateAuthorisation", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5638,7 +5639,7 @@ int ICATPortBindingProxy::updateAuthorisation(
     return soap_closesock(soap);
   soap_tmp___ns1__updateAuthorisationResponse =
       soap_get___ns1__updateAuthorisationResponse(
-          soap, NULL, "-ns1:updateAuthorisationResponse",
+          soap, nullptr, "-ns1:updateAuthorisationResponse",
           "ns1:updateAuthorisationResponse");
   if (!soap_tmp___ns1__updateAuthorisationResponse || soap->error)
     return soap_recv_fault(soap, 0);
@@ -5662,11 +5663,11 @@ int ICATPortBindingProxy::ingestMetadata(
   struct __ns1__ingestMetadata soap_tmp___ns1__ingestMetadata;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/ingestMetadataRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__ingestMetadata.ns1__ingestMetadata_ = ns1__ingestMetadata_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -5677,17 +5678,17 @@ int ICATPortBindingProxy::ingestMetadata(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__ingestMetadata(soap, &soap_tmp___ns1__ingestMetadata,
-                                       "-ns1:ingestMetadata", NULL) ||
+                                       "-ns1:ingestMetadata", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__ingestMetadata(soap, &soap_tmp___ns1__ingestMetadata,
-                                     "-ns1:ingestMetadata", NULL) ||
+                                     "-ns1:ingestMetadata", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5715,11 +5716,11 @@ int ICATPortBindingProxy::downloadDatafile(
   struct __ns1__downloadDatafile soap_tmp___ns1__downloadDatafile;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/downloadDatafileRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__downloadDatafile.ns1__downloadDatafile_ =
       ns1__downloadDatafile_;
   soap_begin(soap);
@@ -5733,17 +5734,17 @@ int ICATPortBindingProxy::downloadDatafile(
         soap_body_begin_out(soap) ||
         soap_put___ns1__downloadDatafile(soap,
                                          &soap_tmp___ns1__downloadDatafile,
-                                         "-ns1:downloadDatafile", NULL) ||
+                                         "-ns1:downloadDatafile", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__downloadDatafile(soap, &soap_tmp___ns1__downloadDatafile,
-                                       "-ns1:downloadDatafile", NULL) ||
+                                       "-ns1:downloadDatafile", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5771,11 +5772,11 @@ int ICATPortBindingProxy::downloadDataset(
   struct __ns1__downloadDataset soap_tmp___ns1__downloadDataset;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/downloadDatasetRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__downloadDataset.ns1__downloadDataset_ = ns1__downloadDataset_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -5786,17 +5787,17 @@ int ICATPortBindingProxy::downloadDataset(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__downloadDataset(soap, &soap_tmp___ns1__downloadDataset,
-                                        "-ns1:downloadDataset", NULL) ||
+                                        "-ns1:downloadDataset", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__downloadDataset(soap, &soap_tmp___ns1__downloadDataset,
-                                      "-ns1:downloadDataset", NULL) ||
+                                      "-ns1:downloadDataset", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5824,11 +5825,11 @@ int ICATPortBindingProxy::downloadDatafiles(
   struct __ns1__downloadDatafiles soap_tmp___ns1__downloadDatafiles;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/downloadDatafilesRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__downloadDatafiles.ns1__downloadDatafiles_ =
       ns1__downloadDatafiles_;
   soap_begin(soap);
@@ -5842,17 +5843,17 @@ int ICATPortBindingProxy::downloadDatafiles(
         soap_body_begin_out(soap) ||
         soap_put___ns1__downloadDatafiles(soap,
                                           &soap_tmp___ns1__downloadDatafiles,
-                                          "-ns1:downloadDatafiles", NULL) ||
+                                          "-ns1:downloadDatafiles", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) || soap_put___ns1__downloadDatafiles(
                                        soap, &soap_tmp___ns1__downloadDatafiles,
-                                       "-ns1:downloadDatafiles", NULL) ||
+                                       "-ns1:downloadDatafiles", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5882,11 +5883,11 @@ int ICATPortBindingProxy::checkDatafileDownloadAccess(
       soap_tmp___ns1__checkDatafileDownloadAccess;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/checkDatafileDownloadAccessRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__checkDatafileDownloadAccess
       .ns1__checkDatafileDownloadAccess_ = ns1__checkDatafileDownloadAccess_;
   soap_begin(soap);
@@ -5900,18 +5901,18 @@ int ICATPortBindingProxy::checkDatafileDownloadAccess(
         soap_body_begin_out(soap) ||
         soap_put___ns1__checkDatafileDownloadAccess(
             soap, &soap_tmp___ns1__checkDatafileDownloadAccess,
-            "-ns1:checkDatafileDownloadAccess", NULL) ||
+            "-ns1:checkDatafileDownloadAccess", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__checkDatafileDownloadAccess(
           soap, &soap_tmp___ns1__checkDatafileDownloadAccess,
-          "-ns1:checkDatafileDownloadAccess", NULL) ||
+          "-ns1:checkDatafileDownloadAccess", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -5942,11 +5943,11 @@ int ICATPortBindingProxy::checkDatasetDownloadAccess(
       soap_tmp___ns1__checkDatasetDownloadAccess;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/checkDatasetDownloadAccessRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__checkDatasetDownloadAccess.ns1__checkDatasetDownloadAccess_ =
       ns1__checkDatasetDownloadAccess_;
   soap_begin(soap);
@@ -5960,18 +5961,18 @@ int ICATPortBindingProxy::checkDatasetDownloadAccess(
         soap_body_begin_out(soap) ||
         soap_put___ns1__checkDatasetDownloadAccess(
             soap, &soap_tmp___ns1__checkDatasetDownloadAccess,
-            "-ns1:checkDatasetDownloadAccess", NULL) ||
+            "-ns1:checkDatasetDownloadAccess", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__checkDatasetDownloadAccess(
           soap, &soap_tmp___ns1__checkDatasetDownloadAccess,
-          "-ns1:checkDatasetDownloadAccess", NULL) ||
+          "-ns1:checkDatasetDownloadAccess", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6000,11 +6001,11 @@ int ICATPortBindingProxy::getICATAPIVersion(
   struct __ns1__getICATAPIVersion soap_tmp___ns1__getICATAPIVersion;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getICATAPIVersionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getICATAPIVersion.ns1__getICATAPIVersion_ =
       ns1__getICATAPIVersion_;
   soap_begin(soap);
@@ -6018,17 +6019,17 @@ int ICATPortBindingProxy::getICATAPIVersion(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getICATAPIVersion(soap,
                                           &soap_tmp___ns1__getICATAPIVersion,
-                                          "-ns1:getICATAPIVersion", NULL) ||
+                                          "-ns1:getICATAPIVersion", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) || soap_put___ns1__getICATAPIVersion(
                                        soap, &soap_tmp___ns1__getICATAPIVersion,
-                                       "-ns1:getICATAPIVersion", NULL) ||
+                                       "-ns1:getICATAPIVersion", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6058,11 +6059,11 @@ int ICATPortBindingProxy::getFacilityUserByFacilityUserId(
       soap_tmp___ns1__getFacilityUserByFacilityUserId;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getFacilityUserByFacilityUserIdRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getFacilityUserByFacilityUserId
       .ns1__getFacilityUserByFacilityUserId_ =
       ns1__getFacilityUserByFacilityUserId_;
@@ -6077,18 +6078,18 @@ int ICATPortBindingProxy::getFacilityUserByFacilityUserId(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getFacilityUserByFacilityUserId(
             soap, &soap_tmp___ns1__getFacilityUserByFacilityUserId,
-            "-ns1:getFacilityUserByFacilityUserId", NULL) ||
+            "-ns1:getFacilityUserByFacilityUserId", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getFacilityUserByFacilityUserId(
           soap, &soap_tmp___ns1__getFacilityUserByFacilityUserId,
-          "-ns1:getFacilityUserByFacilityUserId", NULL) ||
+          "-ns1:getFacilityUserByFacilityUserId", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6119,11 +6120,11 @@ int ICATPortBindingProxy::getFacilityUserByFederalId(
       soap_tmp___ns1__getFacilityUserByFederalId;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getFacilityUserByFederalIdRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getFacilityUserByFederalId.ns1__getFacilityUserByFederalId_ =
       ns1__getFacilityUserByFederalId_;
   soap_begin(soap);
@@ -6137,18 +6138,18 @@ int ICATPortBindingProxy::getFacilityUserByFederalId(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getFacilityUserByFederalId(
             soap, &soap_tmp___ns1__getFacilityUserByFederalId,
-            "-ns1:getFacilityUserByFederalId", NULL) ||
+            "-ns1:getFacilityUserByFederalId", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getFacilityUserByFederalId(
           soap, &soap_tmp___ns1__getFacilityUserByFederalId,
-          "-ns1:getFacilityUserByFederalId", NULL) ||
+          "-ns1:getFacilityUserByFederalId", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6180,12 +6181,12 @@ int ICATPortBindingProxy::searchInvestigationByParameterCondition(
       soap_tmp___ns1__searchInvestigationByParameterCondition;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchInvestigationByParameterConditionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchInvestigationByParameterCondition
       .ns1__searchInvestigationByParameterCondition_ =
       ns1__searchInvestigationByParameterCondition_;
@@ -6200,18 +6201,18 @@ int ICATPortBindingProxy::searchInvestigationByParameterCondition(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchInvestigationByParameterCondition(
             soap, &soap_tmp___ns1__searchInvestigationByParameterCondition,
-            "-ns1:searchInvestigationByParameterCondition", NULL) ||
+            "-ns1:searchInvestigationByParameterCondition", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchInvestigationByParameterCondition(
           soap, &soap_tmp___ns1__searchInvestigationByParameterCondition,
-          "-ns1:searchInvestigationByParameterCondition", NULL) ||
+          "-ns1:searchInvestigationByParameterCondition", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6243,12 +6244,12 @@ int ICATPortBindingProxy::searchDatafileByParameterCondition(
       soap_tmp___ns1__searchDatafileByParameterCondition;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchDatafileByParameterConditionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatafileByParameterCondition
       .ns1__searchDatafileByParameterCondition_ =
       ns1__searchDatafileByParameterCondition_;
@@ -6263,18 +6264,18 @@ int ICATPortBindingProxy::searchDatafileByParameterCondition(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatafileByParameterCondition(
             soap, &soap_tmp___ns1__searchDatafileByParameterCondition,
-            "-ns1:searchDatafileByParameterCondition", NULL) ||
+            "-ns1:searchDatafileByParameterCondition", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatafileByParameterCondition(
           soap, &soap_tmp___ns1__searchDatafileByParameterCondition,
-          "-ns1:searchDatafileByParameterCondition", NULL) ||
+          "-ns1:searchDatafileByParameterCondition", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6306,12 +6307,12 @@ int ICATPortBindingProxy::searchDatasetByParameterCondition(
       soap_tmp___ns1__searchDatasetByParameterCondition;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchDatasetByParameterConditionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatasetByParameterCondition
       .ns1__searchDatasetByParameterCondition_ =
       ns1__searchDatasetByParameterCondition_;
@@ -6326,18 +6327,18 @@ int ICATPortBindingProxy::searchDatasetByParameterCondition(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatasetByParameterCondition(
             soap, &soap_tmp___ns1__searchDatasetByParameterCondition,
-            "-ns1:searchDatasetByParameterCondition", NULL) ||
+            "-ns1:searchDatasetByParameterCondition", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatasetByParameterCondition(
           soap, &soap_tmp___ns1__searchDatasetByParameterCondition,
-          "-ns1:searchDatasetByParameterCondition", NULL) ||
+          "-ns1:searchDatasetByParameterCondition", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6369,12 +6370,12 @@ int ICATPortBindingProxy::searchSampleByParameterCondition(
       soap_tmp___ns1__searchSampleByParameterCondition;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchSampleByParameterConditionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchSampleByParameterCondition
       .ns1__searchSampleByParameterCondition_ =
       ns1__searchSampleByParameterCondition_;
@@ -6389,18 +6390,18 @@ int ICATPortBindingProxy::searchSampleByParameterCondition(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchSampleByParameterCondition(
             soap, &soap_tmp___ns1__searchSampleByParameterCondition,
-            "-ns1:searchSampleByParameterCondition", NULL) ||
+            "-ns1:searchSampleByParameterCondition", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchSampleByParameterCondition(
           soap, &soap_tmp___ns1__searchSampleByParameterCondition,
-          "-ns1:searchSampleByParameterCondition", NULL) ||
+          "-ns1:searchSampleByParameterCondition", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6432,12 +6433,12 @@ int ICATPortBindingProxy::searchInvestigationByParameterComparison(
       soap_tmp___ns1__searchInvestigationByParameterComparison;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchInvestigationByParameterComparisonRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchInvestigationByParameterComparison
       .ns1__searchInvestigationByParameterComparison_ =
       ns1__searchInvestigationByParameterComparison_;
@@ -6452,18 +6453,18 @@ int ICATPortBindingProxy::searchInvestigationByParameterComparison(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchInvestigationByParameterComparison(
             soap, &soap_tmp___ns1__searchInvestigationByParameterComparison,
-            "-ns1:searchInvestigationByParameterComparison", NULL) ||
+            "-ns1:searchInvestigationByParameterComparison", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchInvestigationByParameterComparison(
           soap, &soap_tmp___ns1__searchInvestigationByParameterComparison,
-          "-ns1:searchInvestigationByParameterComparison", NULL) ||
+          "-ns1:searchInvestigationByParameterComparison", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6495,12 +6496,12 @@ int ICATPortBindingProxy::searchDatafileByParameterComparison(
       soap_tmp___ns1__searchDatafileByParameterComparison;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchDatafileByParameterComparisonRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatafileByParameterComparison
       .ns1__searchDatafileByParameterComparison_ =
       ns1__searchDatafileByParameterComparison_;
@@ -6515,18 +6516,18 @@ int ICATPortBindingProxy::searchDatafileByParameterComparison(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatafileByParameterComparison(
             soap, &soap_tmp___ns1__searchDatafileByParameterComparison,
-            "-ns1:searchDatafileByParameterComparison", NULL) ||
+            "-ns1:searchDatafileByParameterComparison", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatafileByParameterComparison(
           soap, &soap_tmp___ns1__searchDatafileByParameterComparison,
-          "-ns1:searchDatafileByParameterComparison", NULL) ||
+          "-ns1:searchDatafileByParameterComparison", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6558,12 +6559,12 @@ int ICATPortBindingProxy::searchDatasetByParameterComparison(
       soap_tmp___ns1__searchDatasetByParameterComparison;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchDatasetByParameterComparisonRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatasetByParameterComparison
       .ns1__searchDatasetByParameterComparison_ =
       ns1__searchDatasetByParameterComparison_;
@@ -6578,18 +6579,18 @@ int ICATPortBindingProxy::searchDatasetByParameterComparison(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatasetByParameterComparison(
             soap, &soap_tmp___ns1__searchDatasetByParameterComparison,
-            "-ns1:searchDatasetByParameterComparison", NULL) ||
+            "-ns1:searchDatasetByParameterComparison", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatasetByParameterComparison(
           soap, &soap_tmp___ns1__searchDatasetByParameterComparison,
-          "-ns1:searchDatasetByParameterComparison", NULL) ||
+          "-ns1:searchDatasetByParameterComparison", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6621,12 +6622,12 @@ int ICATPortBindingProxy::searchSampleByParameterComparison(
       soap_tmp___ns1__searchSampleByParameterComparison;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchSampleByParameterComparisonRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchSampleByParameterComparison
       .ns1__searchSampleByParameterComparison_ =
       ns1__searchSampleByParameterComparison_;
@@ -6641,18 +6642,18 @@ int ICATPortBindingProxy::searchSampleByParameterComparison(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchSampleByParameterComparison(
             soap, &soap_tmp___ns1__searchSampleByParameterComparison,
-            "-ns1:searchSampleByParameterComparison", NULL) ||
+            "-ns1:searchSampleByParameterComparison", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchSampleByParameterComparison(
           soap, &soap_tmp___ns1__searchSampleByParameterComparison,
-          "-ns1:searchSampleByParameterComparison", NULL) ||
+          "-ns1:searchSampleByParameterComparison", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6683,11 +6684,11 @@ int ICATPortBindingProxy::searchInvestigationByParameter(
       soap_tmp___ns1__searchInvestigationByParameter;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchInvestigationByParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchInvestigationByParameter
       .ns1__searchInvestigationByParameter_ =
       ns1__searchInvestigationByParameter_;
@@ -6702,18 +6703,18 @@ int ICATPortBindingProxy::searchInvestigationByParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchInvestigationByParameter(
             soap, &soap_tmp___ns1__searchInvestigationByParameter,
-            "-ns1:searchInvestigationByParameter", NULL) ||
+            "-ns1:searchInvestigationByParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchInvestigationByParameter(
           soap, &soap_tmp___ns1__searchInvestigationByParameter,
-          "-ns1:searchInvestigationByParameter", NULL) ||
+          "-ns1:searchInvestigationByParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6744,11 +6745,11 @@ int ICATPortBindingProxy::searchDatafileByParameter(
       soap_tmp___ns1__searchDatafileByParameter;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchDatafileByParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatafileByParameter.ns1__searchDatafileByParameter_ =
       ns1__searchDatafileByParameter_;
   soap_begin(soap);
@@ -6762,18 +6763,18 @@ int ICATPortBindingProxy::searchDatafileByParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatafileByParameter(
             soap, &soap_tmp___ns1__searchDatafileByParameter,
-            "-ns1:searchDatafileByParameter", NULL) ||
+            "-ns1:searchDatafileByParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatafileByParameter(
           soap, &soap_tmp___ns1__searchDatafileByParameter,
-          "-ns1:searchDatafileByParameter", NULL) ||
+          "-ns1:searchDatafileByParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6804,11 +6805,11 @@ int ICATPortBindingProxy::searchDatasetByParameter(
       soap_tmp___ns1__searchDatasetByParameter;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchDatasetByParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatasetByParameter.ns1__searchDatasetByParameter_ =
       ns1__searchDatasetByParameter_;
   soap_begin(soap);
@@ -6822,18 +6823,18 @@ int ICATPortBindingProxy::searchDatasetByParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatasetByParameter(
             soap, &soap_tmp___ns1__searchDatasetByParameter,
-            "-ns1:searchDatasetByParameter", NULL) ||
+            "-ns1:searchDatasetByParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatasetByParameter(
           soap, &soap_tmp___ns1__searchDatasetByParameter,
-          "-ns1:searchDatasetByParameter", NULL) ||
+          "-ns1:searchDatasetByParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6863,11 +6864,11 @@ int ICATPortBindingProxy::searchSampleByParameter(
   struct __ns1__searchSampleByParameter soap_tmp___ns1__searchSampleByParameter;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchSampleByParameterRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchSampleByParameter.ns1__searchSampleByParameter_ =
       ns1__searchSampleByParameter_;
   soap_begin(soap);
@@ -6881,18 +6882,18 @@ int ICATPortBindingProxy::searchSampleByParameter(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchSampleByParameter(
             soap, &soap_tmp___ns1__searchSampleByParameter,
-            "-ns1:searchSampleByParameter", NULL) ||
+            "-ns1:searchSampleByParameter", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchSampleByParameter(
           soap, &soap_tmp___ns1__searchSampleByParameter,
-          "-ns1:searchSampleByParameter", NULL) ||
+          "-ns1:searchSampleByParameter", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6922,11 +6923,11 @@ int ICATPortBindingProxy::getParameterByNameUnits(
   struct __ns1__getParameterByNameUnits soap_tmp___ns1__getParameterByNameUnits;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getParameterByNameUnitsRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getParameterByNameUnits.ns1__getParameterByNameUnits_ =
       ns1__getParameterByNameUnits_;
   soap_begin(soap);
@@ -6940,18 +6941,18 @@ int ICATPortBindingProxy::getParameterByNameUnits(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getParameterByNameUnits(
             soap, &soap_tmp___ns1__getParameterByNameUnits,
-            "-ns1:getParameterByNameUnits", NULL) ||
+            "-ns1:getParameterByNameUnits", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getParameterByNameUnits(
           soap, &soap_tmp___ns1__getParameterByNameUnits,
-          "-ns1:getParameterByNameUnits", NULL) ||
+          "-ns1:getParameterByNameUnits", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -6980,11 +6981,11 @@ int ICATPortBindingProxy::getParameterByName(
   struct __ns1__getParameterByName soap_tmp___ns1__getParameterByName;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getParameterByNameRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getParameterByName.ns1__getParameterByName_ =
       ns1__getParameterByName_;
   soap_begin(soap);
@@ -6996,20 +6997,20 @@ int ICATPortBindingProxy::getParameterByName(
   if (soap->mode & SOAP_IO_LENGTH) {
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
-        soap_put___ns1__getParameterByName(soap,
-                                           &soap_tmp___ns1__getParameterByName,
-                                           "-ns1:getParameterByName", NULL) ||
+        soap_put___ns1__getParameterByName(
+            soap, &soap_tmp___ns1__getParameterByName,
+            "-ns1:getParameterByName", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getParameterByName(soap,
                                          &soap_tmp___ns1__getParameterByName,
-                                         "-ns1:getParameterByName", NULL) ||
+                                         "-ns1:getParameterByName", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7039,11 +7040,11 @@ int ICATPortBindingProxy::getParameterByRestriction(
       soap_tmp___ns1__getParameterByRestriction;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getParameterByRestrictionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getParameterByRestriction.ns1__getParameterByRestriction_ =
       ns1__getParameterByRestriction_;
   soap_begin(soap);
@@ -7057,18 +7058,18 @@ int ICATPortBindingProxy::getParameterByRestriction(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getParameterByRestriction(
             soap, &soap_tmp___ns1__getParameterByRestriction,
-            "-ns1:getParameterByRestriction", NULL) ||
+            "-ns1:getParameterByRestriction", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getParameterByRestriction(
           soap, &soap_tmp___ns1__getParameterByRestriction,
-          "-ns1:getParameterByRestriction", NULL) ||
+          "-ns1:getParameterByRestriction", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7097,11 +7098,11 @@ int ICATPortBindingProxy::getParameterByUnits(
   struct __ns1__getParameterByUnits soap_tmp___ns1__getParameterByUnits;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/getParameterByUnitsRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getParameterByUnits.ns1__getParameterByUnits_ =
       ns1__getParameterByUnits_;
   soap_begin(soap);
@@ -7115,18 +7116,18 @@ int ICATPortBindingProxy::getParameterByUnits(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getParameterByUnits(
             soap, &soap_tmp___ns1__getParameterByUnits,
-            "-ns1:getParameterByUnits", NULL) ||
+            "-ns1:getParameterByUnits", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__getParameterByUnits(soap,
-                                          &soap_tmp___ns1__getParameterByUnits,
-                                          "-ns1:getParameterByUnits", NULL) ||
+      soap_put___ns1__getParameterByUnits(
+          soap, &soap_tmp___ns1__getParameterByUnits,
+          "-ns1:getParameterByUnits", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7158,12 +7159,12 @@ int ICATPortBindingProxy::searchDatasetByParameterRestriction(
       soap_tmp___ns1__searchDatasetByParameterRestriction;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchDatasetByParameterRestrictionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatasetByParameterRestriction
       .ns1__searchDatasetByParameterRestriction_ =
       ns1__searchDatasetByParameterRestriction_;
@@ -7178,18 +7179,18 @@ int ICATPortBindingProxy::searchDatasetByParameterRestriction(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatasetByParameterRestriction(
             soap, &soap_tmp___ns1__searchDatasetByParameterRestriction,
-            "-ns1:searchDatasetByParameterRestriction", NULL) ||
+            "-ns1:searchDatasetByParameterRestriction", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatasetByParameterRestriction(
           soap, &soap_tmp___ns1__searchDatasetByParameterRestriction,
-          "-ns1:searchDatasetByParameterRestriction", NULL) ||
+          "-ns1:searchDatasetByParameterRestriction", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7221,12 +7222,12 @@ int ICATPortBindingProxy::searchSampleByParameterRestriction(
       soap_tmp___ns1__searchSampleByParameterRestriction;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchSampleByParameterRestrictionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchSampleByParameterRestriction
       .ns1__searchSampleByParameterRestriction_ =
       ns1__searchSampleByParameterRestriction_;
@@ -7241,18 +7242,18 @@ int ICATPortBindingProxy::searchSampleByParameterRestriction(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchSampleByParameterRestriction(
             soap, &soap_tmp___ns1__searchSampleByParameterRestriction,
-            "-ns1:searchSampleByParameterRestriction", NULL) ||
+            "-ns1:searchSampleByParameterRestriction", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchSampleByParameterRestriction(
           soap, &soap_tmp___ns1__searchSampleByParameterRestriction,
-          "-ns1:searchSampleByParameterRestriction", NULL) ||
+          "-ns1:searchSampleByParameterRestriction", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7284,12 +7285,12 @@ int ICATPortBindingProxy::searchDatafileByParameterRestriction(
       soap_tmp___ns1__searchDatafileByParameterRestriction;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchDatafileByParameterRestrictionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatafileByParameterRestriction
       .ns1__searchDatafileByParameterRestriction_ =
       ns1__searchDatafileByParameterRestriction_;
@@ -7304,18 +7305,18 @@ int ICATPortBindingProxy::searchDatafileByParameterRestriction(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatafileByParameterRestriction(
             soap, &soap_tmp___ns1__searchDatafileByParameterRestriction,
-            "-ns1:searchDatafileByParameterRestriction", NULL) ||
+            "-ns1:searchDatafileByParameterRestriction", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatafileByParameterRestriction(
           soap, &soap_tmp___ns1__searchDatafileByParameterRestriction,
-          "-ns1:searchDatafileByParameterRestriction", NULL) ||
+          "-ns1:searchDatafileByParameterRestriction", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7347,12 +7348,12 @@ int ICATPortBindingProxy::searchInvestigationByParameterRestriction(
       soap_tmp___ns1__searchInvestigationByParameterRestriction;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchInvestigationByParameterRestrictionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchInvestigationByParameterRestriction
       .ns1__searchInvestigationByParameterRestriction_ =
       ns1__searchInvestigationByParameterRestriction_;
@@ -7367,18 +7368,18 @@ int ICATPortBindingProxy::searchInvestigationByParameterRestriction(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchInvestigationByParameterRestriction(
             soap, &soap_tmp___ns1__searchInvestigationByParameterRestriction,
-            "-ns1:searchInvestigationByParameterRestriction", NULL) ||
+            "-ns1:searchInvestigationByParameterRestriction", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchInvestigationByParameterRestriction(
           soap, &soap_tmp___ns1__searchInvestigationByParameterRestriction,
-          "-ns1:searchInvestigationByParameterRestriction", NULL) ||
+          "-ns1:searchInvestigationByParameterRestriction", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7410,12 +7411,12 @@ int ICATPortBindingProxy::searchInvestigationByRestriction(
       soap_tmp___ns1__searchInvestigationByRestriction;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchInvestigationByRestrictionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchInvestigationByRestriction
       .ns1__searchInvestigationByRestriction_ =
       ns1__searchInvestigationByRestriction_;
@@ -7430,18 +7431,18 @@ int ICATPortBindingProxy::searchInvestigationByRestriction(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchInvestigationByRestriction(
             soap, &soap_tmp___ns1__searchInvestigationByRestriction,
-            "-ns1:searchInvestigationByRestriction", NULL) ||
+            "-ns1:searchInvestigationByRestriction", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchInvestigationByRestriction(
           soap, &soap_tmp___ns1__searchInvestigationByRestriction,
-          "-ns1:searchInvestigationByRestriction", NULL) ||
+          "-ns1:searchInvestigationByRestriction", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7472,11 +7473,11 @@ int ICATPortBindingProxy::searchDatasetByRestriction(
       soap_tmp___ns1__searchDatasetByRestriction;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchDatasetByRestrictionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatasetByRestriction.ns1__searchDatasetByRestriction_ =
       ns1__searchDatasetByRestriction_;
   soap_begin(soap);
@@ -7490,18 +7491,18 @@ int ICATPortBindingProxy::searchDatasetByRestriction(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatasetByRestriction(
             soap, &soap_tmp___ns1__searchDatasetByRestriction,
-            "-ns1:searchDatasetByRestriction", NULL) ||
+            "-ns1:searchDatasetByRestriction", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatasetByRestriction(
           soap, &soap_tmp___ns1__searchDatasetByRestriction,
-          "-ns1:searchDatasetByRestriction", NULL) ||
+          "-ns1:searchDatasetByRestriction", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7532,11 +7533,11 @@ int ICATPortBindingProxy::searchDatafileByRestriction(
       soap_tmp___ns1__searchDatafileByRestriction;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchDatafileByRestrictionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatafileByRestriction
       .ns1__searchDatafileByRestriction_ = ns1__searchDatafileByRestriction_;
   soap_begin(soap);
@@ -7550,18 +7551,18 @@ int ICATPortBindingProxy::searchDatafileByRestriction(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatafileByRestriction(
             soap, &soap_tmp___ns1__searchDatafileByRestriction,
-            "-ns1:searchDatafileByRestriction", NULL) ||
+            "-ns1:searchDatafileByRestriction", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatafileByRestriction(
           soap, &soap_tmp___ns1__searchDatafileByRestriction,
-          "-ns1:searchDatafileByRestriction", NULL) ||
+          "-ns1:searchDatafileByRestriction", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7592,11 +7593,11 @@ int ICATPortBindingProxy::searchSampleByRestriction(
       soap_tmp___ns1__searchSampleByRestriction;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchSampleByRestrictionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchSampleByRestriction.ns1__searchSampleByRestriction_ =
       ns1__searchSampleByRestriction_;
   soap_begin(soap);
@@ -7610,18 +7611,18 @@ int ICATPortBindingProxy::searchSampleByRestriction(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchSampleByRestriction(
             soap, &soap_tmp___ns1__searchSampleByRestriction,
-            "-ns1:searchSampleByRestriction", NULL) ||
+            "-ns1:searchSampleByRestriction", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchSampleByRestriction(
           soap, &soap_tmp___ns1__searchSampleByRestriction,
-          "-ns1:searchSampleByRestriction", NULL) ||
+          "-ns1:searchSampleByRestriction", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7653,12 +7654,12 @@ int ICATPortBindingProxy::searchInvestigationByRestrictionComparasion(
       soap_tmp___ns1__searchInvestigationByRestrictionComparasion;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/"
                   "searchInvestigationByRestrictionComparasionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchInvestigationByRestrictionComparasion
       .ns1__searchInvestigationByRestrictionComparasion_ =
       ns1__searchInvestigationByRestrictionComparasion_;
@@ -7673,18 +7674,18 @@ int ICATPortBindingProxy::searchInvestigationByRestrictionComparasion(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchInvestigationByRestrictionComparasion(
             soap, &soap_tmp___ns1__searchInvestigationByRestrictionComparasion,
-            "-ns1:searchInvestigationByRestrictionComparasion", NULL) ||
+            "-ns1:searchInvestigationByRestrictionComparasion", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchInvestigationByRestrictionComparasion(
           soap, &soap_tmp___ns1__searchInvestigationByRestrictionComparasion,
-          "-ns1:searchInvestigationByRestrictionComparasion", NULL) ||
+          "-ns1:searchInvestigationByRestrictionComparasion", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7716,12 +7717,12 @@ int ICATPortBindingProxy::searchDatasetByRestrictionComparison(
       soap_tmp___ns1__searchDatasetByRestrictionComparison;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchDatasetByRestrictionComparisonRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatasetByRestrictionComparison
       .ns1__searchDatasetByRestrictionComparison_ =
       ns1__searchDatasetByRestrictionComparison_;
@@ -7736,18 +7737,18 @@ int ICATPortBindingProxy::searchDatasetByRestrictionComparison(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatasetByRestrictionComparison(
             soap, &soap_tmp___ns1__searchDatasetByRestrictionComparison,
-            "-ns1:searchDatasetByRestrictionComparison", NULL) ||
+            "-ns1:searchDatasetByRestrictionComparison", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatasetByRestrictionComparison(
           soap, &soap_tmp___ns1__searchDatasetByRestrictionComparison,
-          "-ns1:searchDatasetByRestrictionComparison", NULL) ||
+          "-ns1:searchDatasetByRestrictionComparison", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7779,12 +7780,12 @@ int ICATPortBindingProxy::searchDatafileByRestrictionComparison(
       soap_tmp___ns1__searchDatafileByRestrictionComparison;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchDatafileByRestrictionComparisonRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatafileByRestrictionComparison
       .ns1__searchDatafileByRestrictionComparison_ =
       ns1__searchDatafileByRestrictionComparison_;
@@ -7799,18 +7800,18 @@ int ICATPortBindingProxy::searchDatafileByRestrictionComparison(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatafileByRestrictionComparison(
             soap, &soap_tmp___ns1__searchDatafileByRestrictionComparison,
-            "-ns1:searchDatafileByRestrictionComparison", NULL) ||
+            "-ns1:searchDatafileByRestrictionComparison", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatafileByRestrictionComparison(
           soap, &soap_tmp___ns1__searchDatafileByRestrictionComparison,
-          "-ns1:searchDatafileByRestrictionComparison", NULL) ||
+          "-ns1:searchDatafileByRestrictionComparison", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7842,12 +7843,12 @@ int ICATPortBindingProxy::searchSampleByRestrictionComparison(
       soap_tmp___ns1__searchSampleByRestrictionComparison;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchSampleByRestrictionComparisonRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchSampleByRestrictionComparison
       .ns1__searchSampleByRestrictionComparison_ =
       ns1__searchSampleByRestrictionComparison_;
@@ -7862,18 +7863,18 @@ int ICATPortBindingProxy::searchSampleByRestrictionComparison(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchSampleByRestrictionComparison(
             soap, &soap_tmp___ns1__searchSampleByRestrictionComparison,
-            "-ns1:searchSampleByRestrictionComparison", NULL) ||
+            "-ns1:searchSampleByRestrictionComparison", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchSampleByRestrictionComparison(
           soap, &soap_tmp___ns1__searchSampleByRestrictionComparison,
-          "-ns1:searchSampleByRestrictionComparison", NULL) ||
+          "-ns1:searchSampleByRestrictionComparison", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7905,12 +7906,12 @@ int ICATPortBindingProxy::searchSampleByRestrictionLogical(
       soap_tmp___ns1__searchSampleByRestrictionLogical;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchSampleByRestrictionLogicalRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchSampleByRestrictionLogical
       .ns1__searchSampleByRestrictionLogical_ =
       ns1__searchSampleByRestrictionLogical_;
@@ -7925,18 +7926,18 @@ int ICATPortBindingProxy::searchSampleByRestrictionLogical(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchSampleByRestrictionLogical(
             soap, &soap_tmp___ns1__searchSampleByRestrictionLogical,
-            "-ns1:searchSampleByRestrictionLogical", NULL) ||
+            "-ns1:searchSampleByRestrictionLogical", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchSampleByRestrictionLogical(
           soap, &soap_tmp___ns1__searchSampleByRestrictionLogical,
-          "-ns1:searchSampleByRestrictionLogical", NULL) ||
+          "-ns1:searchSampleByRestrictionLogical", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -7968,12 +7969,12 @@ int ICATPortBindingProxy::searchDatasetByRestrictionLogical(
       soap_tmp___ns1__searchDatasetByRestrictionLogical;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchDatasetByRestrictionLogicalRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatasetByRestrictionLogical
       .ns1__searchDatasetByRestrictionLogical_ =
       ns1__searchDatasetByRestrictionLogical_;
@@ -7988,18 +7989,18 @@ int ICATPortBindingProxy::searchDatasetByRestrictionLogical(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatasetByRestrictionLogical(
             soap, &soap_tmp___ns1__searchDatasetByRestrictionLogical,
-            "-ns1:searchDatasetByRestrictionLogical", NULL) ||
+            "-ns1:searchDatasetByRestrictionLogical", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatasetByRestrictionLogical(
           soap, &soap_tmp___ns1__searchDatasetByRestrictionLogical,
-          "-ns1:searchDatasetByRestrictionLogical", NULL) ||
+          "-ns1:searchDatasetByRestrictionLogical", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -8031,12 +8032,12 @@ int ICATPortBindingProxy::searchInvestigationByRestrictionLogical(
       soap_tmp___ns1__searchInvestigationByRestrictionLogical;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchInvestigationByRestrictionLogicalRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchInvestigationByRestrictionLogical
       .ns1__searchInvestigationByRestrictionLogical_ =
       ns1__searchInvestigationByRestrictionLogical_;
@@ -8051,18 +8052,18 @@ int ICATPortBindingProxy::searchInvestigationByRestrictionLogical(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchInvestigationByRestrictionLogical(
             soap, &soap_tmp___ns1__searchInvestigationByRestrictionLogical,
-            "-ns1:searchInvestigationByRestrictionLogical", NULL) ||
+            "-ns1:searchInvestigationByRestrictionLogical", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchInvestigationByRestrictionLogical(
           soap, &soap_tmp___ns1__searchInvestigationByRestrictionLogical,
-          "-ns1:searchInvestigationByRestrictionLogical", NULL) ||
+          "-ns1:searchInvestigationByRestrictionLogical", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -8094,12 +8095,12 @@ int ICATPortBindingProxy::searchDatafileByRestrictionLogical(
       soap_tmp___ns1__searchDatafileByRestrictionLogical;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchDatafileByRestrictionLogicalRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatafileByRestrictionLogical
       .ns1__searchDatafileByRestrictionLogical_ =
       ns1__searchDatafileByRestrictionLogical_;
@@ -8114,18 +8115,18 @@ int ICATPortBindingProxy::searchDatafileByRestrictionLogical(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatafileByRestrictionLogical(
             soap, &soap_tmp___ns1__searchDatafileByRestrictionLogical,
-            "-ns1:searchDatafileByRestrictionLogical", NULL) ||
+            "-ns1:searchDatafileByRestrictionLogical", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatafileByRestrictionLogical(
           soap, &soap_tmp___ns1__searchDatafileByRestrictionLogical,
-          "-ns1:searchDatafileByRestrictionLogical", NULL) ||
+          "-ns1:searchDatafileByRestrictionLogical", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -8157,12 +8158,12 @@ int ICATPortBindingProxy::searchInvestigationByParameterLogical(
       soap_tmp___ns1__searchInvestigationByParameterLogical;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchInvestigationByParameterLogicalRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchInvestigationByParameterLogical
       .ns1__searchInvestigationByParameterLogical_ =
       ns1__searchInvestigationByParameterLogical_;
@@ -8177,18 +8178,18 @@ int ICATPortBindingProxy::searchInvestigationByParameterLogical(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchInvestigationByParameterLogical(
             soap, &soap_tmp___ns1__searchInvestigationByParameterLogical,
-            "-ns1:searchInvestigationByParameterLogical", NULL) ||
+            "-ns1:searchInvestigationByParameterLogical", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchInvestigationByParameterLogical(
           soap, &soap_tmp___ns1__searchInvestigationByParameterLogical,
-          "-ns1:searchInvestigationByParameterLogical", NULL) ||
+          "-ns1:searchInvestigationByParameterLogical", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -8220,12 +8221,12 @@ int ICATPortBindingProxy::searchDatafileByParameterLogical(
       soap_tmp___ns1__searchDatafileByParameterLogical;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action =
         "client.icat3.uk/ICAT/searchDatafileByParameterLogicalRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatafileByParameterLogical
       .ns1__searchDatafileByParameterLogical_ =
       ns1__searchDatafileByParameterLogical_;
@@ -8240,18 +8241,18 @@ int ICATPortBindingProxy::searchDatafileByParameterLogical(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatafileByParameterLogical(
             soap, &soap_tmp___ns1__searchDatafileByParameterLogical,
-            "-ns1:searchDatafileByParameterLogical", NULL) ||
+            "-ns1:searchDatafileByParameterLogical", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatafileByParameterLogical(
           soap, &soap_tmp___ns1__searchDatafileByParameterLogical,
-          "-ns1:searchDatafileByParameterLogical", NULL) ||
+          "-ns1:searchDatafileByParameterLogical", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -8282,11 +8283,11 @@ int ICATPortBindingProxy::searchDatasetByParameterLogical(
       soap_tmp___ns1__searchDatasetByParameterLogical;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchDatasetByParameterLogicalRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchDatasetByParameterLogical
       .ns1__searchDatasetByParameterLogical_ =
       ns1__searchDatasetByParameterLogical_;
@@ -8301,18 +8302,18 @@ int ICATPortBindingProxy::searchDatasetByParameterLogical(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchDatasetByParameterLogical(
             soap, &soap_tmp___ns1__searchDatasetByParameterLogical,
-            "-ns1:searchDatasetByParameterLogical", NULL) ||
+            "-ns1:searchDatasetByParameterLogical", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchDatasetByParameterLogical(
           soap, &soap_tmp___ns1__searchDatasetByParameterLogical,
-          "-ns1:searchDatasetByParameterLogical", NULL) ||
+          "-ns1:searchDatasetByParameterLogical", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -8343,11 +8344,11 @@ int ICATPortBindingProxy::searchSampleByParameterLogical(
       soap_tmp___ns1__searchSampleByParameterLogical;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchSampleByParameterLogicalRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchSampleByParameterLogical
       .ns1__searchSampleByParameterLogical_ =
       ns1__searchSampleByParameterLogical_;
@@ -8362,18 +8363,18 @@ int ICATPortBindingProxy::searchSampleByParameterLogical(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchSampleByParameterLogical(
             soap, &soap_tmp___ns1__searchSampleByParameterLogical,
-            "-ns1:searchSampleByParameterLogical", NULL) ||
+            "-ns1:searchSampleByParameterLogical", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchSampleByParameterLogical(
           soap, &soap_tmp___ns1__searchSampleByParameterLogical,
-          "-ns1:searchSampleByParameterLogical", NULL) ||
+          "-ns1:searchSampleByParameterLogical", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -8404,11 +8405,11 @@ int ICATPortBindingProxy::searchFacilityUserByRestriction(
       soap_tmp___ns1__searchFacilityUserByRestriction;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://facilities01.esc.rl.ac.uk:8181/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "client.icat3.uk/ICAT/searchFacilityUserByRestrictionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchFacilityUserByRestriction
       .ns1__searchFacilityUserByRestriction_ =
       ns1__searchFacilityUserByRestriction_;
@@ -8423,18 +8424,18 @@ int ICATPortBindingProxy::searchFacilityUserByRestriction(
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchFacilityUserByRestriction(
             soap, &soap_tmp___ns1__searchFacilityUserByRestriction,
-            "-ns1:searchFacilityUserByRestriction", NULL) ||
+            "-ns1:searchFacilityUserByRestriction", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchFacilityUserByRestriction(
           soap, &soap_tmp___ns1__searchFacilityUserByRestriction,
-          "-ns1:searchFacilityUserByRestriction", NULL) ||
+          "-ns1:searchFacilityUserByRestriction", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
diff --git a/Framework/ICat/src/ICat4/GSoapGenerated/ICat4C.cpp b/Framework/ICat/src/ICat4/GSoapGenerated/ICat4C.cpp
index 7c0a1732cf1..c3b62707cf5 100644
--- a/Framework/ICat/src/ICat4/GSoapGenerated/ICat4C.cpp
+++ b/Framework/ICat/src/ICat4/GSoapGenerated/ICat4C.cpp
@@ -172,557 +172,591 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_getindependent(struct soap *soap) {
 SOAP_FMAC3 void *SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) {
   (void)type;
   if (soap_peek_element(soap))
-    return NULL;
+    return nullptr;
 #ifndef WITH_NOIDREF
   if (!*soap->id || !(*type = soap_lookup_type(soap, soap->id)))
     *type = soap_lookup_type(soap, soap->href);
   switch (*type) {
   case SOAP_TYPE_ICat4_byte:
-    return soap_in_byte(soap, NULL, NULL, "xsd:byte");
+    return soap_in_byte(soap, nullptr, nullptr, "xsd:byte");
   case SOAP_TYPE_ICat4_int:
-    return soap_in_int(soap, NULL, NULL, "xsd:int");
+    return soap_in_int(soap, nullptr, nullptr, "xsd:int");
   case SOAP_TYPE_ICat4_LONG64:
-    return soap_in_LONG64(soap, NULL, NULL, "xsd:long");
+    return soap_in_LONG64(soap, nullptr, nullptr, "xsd:long");
   case SOAP_TYPE_ICat4_double:
-    return soap_in_double(soap, NULL, NULL, "xsd:double");
+    return soap_in_double(soap, nullptr, nullptr, "xsd:double");
   case SOAP_TYPE_ICat4_time:
-    return soap_in_time(soap, NULL, NULL, "xsd:dateTime");
+    return soap_in_time(soap, nullptr, nullptr, "xsd:dateTime");
   case SOAP_TYPE_ICat4_ns1__accessType:
-    return soap_in_ns1__accessType(soap, NULL, NULL, "ns1:accessType");
+    return soap_in_ns1__accessType(soap, nullptr, nullptr, "ns1:accessType");
   case SOAP_TYPE_ICat4_ns1__relType:
-    return soap_in_ns1__relType(soap, NULL, NULL, "ns1:relType");
+    return soap_in_ns1__relType(soap, nullptr, nullptr, "ns1:relType");
   case SOAP_TYPE_ICat4_ns1__parameterValueType:
-    return soap_in_ns1__parameterValueType(soap, NULL, NULL,
+    return soap_in_ns1__parameterValueType(soap, nullptr, nullptr,
                                            "ns1:parameterValueType");
   case SOAP_TYPE_ICat4_ns1__studyStatus:
-    return soap_in_ns1__studyStatus(soap, NULL, NULL, "ns1:studyStatus");
+    return soap_in_ns1__studyStatus(soap, nullptr, nullptr, "ns1:studyStatus");
   case SOAP_TYPE_ICat4_ns1__icatExceptionType:
-    return soap_in_ns1__icatExceptionType(soap, NULL, NULL,
+    return soap_in_ns1__icatExceptionType(soap, nullptr, nullptr,
                                           "ns1:icatExceptionType");
   case SOAP_TYPE_ICat4_bool:
-    return soap_in_bool(soap, NULL, NULL, "xsd:boolean");
+    return soap_in_bool(soap, nullptr, nullptr, "xsd:boolean");
   case SOAP_TYPE_ICat4_ns1__accessType_:
-    return soap_in_ns1__accessType_(soap, NULL, NULL, "ns1:accessType");
+    return soap_in_ns1__accessType_(soap, nullptr, nullptr, "ns1:accessType");
   case SOAP_TYPE_ICat4_ns1__relType_:
-    return soap_in_ns1__relType_(soap, NULL, NULL, "ns1:relType");
+    return soap_in_ns1__relType_(soap, nullptr, nullptr, "ns1:relType");
   case SOAP_TYPE_ICat4_ns1__parameterValueType_:
-    return soap_in_ns1__parameterValueType_(soap, NULL, NULL,
+    return soap_in_ns1__parameterValueType_(soap, nullptr, nullptr,
                                             "ns1:parameterValueType");
   case SOAP_TYPE_ICat4_ns1__studyStatus_:
-    return soap_in_ns1__studyStatus_(soap, NULL, NULL, "ns1:studyStatus");
+    return soap_in_ns1__studyStatus_(soap, nullptr, nullptr, "ns1:studyStatus");
   case SOAP_TYPE_ICat4_ns1__icatExceptionType_:
-    return soap_in_ns1__icatExceptionType_(soap, NULL, NULL,
+    return soap_in_ns1__icatExceptionType_(soap, nullptr, nullptr,
                                            "ns1:icatExceptionType");
   case SOAP_TYPE_ICat4_ns1__getRemainingMinutesResponse:
     return soap_in_ns1__getRemainingMinutesResponse(
-        soap, NULL, NULL, "ns1:getRemainingMinutesResponse");
+        soap, nullptr, nullptr, "ns1:getRemainingMinutesResponse");
   case SOAP_TYPE_ICat4_ns1__getRemainingMinutes:
-    return soap_in_ns1__getRemainingMinutes(soap, NULL, NULL,
+    return soap_in_ns1__getRemainingMinutes(soap, nullptr, nullptr,
                                             "ns1:getRemainingMinutes");
   case SOAP_TYPE_ICat4_ns1__logoutResponse:
-    return soap_in_ns1__logoutResponse(soap, NULL, NULL, "ns1:logoutResponse");
+    return soap_in_ns1__logoutResponse(soap, nullptr, nullptr,
+                                       "ns1:logoutResponse");
   case SOAP_TYPE_ICat4_ns1__logout:
-    return soap_in_ns1__logout(soap, NULL, NULL, "ns1:logout");
+    return soap_in_ns1__logout(soap, nullptr, nullptr, "ns1:logout");
   case SOAP_TYPE_ICat4_ns1__searchResponse:
-    return soap_in_ns1__searchResponse(soap, NULL, NULL, "ns1:searchResponse");
+    return soap_in_ns1__searchResponse(soap, nullptr, nullptr,
+                                       "ns1:searchResponse");
   case SOAP_TYPE_ICat4_ns1__search:
-    return soap_in_ns1__search(soap, NULL, NULL, "ns1:search");
+    return soap_in_ns1__search(soap, nullptr, nullptr, "ns1:search");
   case SOAP_TYPE_ICat4_ns1__isAccessAllowedResponse:
-    return soap_in_ns1__isAccessAllowedResponse(soap, NULL, NULL,
+    return soap_in_ns1__isAccessAllowedResponse(soap, nullptr, nullptr,
                                                 "ns1:isAccessAllowedResponse");
   case SOAP_TYPE_ICat4_ns1__isAccessAllowed:
-    return soap_in_ns1__isAccessAllowed(soap, NULL, NULL,
+    return soap_in_ns1__isAccessAllowed(soap, nullptr, nullptr,
                                         "ns1:isAccessAllowed");
   case SOAP_TYPE_ICat4_ns1__deleteResponse:
-    return soap_in_ns1__deleteResponse(soap, NULL, NULL, "ns1:deleteResponse");
+    return soap_in_ns1__deleteResponse(soap, nullptr, nullptr,
+                                       "ns1:deleteResponse");
   case SOAP_TYPE_ICat4_ns1__delete:
-    return soap_in_ns1__delete(soap, NULL, NULL, "ns1:delete");
+    return soap_in_ns1__delete(soap, nullptr, nullptr, "ns1:delete");
   case SOAP_TYPE_ICat4_ns1__searchTextResponse:
-    return soap_in_ns1__searchTextResponse(soap, NULL, NULL,
+    return soap_in_ns1__searchTextResponse(soap, nullptr, nullptr,
                                            "ns1:searchTextResponse");
   case SOAP_TYPE_ICat4_ns1__searchText:
-    return soap_in_ns1__searchText(soap, NULL, NULL, "ns1:searchText");
+    return soap_in_ns1__searchText(soap, nullptr, nullptr, "ns1:searchText");
   case SOAP_TYPE_ICat4_ns1__luceneCommitResponse:
-    return soap_in_ns1__luceneCommitResponse(soap, NULL, NULL,
+    return soap_in_ns1__luceneCommitResponse(soap, nullptr, nullptr,
                                              "ns1:luceneCommitResponse");
   case SOAP_TYPE_ICat4_ns1__luceneCommit:
-    return soap_in_ns1__luceneCommit(soap, NULL, NULL, "ns1:luceneCommit");
+    return soap_in_ns1__luceneCommit(soap, nullptr, nullptr,
+                                     "ns1:luceneCommit");
   case SOAP_TYPE_ICat4_ns1__entityField:
-    return soap_in_ns1__entityField(soap, NULL, NULL, "ns1:entityField");
+    return soap_in_ns1__entityField(soap, nullptr, nullptr, "ns1:entityField");
   case SOAP_TYPE_ICat4_ns1__constraint:
-    return soap_in_ns1__constraint(soap, NULL, NULL, "ns1:constraint");
+    return soap_in_ns1__constraint(soap, nullptr, nullptr, "ns1:constraint");
   case SOAP_TYPE_ICat4_ns1__entityInfo:
-    return soap_in_ns1__entityInfo(soap, NULL, NULL, "ns1:entityInfo");
+    return soap_in_ns1__entityInfo(soap, nullptr, nullptr, "ns1:entityInfo");
   case SOAP_TYPE_ICat4_ns1__getEntityInfoResponse:
-    return soap_in_ns1__getEntityInfoResponse(soap, NULL, NULL,
+    return soap_in_ns1__getEntityInfoResponse(soap, nullptr, nullptr,
                                               "ns1:getEntityInfoResponse");
   case SOAP_TYPE_ICat4_ns1__getEntityInfo:
-    return soap_in_ns1__getEntityInfo(soap, NULL, NULL, "ns1:getEntityInfo");
+    return soap_in_ns1__getEntityInfo(soap, nullptr, nullptr,
+                                      "ns1:getEntityInfo");
   case SOAP_TYPE_ICat4_ns1__dummyResponse:
-    return soap_in_ns1__dummyResponse(soap, NULL, NULL, "ns1:dummyResponse");
+    return soap_in_ns1__dummyResponse(soap, nullptr, nullptr,
+                                      "ns1:dummyResponse");
   case SOAP_TYPE_ICat4_ns1__publicStep:
-    return soap_in_ns1__publicStep(soap, NULL, NULL, "ns1:publicStep");
+    return soap_in_ns1__publicStep(soap, nullptr, nullptr, "ns1:publicStep");
   case SOAP_TYPE_ICat4_ns1__log:
-    return soap_in_ns1__log(soap, NULL, NULL, "ns1:log");
+    return soap_in_ns1__log(soap, nullptr, nullptr, "ns1:log");
   case SOAP_TYPE_ICat4_ns1__relatedDatafile:
-    return soap_in_ns1__relatedDatafile(soap, NULL, NULL,
+    return soap_in_ns1__relatedDatafile(soap, nullptr, nullptr,
                                         "ns1:relatedDatafile");
   case SOAP_TYPE_ICat4_ns1__shift:
-    return soap_in_ns1__shift(soap, NULL, NULL, "ns1:shift");
+    return soap_in_ns1__shift(soap, nullptr, nullptr, "ns1:shift");
   case SOAP_TYPE_ICat4_ns1__publication:
-    return soap_in_ns1__publication(soap, NULL, NULL, "ns1:publication");
+    return soap_in_ns1__publication(soap, nullptr, nullptr, "ns1:publication");
   case SOAP_TYPE_ICat4_ns1__keyword:
-    return soap_in_ns1__keyword(soap, NULL, NULL, "ns1:keyword");
+    return soap_in_ns1__keyword(soap, nullptr, nullptr, "ns1:keyword");
   case SOAP_TYPE_ICat4_ns1__sampleType:
-    return soap_in_ns1__sampleType(soap, NULL, NULL, "ns1:sampleType");
+    return soap_in_ns1__sampleType(soap, nullptr, nullptr, "ns1:sampleType");
   case SOAP_TYPE_ICat4_ns1__sample:
-    return soap_in_ns1__sample(soap, NULL, NULL, "ns1:sample");
+    return soap_in_ns1__sample(soap, nullptr, nullptr, "ns1:sample");
   case SOAP_TYPE_ICat4_ns1__sampleParameter:
-    return soap_in_ns1__sampleParameter(soap, NULL, NULL,
+    return soap_in_ns1__sampleParameter(soap, nullptr, nullptr,
                                         "ns1:sampleParameter");
   case SOAP_TYPE_ICat4_ns1__permissibleStringValue:
-    return soap_in_ns1__permissibleStringValue(soap, NULL, NULL,
+    return soap_in_ns1__permissibleStringValue(soap, nullptr, nullptr,
                                                "ns1:permissibleStringValue");
   case SOAP_TYPE_ICat4_ns1__investigationParameter:
-    return soap_in_ns1__investigationParameter(soap, NULL, NULL,
+    return soap_in_ns1__investigationParameter(soap, nullptr, nullptr,
                                                "ns1:investigationParameter");
   case SOAP_TYPE_ICat4_ns1__datasetParameter:
-    return soap_in_ns1__datasetParameter(soap, NULL, NULL,
+    return soap_in_ns1__datasetParameter(soap, nullptr, nullptr,
                                          "ns1:datasetParameter");
   case SOAP_TYPE_ICat4_ns1__datafileParameter:
-    return soap_in_ns1__datafileParameter(soap, NULL, NULL,
+    return soap_in_ns1__datafileParameter(soap, nullptr, nullptr,
                                           "ns1:datafileParameter");
   case SOAP_TYPE_ICat4_ns1__parameter:
-    return soap_in_ns1__parameter(soap, NULL, NULL, "ns1:parameter");
+    return soap_in_ns1__parameter(soap, nullptr, nullptr, "ns1:parameter");
   case SOAP_TYPE_ICat4_ns1__dataCollectionParameter:
-    return soap_in_ns1__dataCollectionParameter(soap, NULL, NULL,
+    return soap_in_ns1__dataCollectionParameter(soap, nullptr, nullptr,
                                                 "ns1:dataCollectionParameter");
   case SOAP_TYPE_ICat4_ns1__parameterType:
-    return soap_in_ns1__parameterType(soap, NULL, NULL, "ns1:parameterType");
+    return soap_in_ns1__parameterType(soap, nullptr, nullptr,
+                                      "ns1:parameterType");
   case SOAP_TYPE_ICat4_ns1__investigationType:
-    return soap_in_ns1__investigationType(soap, NULL, NULL,
+    return soap_in_ns1__investigationType(soap, nullptr, nullptr,
                                           "ns1:investigationType");
   case SOAP_TYPE_ICat4_ns1__investigationInstrument:
-    return soap_in_ns1__investigationInstrument(soap, NULL, NULL,
+    return soap_in_ns1__investigationInstrument(soap, nullptr, nullptr,
                                                 "ns1:investigationInstrument");
   case SOAP_TYPE_ICat4_ns1__rule:
-    return soap_in_ns1__rule(soap, NULL, NULL, "ns1:rule");
+    return soap_in_ns1__rule(soap, nullptr, nullptr, "ns1:rule");
   case SOAP_TYPE_ICat4_ns1__grouping:
-    return soap_in_ns1__grouping(soap, NULL, NULL, "ns1:grouping");
+    return soap_in_ns1__grouping(soap, nullptr, nullptr, "ns1:grouping");
   case SOAP_TYPE_ICat4_ns1__userGroup:
-    return soap_in_ns1__userGroup(soap, NULL, NULL, "ns1:userGroup");
+    return soap_in_ns1__userGroup(soap, nullptr, nullptr, "ns1:userGroup");
   case SOAP_TYPE_ICat4_ns1__studyInvestigation:
-    return soap_in_ns1__studyInvestigation(soap, NULL, NULL,
+    return soap_in_ns1__studyInvestigation(soap, nullptr, nullptr,
                                            "ns1:studyInvestigation");
   case SOAP_TYPE_ICat4_ns1__study:
-    return soap_in_ns1__study(soap, NULL, NULL, "ns1:study");
+    return soap_in_ns1__study(soap, nullptr, nullptr, "ns1:study");
   case SOAP_TYPE_ICat4_ns1__investigationUser:
-    return soap_in_ns1__investigationUser(soap, NULL, NULL,
+    return soap_in_ns1__investigationUser(soap, nullptr, nullptr,
                                           "ns1:investigationUser");
   case SOAP_TYPE_ICat4_ns1__user:
-    return soap_in_ns1__user(soap, NULL, NULL, "ns1:user");
+    return soap_in_ns1__user(soap, nullptr, nullptr, "ns1:user");
   case SOAP_TYPE_ICat4_ns1__instrumentScientist:
-    return soap_in_ns1__instrumentScientist(soap, NULL, NULL,
+    return soap_in_ns1__instrumentScientist(soap, nullptr, nullptr,
                                             "ns1:instrumentScientist");
   case SOAP_TYPE_ICat4_ns1__instrument:
-    return soap_in_ns1__instrument(soap, NULL, NULL, "ns1:instrument");
+    return soap_in_ns1__instrument(soap, nullptr, nullptr, "ns1:instrument");
   case SOAP_TYPE_ICat4_ns1__facilityCycle:
-    return soap_in_ns1__facilityCycle(soap, NULL, NULL, "ns1:facilityCycle");
+    return soap_in_ns1__facilityCycle(soap, nullptr, nullptr,
+                                      "ns1:facilityCycle");
   case SOAP_TYPE_ICat4_ns1__datasetType:
-    return soap_in_ns1__datasetType(soap, NULL, NULL, "ns1:datasetType");
+    return soap_in_ns1__datasetType(soap, nullptr, nullptr, "ns1:datasetType");
   case SOAP_TYPE_ICat4_ns1__datafileFormat:
-    return soap_in_ns1__datafileFormat(soap, NULL, NULL, "ns1:datafileFormat");
+    return soap_in_ns1__datafileFormat(soap, nullptr, nullptr,
+                                       "ns1:datafileFormat");
   case SOAP_TYPE_ICat4_ns1__job:
-    return soap_in_ns1__job(soap, NULL, NULL, "ns1:job");
+    return soap_in_ns1__job(soap, nullptr, nullptr, "ns1:job");
   case SOAP_TYPE_ICat4_ns1__application:
-    return soap_in_ns1__application(soap, NULL, NULL, "ns1:application");
+    return soap_in_ns1__application(soap, nullptr, nullptr, "ns1:application");
   case SOAP_TYPE_ICat4_ns1__facility:
-    return soap_in_ns1__facility(soap, NULL, NULL, "ns1:facility");
+    return soap_in_ns1__facility(soap, nullptr, nullptr, "ns1:facility");
   case SOAP_TYPE_ICat4_ns1__investigation:
-    return soap_in_ns1__investigation(soap, NULL, NULL, "ns1:investigation");
+    return soap_in_ns1__investigation(soap, nullptr, nullptr,
+                                      "ns1:investigation");
   case SOAP_TYPE_ICat4_ns1__dataset:
-    return soap_in_ns1__dataset(soap, NULL, NULL, "ns1:dataset");
+    return soap_in_ns1__dataset(soap, nullptr, nullptr, "ns1:dataset");
   case SOAP_TYPE_ICat4_ns1__dataCollectionDataset:
-    return soap_in_ns1__dataCollectionDataset(soap, NULL, NULL,
+    return soap_in_ns1__dataCollectionDataset(soap, nullptr, nullptr,
                                               "ns1:dataCollectionDataset");
   case SOAP_TYPE_ICat4_ns1__dataCollection:
-    return soap_in_ns1__dataCollection(soap, NULL, NULL, "ns1:dataCollection");
+    return soap_in_ns1__dataCollection(soap, nullptr, nullptr,
+                                       "ns1:dataCollection");
   case SOAP_TYPE_ICat4_ns1__dataCollectionDatafile:
-    return soap_in_ns1__dataCollectionDatafile(soap, NULL, NULL,
+    return soap_in_ns1__dataCollectionDatafile(soap, nullptr, nullptr,
                                                "ns1:dataCollectionDatafile");
   case SOAP_TYPE_ICat4_ns1__datafile:
-    return soap_in_ns1__datafile(soap, NULL, NULL, "ns1:datafile");
+    return soap_in_ns1__datafile(soap, nullptr, nullptr, "ns1:datafile");
   case SOAP_TYPE_ICat4_ns1__dummy:
-    return soap_in_ns1__dummy(soap, NULL, NULL, "ns1:dummy");
+    return soap_in_ns1__dummy(soap, nullptr, nullptr, "ns1:dummy");
   case SOAP_TYPE_ICat4_ns1__loginResponse:
-    return soap_in_ns1__loginResponse(soap, NULL, NULL, "ns1:loginResponse");
+    return soap_in_ns1__loginResponse(soap, nullptr, nullptr,
+                                      "ns1:loginResponse");
   case SOAP_TYPE_ICat4_ns1__login:
-    return soap_in_ns1__login(soap, NULL, NULL, "ns1:login");
+    return soap_in_ns1__login(soap, nullptr, nullptr, "ns1:login");
   case SOAP_TYPE_ICat4_ns1__refreshResponse:
-    return soap_in_ns1__refreshResponse(soap, NULL, NULL,
+    return soap_in_ns1__refreshResponse(soap, nullptr, nullptr,
                                         "ns1:refreshResponse");
   case SOAP_TYPE_ICat4_ns1__refresh:
-    return soap_in_ns1__refresh(soap, NULL, NULL, "ns1:refresh");
+    return soap_in_ns1__refresh(soap, nullptr, nullptr, "ns1:refresh");
   case SOAP_TYPE_ICat4_ns1__getUserNameResponse:
-    return soap_in_ns1__getUserNameResponse(soap, NULL, NULL,
+    return soap_in_ns1__getUserNameResponse(soap, nullptr, nullptr,
                                             "ns1:getUserNameResponse");
   case SOAP_TYPE_ICat4_ns1__getUserName:
-    return soap_in_ns1__getUserName(soap, NULL, NULL, "ns1:getUserName");
+    return soap_in_ns1__getUserName(soap, nullptr, nullptr, "ns1:getUserName");
   case SOAP_TYPE_ICat4_ns1__deleteManyResponse:
-    return soap_in_ns1__deleteManyResponse(soap, NULL, NULL,
+    return soap_in_ns1__deleteManyResponse(soap, nullptr, nullptr,
                                            "ns1:deleteManyResponse");
   case SOAP_TYPE_ICat4_ns1__deleteMany:
-    return soap_in_ns1__deleteMany(soap, NULL, NULL, "ns1:deleteMany");
+    return soap_in_ns1__deleteMany(soap, nullptr, nullptr, "ns1:deleteMany");
   case SOAP_TYPE_ICat4_ns1__updateResponse:
-    return soap_in_ns1__updateResponse(soap, NULL, NULL, "ns1:updateResponse");
+    return soap_in_ns1__updateResponse(soap, nullptr, nullptr,
+                                       "ns1:updateResponse");
   case SOAP_TYPE_ICat4_ns1__update:
-    return soap_in_ns1__update(soap, NULL, NULL, "ns1:update");
+    return soap_in_ns1__update(soap, nullptr, nullptr, "ns1:update");
   case SOAP_TYPE_ICat4_ns1__luceneGetPopulatingResponse:
     return soap_in_ns1__luceneGetPopulatingResponse(
-        soap, NULL, NULL, "ns1:luceneGetPopulatingResponse");
+        soap, nullptr, nullptr, "ns1:luceneGetPopulatingResponse");
   case SOAP_TYPE_ICat4_ns1__luceneGetPopulating:
-    return soap_in_ns1__luceneGetPopulating(soap, NULL, NULL,
+    return soap_in_ns1__luceneGetPopulating(soap, nullptr, nullptr,
                                             "ns1:luceneGetPopulating");
   case SOAP_TYPE_ICat4_ns1__getApiVersionResponse:
-    return soap_in_ns1__getApiVersionResponse(soap, NULL, NULL,
+    return soap_in_ns1__getApiVersionResponse(soap, nullptr, nullptr,
                                               "ns1:getApiVersionResponse");
   case SOAP_TYPE_ICat4_ns1__getApiVersion:
-    return soap_in_ns1__getApiVersion(soap, NULL, NULL, "ns1:getApiVersion");
+    return soap_in_ns1__getApiVersion(soap, nullptr, nullptr,
+                                      "ns1:getApiVersion");
   case SOAP_TYPE_ICat4_ns1__getEntityNamesResponse:
-    return soap_in_ns1__getEntityNamesResponse(soap, NULL, NULL,
+    return soap_in_ns1__getEntityNamesResponse(soap, nullptr, nullptr,
                                                "ns1:getEntityNamesResponse");
   case SOAP_TYPE_ICat4_ns1__getEntityNames:
-    return soap_in_ns1__getEntityNames(soap, NULL, NULL, "ns1:getEntityNames");
+    return soap_in_ns1__getEntityNames(soap, nullptr, nullptr,
+                                       "ns1:getEntityNames");
   case SOAP_TYPE_ICat4_ns1__getResponse:
-    return soap_in_ns1__getResponse(soap, NULL, NULL, "ns1:getResponse");
+    return soap_in_ns1__getResponse(soap, nullptr, nullptr, "ns1:getResponse");
   case SOAP_TYPE_ICat4_ns1__get:
-    return soap_in_ns1__get(soap, NULL, NULL, "ns1:get");
+    return soap_in_ns1__get(soap, nullptr, nullptr, "ns1:get");
   case SOAP_TYPE_ICat4_ns1__lucenePopulateResponse:
-    return soap_in_ns1__lucenePopulateResponse(soap, NULL, NULL,
+    return soap_in_ns1__lucenePopulateResponse(soap, nullptr, nullptr,
                                                "ns1:lucenePopulateResponse");
   case SOAP_TYPE_ICat4_ns1__lucenePopulate:
-    return soap_in_ns1__lucenePopulate(soap, NULL, NULL, "ns1:lucenePopulate");
+    return soap_in_ns1__lucenePopulate(soap, nullptr, nullptr,
+                                       "ns1:lucenePopulate");
   case SOAP_TYPE_ICat4_ns1__luceneSearchResponse:
-    return soap_in_ns1__luceneSearchResponse(soap, NULL, NULL,
+    return soap_in_ns1__luceneSearchResponse(soap, nullptr, nullptr,
                                              "ns1:luceneSearchResponse");
   case SOAP_TYPE_ICat4_ns1__luceneSearch:
-    return soap_in_ns1__luceneSearch(soap, NULL, NULL, "ns1:luceneSearch");
+    return soap_in_ns1__luceneSearch(soap, nullptr, nullptr,
+                                     "ns1:luceneSearch");
   case SOAP_TYPE_ICat4_ns1__getPropertiesResponse:
-    return soap_in_ns1__getPropertiesResponse(soap, NULL, NULL,
+    return soap_in_ns1__getPropertiesResponse(soap, nullptr, nullptr,
                                               "ns1:getPropertiesResponse");
   case SOAP_TYPE_ICat4_ns1__getProperties:
-    return soap_in_ns1__getProperties(soap, NULL, NULL, "ns1:getProperties");
+    return soap_in_ns1__getProperties(soap, nullptr, nullptr,
+                                      "ns1:getProperties");
   case SOAP_TYPE_ICat4_ns1__createResponse:
-    return soap_in_ns1__createResponse(soap, NULL, NULL, "ns1:createResponse");
+    return soap_in_ns1__createResponse(soap, nullptr, nullptr,
+                                       "ns1:createResponse");
   case SOAP_TYPE_ICat4_ns1__create:
-    return soap_in_ns1__create(soap, NULL, NULL, "ns1:create");
+    return soap_in_ns1__create(soap, nullptr, nullptr, "ns1:create");
   case SOAP_TYPE_ICat4_ns1__createManyResponse:
-    return soap_in_ns1__createManyResponse(soap, NULL, NULL,
+    return soap_in_ns1__createManyResponse(soap, nullptr, nullptr,
                                            "ns1:createManyResponse");
   case SOAP_TYPE_ICat4_ns1__entityBaseBean:
-    return soap_in_ns1__entityBaseBean(soap, NULL, NULL, "ns1:entityBaseBean");
+    return soap_in_ns1__entityBaseBean(soap, nullptr, nullptr,
+                                       "ns1:entityBaseBean");
   case SOAP_TYPE_ICat4_ns1__createMany:
-    return soap_in_ns1__createMany(soap, NULL, NULL, "ns1:createMany");
+    return soap_in_ns1__createMany(soap, nullptr, nullptr, "ns1:createMany");
   case SOAP_TYPE_ICat4_ns1__IcatException:
-    return soap_in_ns1__IcatException(soap, NULL, NULL, "ns1:IcatException");
+    return soap_in_ns1__IcatException(soap, nullptr, nullptr,
+                                      "ns1:IcatException");
   case SOAP_TYPE_ICat4_ns1__luceneClearResponse:
-    return soap_in_ns1__luceneClearResponse(soap, NULL, NULL,
+    return soap_in_ns1__luceneClearResponse(soap, nullptr, nullptr,
                                             "ns1:luceneClearResponse");
   case SOAP_TYPE_ICat4_ns1__luceneClear:
-    return soap_in_ns1__luceneClear(soap, NULL, NULL, "ns1:luceneClear");
+    return soap_in_ns1__luceneClear(soap, nullptr, nullptr, "ns1:luceneClear");
   case SOAP_TYPE_ICat4_std__string:
-    return soap_in_std__string(soap, NULL, NULL, "xsd:string");
+    return soap_in_std__string(soap, nullptr, nullptr, "xsd:string");
   case SOAP_TYPE_ICat4_xsd__string:
-    return soap_in_xsd__string(soap, NULL, NULL, "xsd:string");
+    return soap_in_xsd__string(soap, nullptr, nullptr, "xsd:string");
   case SOAP_TYPE_ICat4_xsd__long:
-    return soap_in_xsd__long(soap, NULL, NULL, "xsd:long");
+    return soap_in_xsd__long(soap, nullptr, nullptr, "xsd:long");
   case SOAP_TYPE_ICat4_xsd__int:
-    return soap_in_xsd__int(soap, NULL, NULL, "xsd:int");
+    return soap_in_xsd__int(soap, nullptr, nullptr, "xsd:int");
   case SOAP_TYPE_ICat4_xsd__double:
-    return soap_in_xsd__double(soap, NULL, NULL, "xsd:double");
+    return soap_in_xsd__double(soap, nullptr, nullptr, "xsd:double");
   case SOAP_TYPE_ICat4_xsd__dateTime:
-    return soap_in_xsd__dateTime(soap, NULL, NULL, "xsd:dateTime");
+    return soap_in_xsd__dateTime(soap, nullptr, nullptr, "xsd:dateTime");
   case SOAP_TYPE_ICat4_xsd__boolean:
-    return soap_in_xsd__boolean(soap, NULL, NULL, "xsd:boolean");
+    return soap_in_xsd__boolean(soap, nullptr, nullptr, "xsd:boolean");
   case SOAP_TYPE_ICat4_xsd__anyType:
-    return soap_in_xsd__anyType(soap, NULL, NULL, "xsd:anyType");
+    return soap_in_xsd__anyType(soap, nullptr, nullptr, "xsd:anyType");
   case SOAP_TYPE_ICat4_PointerTons1__getEntityInfoResponse:
     return soap_in_PointerTons1__getEntityInfoResponse(
-        soap, NULL, NULL, "ns1:getEntityInfoResponse");
+        soap, nullptr, nullptr, "ns1:getEntityInfoResponse");
   case SOAP_TYPE_ICat4_PointerTons1__getEntityInfo:
-    return soap_in_PointerTons1__getEntityInfo(soap, NULL, NULL,
+    return soap_in_PointerTons1__getEntityInfo(soap, nullptr, nullptr,
                                                "ns1:getEntityInfo");
   case SOAP_TYPE_ICat4_PointerTons1__deleteManyResponse:
-    return soap_in_PointerTons1__deleteManyResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__deleteManyResponse(soap, nullptr, nullptr,
                                                     "ns1:deleteManyResponse");
   case SOAP_TYPE_ICat4_PointerTons1__deleteMany:
-    return soap_in_PointerTons1__deleteMany(soap, NULL, NULL, "ns1:deleteMany");
+    return soap_in_PointerTons1__deleteMany(soap, nullptr, nullptr,
+                                            "ns1:deleteMany");
   case SOAP_TYPE_ICat4_PointerTons1__createManyResponse:
-    return soap_in_PointerTons1__createManyResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__createManyResponse(soap, nullptr, nullptr,
                                                     "ns1:createManyResponse");
   case SOAP_TYPE_ICat4_PointerTons1__createMany:
-    return soap_in_PointerTons1__createMany(soap, NULL, NULL, "ns1:createMany");
+    return soap_in_PointerTons1__createMany(soap, nullptr, nullptr,
+                                            "ns1:createMany");
   case SOAP_TYPE_ICat4_PointerTons1__luceneGetPopulatingResponse:
     return soap_in_PointerTons1__luceneGetPopulatingResponse(
-        soap, NULL, NULL, "ns1:luceneGetPopulatingResponse");
+        soap, nullptr, nullptr, "ns1:luceneGetPopulatingResponse");
   case SOAP_TYPE_ICat4_PointerTons1__luceneGetPopulating:
-    return soap_in_PointerTons1__luceneGetPopulating(soap, NULL, NULL,
+    return soap_in_PointerTons1__luceneGetPopulating(soap, nullptr, nullptr,
                                                      "ns1:luceneGetPopulating");
   case SOAP_TYPE_ICat4_PointerTons1__luceneSearchResponse:
     return soap_in_PointerTons1__luceneSearchResponse(
-        soap, NULL, NULL, "ns1:luceneSearchResponse");
+        soap, nullptr, nullptr, "ns1:luceneSearchResponse");
   case SOAP_TYPE_ICat4_PointerTons1__luceneSearch:
-    return soap_in_PointerTons1__luceneSearch(soap, NULL, NULL,
+    return soap_in_PointerTons1__luceneSearch(soap, nullptr, nullptr,
                                               "ns1:luceneSearch");
   case SOAP_TYPE_ICat4_PointerTons1__luceneCommitResponse:
     return soap_in_PointerTons1__luceneCommitResponse(
-        soap, NULL, NULL, "ns1:luceneCommitResponse");
+        soap, nullptr, nullptr, "ns1:luceneCommitResponse");
   case SOAP_TYPE_ICat4_PointerTons1__luceneCommit:
-    return soap_in_PointerTons1__luceneCommit(soap, NULL, NULL,
+    return soap_in_PointerTons1__luceneCommit(soap, nullptr, nullptr,
                                               "ns1:luceneCommit");
   case SOAP_TYPE_ICat4_PointerTons1__luceneClearResponse:
-    return soap_in_PointerTons1__luceneClearResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__luceneClearResponse(soap, nullptr, nullptr,
                                                      "ns1:luceneClearResponse");
   case SOAP_TYPE_ICat4_PointerTons1__luceneClear:
-    return soap_in_PointerTons1__luceneClear(soap, NULL, NULL,
+    return soap_in_PointerTons1__luceneClear(soap, nullptr, nullptr,
                                              "ns1:luceneClear");
   case SOAP_TYPE_ICat4_PointerTons1__lucenePopulateResponse:
     return soap_in_PointerTons1__lucenePopulateResponse(
-        soap, NULL, NULL, "ns1:lucenePopulateResponse");
+        soap, nullptr, nullptr, "ns1:lucenePopulateResponse");
   case SOAP_TYPE_ICat4_PointerTons1__lucenePopulate:
-    return soap_in_PointerTons1__lucenePopulate(soap, NULL, NULL,
+    return soap_in_PointerTons1__lucenePopulate(soap, nullptr, nullptr,
                                                 "ns1:lucenePopulate");
   case SOAP_TYPE_ICat4_PointerTons1__isAccessAllowedResponse:
     return soap_in_PointerTons1__isAccessAllowedResponse(
-        soap, NULL, NULL, "ns1:isAccessAllowedResponse");
+        soap, nullptr, nullptr, "ns1:isAccessAllowedResponse");
   case SOAP_TYPE_ICat4_PointerTons1__isAccessAllowed:
-    return soap_in_PointerTons1__isAccessAllowed(soap, NULL, NULL,
+    return soap_in_PointerTons1__isAccessAllowed(soap, nullptr, nullptr,
                                                  "ns1:isAccessAllowed");
   case SOAP_TYPE_ICat4_PointerTons1__searchTextResponse:
-    return soap_in_PointerTons1__searchTextResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__searchTextResponse(soap, nullptr, nullptr,
                                                     "ns1:searchTextResponse");
   case SOAP_TYPE_ICat4_PointerTons1__searchText:
-    return soap_in_PointerTons1__searchText(soap, NULL, NULL, "ns1:searchText");
+    return soap_in_PointerTons1__searchText(soap, nullptr, nullptr,
+                                            "ns1:searchText");
   case SOAP_TYPE_ICat4_PointerTons1__getRemainingMinutesResponse:
     return soap_in_PointerTons1__getRemainingMinutesResponse(
-        soap, NULL, NULL, "ns1:getRemainingMinutesResponse");
+        soap, nullptr, nullptr, "ns1:getRemainingMinutesResponse");
   case SOAP_TYPE_ICat4_PointerTons1__getRemainingMinutes:
-    return soap_in_PointerTons1__getRemainingMinutes(soap, NULL, NULL,
+    return soap_in_PointerTons1__getRemainingMinutes(soap, nullptr, nullptr,
                                                      "ns1:getRemainingMinutes");
   case SOAP_TYPE_ICat4_PointerTons1__logoutResponse:
-    return soap_in_PointerTons1__logoutResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__logoutResponse(soap, nullptr, nullptr,
                                                 "ns1:logoutResponse");
   case SOAP_TYPE_ICat4_PointerTons1__logout:
-    return soap_in_PointerTons1__logout(soap, NULL, NULL, "ns1:logout");
+    return soap_in_PointerTons1__logout(soap, nullptr, nullptr, "ns1:logout");
   case SOAP_TYPE_ICat4_PointerTons1__dummyResponse:
-    return soap_in_PointerTons1__dummyResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__dummyResponse(soap, nullptr, nullptr,
                                                "ns1:dummyResponse");
   case SOAP_TYPE_ICat4_PointerTons1__dummy:
-    return soap_in_PointerTons1__dummy(soap, NULL, NULL, "ns1:dummy");
+    return soap_in_PointerTons1__dummy(soap, nullptr, nullptr, "ns1:dummy");
   case SOAP_TYPE_ICat4_PointerTons1__refreshResponse:
-    return soap_in_PointerTons1__refreshResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__refreshResponse(soap, nullptr, nullptr,
                                                  "ns1:refreshResponse");
   case SOAP_TYPE_ICat4_PointerTons1__refresh:
-    return soap_in_PointerTons1__refresh(soap, NULL, NULL, "ns1:refresh");
+    return soap_in_PointerTons1__refresh(soap, nullptr, nullptr, "ns1:refresh");
   case SOAP_TYPE_ICat4_PointerTons1__getEntityNamesResponse:
     return soap_in_PointerTons1__getEntityNamesResponse(
-        soap, NULL, NULL, "ns1:getEntityNamesResponse");
+        soap, nullptr, nullptr, "ns1:getEntityNamesResponse");
   case SOAP_TYPE_ICat4_PointerTons1__getEntityNames:
-    return soap_in_PointerTons1__getEntityNames(soap, NULL, NULL,
+    return soap_in_PointerTons1__getEntityNames(soap, nullptr, nullptr,
                                                 "ns1:getEntityNames");
   case SOAP_TYPE_ICat4_PointerTons1__getApiVersionResponse:
     return soap_in_PointerTons1__getApiVersionResponse(
-        soap, NULL, NULL, "ns1:getApiVersionResponse");
+        soap, nullptr, nullptr, "ns1:getApiVersionResponse");
   case SOAP_TYPE_ICat4_PointerTons1__getApiVersion:
-    return soap_in_PointerTons1__getApiVersion(soap, NULL, NULL,
+    return soap_in_PointerTons1__getApiVersion(soap, nullptr, nullptr,
                                                "ns1:getApiVersion");
   case SOAP_TYPE_ICat4_PointerTons1__updateResponse:
-    return soap_in_PointerTons1__updateResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__updateResponse(soap, nullptr, nullptr,
                                                 "ns1:updateResponse");
   case SOAP_TYPE_ICat4_PointerTons1__update:
-    return soap_in_PointerTons1__update(soap, NULL, NULL, "ns1:update");
+    return soap_in_PointerTons1__update(soap, nullptr, nullptr, "ns1:update");
   case SOAP_TYPE_ICat4_PointerTons1__createResponse:
-    return soap_in_PointerTons1__createResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__createResponse(soap, nullptr, nullptr,
                                                 "ns1:createResponse");
   case SOAP_TYPE_ICat4_PointerTons1__create:
-    return soap_in_PointerTons1__create(soap, NULL, NULL, "ns1:create");
+    return soap_in_PointerTons1__create(soap, nullptr, nullptr, "ns1:create");
   case SOAP_TYPE_ICat4_PointerTons1__searchResponse:
-    return soap_in_PointerTons1__searchResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__searchResponse(soap, nullptr, nullptr,
                                                 "ns1:searchResponse");
   case SOAP_TYPE_ICat4_PointerTons1__search:
-    return soap_in_PointerTons1__search(soap, NULL, NULL, "ns1:search");
+    return soap_in_PointerTons1__search(soap, nullptr, nullptr, "ns1:search");
   case SOAP_TYPE_ICat4_PointerTons1__deleteResponse:
-    return soap_in_PointerTons1__deleteResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__deleteResponse(soap, nullptr, nullptr,
                                                 "ns1:deleteResponse");
   case SOAP_TYPE_ICat4_PointerTons1__delete:
-    return soap_in_PointerTons1__delete(soap, NULL, NULL, "ns1:delete");
+    return soap_in_PointerTons1__delete(soap, nullptr, nullptr, "ns1:delete");
   case SOAP_TYPE_ICat4_PointerTons1__getPropertiesResponse:
     return soap_in_PointerTons1__getPropertiesResponse(
-        soap, NULL, NULL, "ns1:getPropertiesResponse");
+        soap, nullptr, nullptr, "ns1:getPropertiesResponse");
   case SOAP_TYPE_ICat4_PointerTons1__getProperties:
-    return soap_in_PointerTons1__getProperties(soap, NULL, NULL,
+    return soap_in_PointerTons1__getProperties(soap, nullptr, nullptr,
                                                "ns1:getProperties");
   case SOAP_TYPE_ICat4_PointerTons1__getResponse:
-    return soap_in_PointerTons1__getResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__getResponse(soap, nullptr, nullptr,
                                              "ns1:getResponse");
   case SOAP_TYPE_ICat4_PointerTons1__get:
-    return soap_in_PointerTons1__get(soap, NULL, NULL, "ns1:get");
+    return soap_in_PointerTons1__get(soap, nullptr, nullptr, "ns1:get");
   case SOAP_TYPE_ICat4_PointerTons1__getUserNameResponse:
-    return soap_in_PointerTons1__getUserNameResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__getUserNameResponse(soap, nullptr, nullptr,
                                                      "ns1:getUserNameResponse");
   case SOAP_TYPE_ICat4_PointerTons1__getUserName:
-    return soap_in_PointerTons1__getUserName(soap, NULL, NULL,
+    return soap_in_PointerTons1__getUserName(soap, nullptr, nullptr,
                                              "ns1:getUserName");
   case SOAP_TYPE_ICat4_PointerTons1__loginResponse:
-    return soap_in_PointerTons1__loginResponse(soap, NULL, NULL,
+    return soap_in_PointerTons1__loginResponse(soap, nullptr, nullptr,
                                                "ns1:loginResponse");
   case SOAP_TYPE_ICat4_PointerTons1__login:
-    return soap_in_PointerTons1__login(soap, NULL, NULL, "ns1:login");
+    return soap_in_PointerTons1__login(soap, nullptr, nullptr, "ns1:login");
   case SOAP_TYPE_ICat4_PointerTons1__IcatException:
-    return soap_in_PointerTons1__IcatException(soap, NULL, NULL,
+    return soap_in_PointerTons1__IcatException(soap, nullptr, nullptr,
                                                "ns1:IcatException");
   case SOAP_TYPE_ICat4_PointerTons1__parameterValueType:
-    return soap_in_PointerTons1__parameterValueType(soap, NULL, NULL,
+    return soap_in_PointerTons1__parameterValueType(soap, nullptr, nullptr,
                                                     "ns1:parameterValueType");
   case SOAP_TYPE_ICat4_PointerTons1__permissibleStringValue:
     return soap_in_PointerTons1__permissibleStringValue(
-        soap, NULL, NULL, "ns1:permissibleStringValue");
+        soap, nullptr, nullptr, "ns1:permissibleStringValue");
   case SOAP_TYPE_ICat4_PointerTodouble:
-    return soap_in_PointerTodouble(soap, NULL, NULL, "xsd:double");
+    return soap_in_PointerTodouble(soap, nullptr, nullptr, "xsd:double");
   case SOAP_TYPE_ICat4_PointerTons1__rule:
-    return soap_in_PointerTons1__rule(soap, NULL, NULL, "ns1:rule");
+    return soap_in_PointerTons1__rule(soap, nullptr, nullptr, "ns1:rule");
   case SOAP_TYPE_ICat4_PointerTons1__sampleType:
-    return soap_in_PointerTons1__sampleType(soap, NULL, NULL, "ns1:sampleType");
+    return soap_in_PointerTons1__sampleType(soap, nullptr, nullptr,
+                                            "ns1:sampleType");
   case SOAP_TYPE_ICat4_PointerTons1__investigationParameter:
     return soap_in_PointerTons1__investigationParameter(
-        soap, NULL, NULL, "ns1:investigationParameter");
+        soap, nullptr, nullptr, "ns1:investigationParameter");
   case SOAP_TYPE_ICat4_PointerTons1__investigationInstrument:
     return soap_in_PointerTons1__investigationInstrument(
-        soap, NULL, NULL, "ns1:investigationInstrument");
+        soap, nullptr, nullptr, "ns1:investigationInstrument");
   case SOAP_TYPE_ICat4_PointerTons1__accessType:
-    return soap_in_PointerTons1__accessType(soap, NULL, NULL, "ns1:accessType");
+    return soap_in_PointerTons1__accessType(soap, nullptr, nullptr,
+                                            "ns1:accessType");
   case SOAP_TYPE_ICat4_PointerToxsd__anyType:
-    return soap_in_PointerToxsd__anyType(soap, NULL, NULL, "xsd:anyType");
+    return soap_in_PointerToxsd__anyType(soap, nullptr, nullptr, "xsd:anyType");
   case SOAP_TYPE_ICat4_PointerToint:
-    return soap_in_PointerToint(soap, NULL, NULL, "xsd:int");
+    return soap_in_PointerToint(soap, nullptr, nullptr, "xsd:int");
   case SOAP_TYPE_ICat4_PointerTons1__relType:
-    return soap_in_PointerTons1__relType(soap, NULL, NULL, "ns1:relType");
+    return soap_in_PointerTons1__relType(soap, nullptr, nullptr, "ns1:relType");
   case SOAP_TYPE_ICat4_PointerTons1__entityField:
-    return soap_in_PointerTons1__entityField(soap, NULL, NULL,
+    return soap_in_PointerTons1__entityField(soap, nullptr, nullptr,
                                              "ns1:entityField");
   case SOAP_TYPE_ICat4_PointerTons1__constraint:
-    return soap_in_PointerTons1__constraint(soap, NULL, NULL, "ns1:constraint");
+    return soap_in_PointerTons1__constraint(soap, nullptr, nullptr,
+                                            "ns1:constraint");
   case SOAP_TYPE_ICat4_PointerTons1__entityInfo:
-    return soap_in_PointerTons1__entityInfo(soap, NULL, NULL, "ns1:entityInfo");
+    return soap_in_PointerTons1__entityInfo(soap, nullptr, nullptr,
+                                            "ns1:entityInfo");
   case SOAP_TYPE_ICat4_PointerTons1__publicStep:
-    return soap_in_PointerTons1__publicStep(soap, NULL, NULL, "ns1:publicStep");
+    return soap_in_PointerTons1__publicStep(soap, nullptr, nullptr,
+                                            "ns1:publicStep");
   case SOAP_TYPE_ICat4_PointerTons1__log:
-    return soap_in_PointerTons1__log(soap, NULL, NULL, "ns1:log");
+    return soap_in_PointerTons1__log(soap, nullptr, nullptr, "ns1:log");
   case SOAP_TYPE_ICat4_PointerTons1__userGroup:
-    return soap_in_PointerTons1__userGroup(soap, NULL, NULL, "ns1:userGroup");
+    return soap_in_PointerTons1__userGroup(soap, nullptr, nullptr,
+                                           "ns1:userGroup");
   case SOAP_TYPE_ICat4_PointerTons1__grouping:
-    return soap_in_PointerTons1__grouping(soap, NULL, NULL, "ns1:grouping");
+    return soap_in_PointerTons1__grouping(soap, nullptr, nullptr,
+                                          "ns1:grouping");
   case SOAP_TYPE_ICat4_PointerTons1__dataCollectionDatafile:
     return soap_in_PointerTons1__dataCollectionDatafile(
-        soap, NULL, NULL, "ns1:dataCollectionDatafile");
+        soap, nullptr, nullptr, "ns1:dataCollectionDatafile");
   case SOAP_TYPE_ICat4_PointerTons1__dataCollectionDataset:
     return soap_in_PointerTons1__dataCollectionDataset(
-        soap, NULL, NULL, "ns1:dataCollectionDataset");
+        soap, nullptr, nullptr, "ns1:dataCollectionDataset");
   case SOAP_TYPE_ICat4_PointerTons1__dataCollectionParameter:
     return soap_in_PointerTons1__dataCollectionParameter(
-        soap, NULL, NULL, "ns1:dataCollectionParameter");
+        soap, nullptr, nullptr, "ns1:dataCollectionParameter");
   case SOAP_TYPE_ICat4_PointerTons1__dataCollection:
-    return soap_in_PointerTons1__dataCollection(soap, NULL, NULL,
+    return soap_in_PointerTons1__dataCollection(soap, nullptr, nullptr,
                                                 "ns1:dataCollection");
   case SOAP_TYPE_ICat4_PointerTons1__job:
-    return soap_in_PointerTons1__job(soap, NULL, NULL, "ns1:job");
+    return soap_in_PointerTons1__job(soap, nullptr, nullptr, "ns1:job");
   case SOAP_TYPE_ICat4_PointerTons1__application:
-    return soap_in_PointerTons1__application(soap, NULL, NULL,
+    return soap_in_PointerTons1__application(soap, nullptr, nullptr,
                                              "ns1:application");
   case SOAP_TYPE_ICat4_PointerTons1__studyStatus:
-    return soap_in_PointerTons1__studyStatus(soap, NULL, NULL,
+    return soap_in_PointerTons1__studyStatus(soap, nullptr, nullptr,
                                              "ns1:studyStatus");
   case SOAP_TYPE_ICat4_PointerTons1__studyInvestigation:
-    return soap_in_PointerTons1__studyInvestigation(soap, NULL, NULL,
+    return soap_in_PointerTons1__studyInvestigation(soap, nullptr, nullptr,
                                                     "ns1:studyInvestigation");
   case SOAP_TYPE_ICat4_PointerTons1__study:
-    return soap_in_PointerTons1__study(soap, NULL, NULL, "ns1:study");
+    return soap_in_PointerTons1__study(soap, nullptr, nullptr, "ns1:study");
   case SOAP_TYPE_ICat4_PointerTons1__shift:
-    return soap_in_PointerTons1__shift(soap, NULL, NULL, "ns1:shift");
+    return soap_in_PointerTons1__shift(soap, nullptr, nullptr, "ns1:shift");
   case SOAP_TYPE_ICat4_PointerTons1__sampleParameter:
-    return soap_in_PointerTons1__sampleParameter(soap, NULL, NULL,
+    return soap_in_PointerTons1__sampleParameter(soap, nullptr, nullptr,
                                                  "ns1:sampleParameter");
   case SOAP_TYPE_ICat4_PointerTons1__sample:
-    return soap_in_PointerTons1__sample(soap, NULL, NULL, "ns1:sample");
+    return soap_in_PointerTons1__sample(soap, nullptr, nullptr, "ns1:sample");
   case SOAP_TYPE_ICat4_PointerTons1__relatedDatafile:
-    return soap_in_PointerTons1__relatedDatafile(soap, NULL, NULL,
+    return soap_in_PointerTons1__relatedDatafile(soap, nullptr, nullptr,
                                                  "ns1:relatedDatafile");
   case SOAP_TYPE_ICat4_PointerTons1__publication:
-    return soap_in_PointerTons1__publication(soap, NULL, NULL,
+    return soap_in_PointerTons1__publication(soap, nullptr, nullptr,
                                              "ns1:publication");
   case SOAP_TYPE_ICat4_PointerTons1__parameterType:
-    return soap_in_PointerTons1__parameterType(soap, NULL, NULL,
+    return soap_in_PointerTons1__parameterType(soap, nullptr, nullptr,
                                                "ns1:parameterType");
   case SOAP_TYPE_ICat4_PointerTons1__keyword:
-    return soap_in_PointerTons1__keyword(soap, NULL, NULL, "ns1:keyword");
+    return soap_in_PointerTons1__keyword(soap, nullptr, nullptr, "ns1:keyword");
   case SOAP_TYPE_ICat4_PointerTons1__investigationUser:
-    return soap_in_PointerTons1__investigationUser(soap, NULL, NULL,
+    return soap_in_PointerTons1__investigationUser(soap, nullptr, nullptr,
                                                    "ns1:investigationUser");
   case SOAP_TYPE_ICat4_PointerTons1__investigationType:
-    return soap_in_PointerTons1__investigationType(soap, NULL, NULL,
+    return soap_in_PointerTons1__investigationType(soap, nullptr, nullptr,
                                                    "ns1:investigationType");
   case SOAP_TYPE_ICat4_PointerTons1__investigation:
-    return soap_in_PointerTons1__investigation(soap, NULL, NULL,
+    return soap_in_PointerTons1__investigation(soap, nullptr, nullptr,
                                                "ns1:investigation");
   case SOAP_TYPE_ICat4_PointerTons1__instrument:
-    return soap_in_PointerTons1__instrument(soap, NULL, NULL, "ns1:instrument");
+    return soap_in_PointerTons1__instrument(soap, nullptr, nullptr,
+                                            "ns1:instrument");
   case SOAP_TYPE_ICat4_PointerTons1__user:
-    return soap_in_PointerTons1__user(soap, NULL, NULL, "ns1:user");
+    return soap_in_PointerTons1__user(soap, nullptr, nullptr, "ns1:user");
   case SOAP_TYPE_ICat4_PointerTons1__instrumentScientist:
-    return soap_in_PointerTons1__instrumentScientist(soap, NULL, NULL,
+    return soap_in_PointerTons1__instrumentScientist(soap, nullptr, nullptr,
                                                      "ns1:instrumentScientist");
   case SOAP_TYPE_ICat4_PointerTons1__facilityCycle:
-    return soap_in_PointerTons1__facilityCycle(soap, NULL, NULL,
+    return soap_in_PointerTons1__facilityCycle(soap, nullptr, nullptr,
                                                "ns1:facilityCycle");
   case SOAP_TYPE_ICat4_PointerTons1__facility:
-    return soap_in_PointerTons1__facility(soap, NULL, NULL, "ns1:facility");
+    return soap_in_PointerTons1__facility(soap, nullptr, nullptr,
+                                          "ns1:facility");
   case SOAP_TYPE_ICat4_PointerTons1__datasetType:
-    return soap_in_PointerTons1__datasetType(soap, NULL, NULL,
+    return soap_in_PointerTons1__datasetType(soap, nullptr, nullptr,
                                              "ns1:datasetType");
   case SOAP_TYPE_ICat4_PointerTons1__datasetParameter:
-    return soap_in_PointerTons1__datasetParameter(soap, NULL, NULL,
+    return soap_in_PointerTons1__datasetParameter(soap, nullptr, nullptr,
                                                   "ns1:datasetParameter");
   case SOAP_TYPE_ICat4_PointerTons1__dataset:
-    return soap_in_PointerTons1__dataset(soap, NULL, NULL, "ns1:dataset");
+    return soap_in_PointerTons1__dataset(soap, nullptr, nullptr, "ns1:dataset");
   case SOAP_TYPE_ICat4_PointerTons1__datafileParameter:
-    return soap_in_PointerTons1__datafileParameter(soap, NULL, NULL,
+    return soap_in_PointerTons1__datafileParameter(soap, nullptr, nullptr,
                                                    "ns1:datafileParameter");
   case SOAP_TYPE_ICat4_PointerTons1__datafileFormat:
-    return soap_in_PointerTons1__datafileFormat(soap, NULL, NULL,
+    return soap_in_PointerTons1__datafileFormat(soap, nullptr, nullptr,
                                                 "ns1:datafileFormat");
   case SOAP_TYPE_ICat4_PointerTons1__datafile:
-    return soap_in_PointerTons1__datafile(soap, NULL, NULL, "ns1:datafile");
+    return soap_in_PointerTons1__datafile(soap, nullptr, nullptr,
+                                          "ns1:datafile");
   case SOAP_TYPE_ICat4_PointerToLONG64:
-    return soap_in_PointerToLONG64(soap, NULL, NULL, "xsd:long");
+    return soap_in_PointerToLONG64(soap, nullptr, nullptr, "xsd:long");
   case SOAP_TYPE_ICat4_PointerTotime:
-    return soap_in_PointerTotime(soap, NULL, NULL, "xsd:dateTime");
+    return soap_in_PointerTotime(soap, nullptr, nullptr, "xsd:dateTime");
   case SOAP_TYPE_ICat4_PointerTons1__entityBaseBean:
-    return soap_in_PointerTons1__entityBaseBean(soap, NULL, NULL,
+    return soap_in_PointerTons1__entityBaseBean(soap, nullptr, nullptr,
                                                 "ns1:entityBaseBean");
   case SOAP_TYPE_ICat4_PointerTons1__icatExceptionType:
-    return soap_in_PointerTons1__icatExceptionType(soap, NULL, NULL,
+    return soap_in_PointerTons1__icatExceptionType(soap, nullptr, nullptr,
                                                    "ns1:icatExceptionType");
   case SOAP_TYPE_ICat4_PointerTostd__string:
-    return soap_in_PointerTostd__string(soap, NULL, NULL, "xsd:string");
+    return soap_in_PointerTostd__string(soap, nullptr, nullptr, "xsd:string");
   case SOAP_TYPE_ICat4__QName: {
     char **s;
-    s = soap_in__QName(soap, NULL, NULL, "xsd:QName");
-    return s ? *s : NULL;
+    s = soap_in__QName(soap, nullptr, nullptr, "xsd:QName");
+    return s ? *s : nullptr;
   }
   case SOAP_TYPE_ICat4_string: {
     char **s;
-    s = soap_in_string(soap, NULL, NULL, "xsd:string");
-    return s ? *s : NULL;
+    s = soap_in_string(soap, nullptr, nullptr, "xsd:string");
+    return s ? *s : nullptr;
   }
   default:
 #endif
@@ -732,495 +766,510 @@ SOAP_FMAC3 void *SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) {
       t = soap->tag;
     if (!soap_match_tag(soap, t, "ns1:accessType")) {
       *type = SOAP_TYPE_ICat4_ns1__accessType_;
-      return soap_in_ns1__accessType_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__accessType_(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:relType")) {
       *type = SOAP_TYPE_ICat4_ns1__relType_;
-      return soap_in_ns1__relType_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__relType_(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:parameterValueType")) {
       *type = SOAP_TYPE_ICat4_ns1__parameterValueType_;
-      return soap_in_ns1__parameterValueType_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__parameterValueType_(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:studyStatus")) {
       *type = SOAP_TYPE_ICat4_ns1__studyStatus_;
-      return soap_in_ns1__studyStatus_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__studyStatus_(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:icatExceptionType")) {
       *type = SOAP_TYPE_ICat4_ns1__icatExceptionType_;
-      return soap_in_ns1__icatExceptionType_(soap, NULL, NULL, NULL);
+      return soap_in_ns1__icatExceptionType_(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getRemainingMinutesResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__getRemainingMinutesResponse;
-      return soap_in_ns1__getRemainingMinutesResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getRemainingMinutesResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getRemainingMinutes")) {
       *type = SOAP_TYPE_ICat4_ns1__getRemainingMinutes;
-      return soap_in_ns1__getRemainingMinutes(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getRemainingMinutes(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:logoutResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__logoutResponse;
-      return soap_in_ns1__logoutResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__logoutResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:logout")) {
       *type = SOAP_TYPE_ICat4_ns1__logout;
-      return soap_in_ns1__logout(soap, NULL, NULL, NULL);
+      return soap_in_ns1__logout(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__searchResponse;
-      return soap_in_ns1__searchResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:search")) {
       *type = SOAP_TYPE_ICat4_ns1__search;
-      return soap_in_ns1__search(soap, NULL, NULL, NULL);
+      return soap_in_ns1__search(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:isAccessAllowedResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__isAccessAllowedResponse;
-      return soap_in_ns1__isAccessAllowedResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__isAccessAllowedResponse(soap, nullptr, nullptr,
+                                                  nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:isAccessAllowed")) {
       *type = SOAP_TYPE_ICat4_ns1__isAccessAllowed;
-      return soap_in_ns1__isAccessAllowed(soap, NULL, NULL, NULL);
+      return soap_in_ns1__isAccessAllowed(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__deleteResponse;
-      return soap_in_ns1__deleteResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:delete")) {
       *type = SOAP_TYPE_ICat4_ns1__delete;
-      return soap_in_ns1__delete(soap, NULL, NULL, NULL);
+      return soap_in_ns1__delete(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchTextResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__searchTextResponse;
-      return soap_in_ns1__searchTextResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchTextResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:searchText")) {
       *type = SOAP_TYPE_ICat4_ns1__searchText;
-      return soap_in_ns1__searchText(soap, NULL, NULL, NULL);
+      return soap_in_ns1__searchText(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:luceneCommitResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__luceneCommitResponse;
-      return soap_in_ns1__luceneCommitResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__luceneCommitResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:luceneCommit")) {
       *type = SOAP_TYPE_ICat4_ns1__luceneCommit;
-      return soap_in_ns1__luceneCommit(soap, NULL, NULL, NULL);
+      return soap_in_ns1__luceneCommit(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:entityField")) {
       *type = SOAP_TYPE_ICat4_ns1__entityField;
-      return soap_in_ns1__entityField(soap, NULL, NULL, NULL);
+      return soap_in_ns1__entityField(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:constraint")) {
       *type = SOAP_TYPE_ICat4_ns1__constraint;
-      return soap_in_ns1__constraint(soap, NULL, NULL, NULL);
+      return soap_in_ns1__constraint(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:entityInfo")) {
       *type = SOAP_TYPE_ICat4_ns1__entityInfo;
-      return soap_in_ns1__entityInfo(soap, NULL, NULL, NULL);
+      return soap_in_ns1__entityInfo(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getEntityInfoResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__getEntityInfoResponse;
-      return soap_in_ns1__getEntityInfoResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getEntityInfoResponse(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getEntityInfo")) {
       *type = SOAP_TYPE_ICat4_ns1__getEntityInfo;
-      return soap_in_ns1__getEntityInfo(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getEntityInfo(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:dummyResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__dummyResponse;
-      return soap_in_ns1__dummyResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__dummyResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:publicStep")) {
       *type = SOAP_TYPE_ICat4_ns1__publicStep;
-      return soap_in_ns1__publicStep(soap, NULL, NULL, NULL);
+      return soap_in_ns1__publicStep(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:log")) {
       *type = SOAP_TYPE_ICat4_ns1__log;
-      return soap_in_ns1__log(soap, NULL, NULL, NULL);
+      return soap_in_ns1__log(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:relatedDatafile")) {
       *type = SOAP_TYPE_ICat4_ns1__relatedDatafile;
-      return soap_in_ns1__relatedDatafile(soap, NULL, NULL, NULL);
+      return soap_in_ns1__relatedDatafile(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:shift")) {
       *type = SOAP_TYPE_ICat4_ns1__shift;
-      return soap_in_ns1__shift(soap, NULL, NULL, NULL);
+      return soap_in_ns1__shift(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:publication")) {
       *type = SOAP_TYPE_ICat4_ns1__publication;
-      return soap_in_ns1__publication(soap, NULL, NULL, NULL);
+      return soap_in_ns1__publication(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:keyword")) {
       *type = SOAP_TYPE_ICat4_ns1__keyword;
-      return soap_in_ns1__keyword(soap, NULL, NULL, NULL);
+      return soap_in_ns1__keyword(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:sampleType")) {
       *type = SOAP_TYPE_ICat4_ns1__sampleType;
-      return soap_in_ns1__sampleType(soap, NULL, NULL, NULL);
+      return soap_in_ns1__sampleType(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:sample")) {
       *type = SOAP_TYPE_ICat4_ns1__sample;
-      return soap_in_ns1__sample(soap, NULL, NULL, NULL);
+      return soap_in_ns1__sample(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:sampleParameter")) {
       *type = SOAP_TYPE_ICat4_ns1__sampleParameter;
-      return soap_in_ns1__sampleParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__sampleParameter(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:permissibleStringValue")) {
       *type = SOAP_TYPE_ICat4_ns1__permissibleStringValue;
-      return soap_in_ns1__permissibleStringValue(soap, NULL, NULL, NULL);
+      return soap_in_ns1__permissibleStringValue(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:investigationParameter")) {
       *type = SOAP_TYPE_ICat4_ns1__investigationParameter;
-      return soap_in_ns1__investigationParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__investigationParameter(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datasetParameter")) {
       *type = SOAP_TYPE_ICat4_ns1__datasetParameter;
-      return soap_in_ns1__datasetParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datasetParameter(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datafileParameter")) {
       *type = SOAP_TYPE_ICat4_ns1__datafileParameter;
-      return soap_in_ns1__datafileParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datafileParameter(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:parameter")) {
       *type = SOAP_TYPE_ICat4_ns1__parameter;
-      return soap_in_ns1__parameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__parameter(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:dataCollectionParameter")) {
       *type = SOAP_TYPE_ICat4_ns1__dataCollectionParameter;
-      return soap_in_ns1__dataCollectionParameter(soap, NULL, NULL, NULL);
+      return soap_in_ns1__dataCollectionParameter(soap, nullptr, nullptr,
+                                                  nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:parameterType")) {
       *type = SOAP_TYPE_ICat4_ns1__parameterType;
-      return soap_in_ns1__parameterType(soap, NULL, NULL, NULL);
+      return soap_in_ns1__parameterType(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:investigationType")) {
       *type = SOAP_TYPE_ICat4_ns1__investigationType;
-      return soap_in_ns1__investigationType(soap, NULL, NULL, NULL);
+      return soap_in_ns1__investigationType(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:investigationInstrument")) {
       *type = SOAP_TYPE_ICat4_ns1__investigationInstrument;
-      return soap_in_ns1__investigationInstrument(soap, NULL, NULL, NULL);
+      return soap_in_ns1__investigationInstrument(soap, nullptr, nullptr,
+                                                  nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:rule")) {
       *type = SOAP_TYPE_ICat4_ns1__rule;
-      return soap_in_ns1__rule(soap, NULL, NULL, NULL);
+      return soap_in_ns1__rule(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:grouping")) {
       *type = SOAP_TYPE_ICat4_ns1__grouping;
-      return soap_in_ns1__grouping(soap, NULL, NULL, NULL);
+      return soap_in_ns1__grouping(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:userGroup")) {
       *type = SOAP_TYPE_ICat4_ns1__userGroup;
-      return soap_in_ns1__userGroup(soap, NULL, NULL, NULL);
+      return soap_in_ns1__userGroup(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:studyInvestigation")) {
       *type = SOAP_TYPE_ICat4_ns1__studyInvestigation;
-      return soap_in_ns1__studyInvestigation(soap, NULL, NULL, NULL);
+      return soap_in_ns1__studyInvestigation(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:study")) {
       *type = SOAP_TYPE_ICat4_ns1__study;
-      return soap_in_ns1__study(soap, NULL, NULL, NULL);
+      return soap_in_ns1__study(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:investigationUser")) {
       *type = SOAP_TYPE_ICat4_ns1__investigationUser;
-      return soap_in_ns1__investigationUser(soap, NULL, NULL, NULL);
+      return soap_in_ns1__investigationUser(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:user")) {
       *type = SOAP_TYPE_ICat4_ns1__user;
-      return soap_in_ns1__user(soap, NULL, NULL, NULL);
+      return soap_in_ns1__user(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:instrumentScientist")) {
       *type = SOAP_TYPE_ICat4_ns1__instrumentScientist;
-      return soap_in_ns1__instrumentScientist(soap, NULL, NULL, NULL);
+      return soap_in_ns1__instrumentScientist(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:instrument")) {
       *type = SOAP_TYPE_ICat4_ns1__instrument;
-      return soap_in_ns1__instrument(soap, NULL, NULL, NULL);
+      return soap_in_ns1__instrument(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:facilityCycle")) {
       *type = SOAP_TYPE_ICat4_ns1__facilityCycle;
-      return soap_in_ns1__facilityCycle(soap, NULL, NULL, NULL);
+      return soap_in_ns1__facilityCycle(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datasetType")) {
       *type = SOAP_TYPE_ICat4_ns1__datasetType;
-      return soap_in_ns1__datasetType(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datasetType(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datafileFormat")) {
       *type = SOAP_TYPE_ICat4_ns1__datafileFormat;
-      return soap_in_ns1__datafileFormat(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datafileFormat(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:job")) {
       *type = SOAP_TYPE_ICat4_ns1__job;
-      return soap_in_ns1__job(soap, NULL, NULL, NULL);
+      return soap_in_ns1__job(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:application")) {
       *type = SOAP_TYPE_ICat4_ns1__application;
-      return soap_in_ns1__application(soap, NULL, NULL, NULL);
+      return soap_in_ns1__application(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:facility")) {
       *type = SOAP_TYPE_ICat4_ns1__facility;
-      return soap_in_ns1__facility(soap, NULL, NULL, NULL);
+      return soap_in_ns1__facility(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:investigation")) {
       *type = SOAP_TYPE_ICat4_ns1__investigation;
-      return soap_in_ns1__investigation(soap, NULL, NULL, NULL);
+      return soap_in_ns1__investigation(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:dataset")) {
       *type = SOAP_TYPE_ICat4_ns1__dataset;
-      return soap_in_ns1__dataset(soap, NULL, NULL, NULL);
+      return soap_in_ns1__dataset(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:dataCollectionDataset")) {
       *type = SOAP_TYPE_ICat4_ns1__dataCollectionDataset;
-      return soap_in_ns1__dataCollectionDataset(soap, NULL, NULL, NULL);
+      return soap_in_ns1__dataCollectionDataset(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:dataCollection")) {
       *type = SOAP_TYPE_ICat4_ns1__dataCollection;
-      return soap_in_ns1__dataCollection(soap, NULL, NULL, NULL);
+      return soap_in_ns1__dataCollection(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:dataCollectionDatafile")) {
       *type = SOAP_TYPE_ICat4_ns1__dataCollectionDatafile;
-      return soap_in_ns1__dataCollectionDatafile(soap, NULL, NULL, NULL);
+      return soap_in_ns1__dataCollectionDatafile(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:datafile")) {
       *type = SOAP_TYPE_ICat4_ns1__datafile;
-      return soap_in_ns1__datafile(soap, NULL, NULL, NULL);
+      return soap_in_ns1__datafile(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:dummy")) {
       *type = SOAP_TYPE_ICat4_ns1__dummy;
-      return soap_in_ns1__dummy(soap, NULL, NULL, NULL);
+      return soap_in_ns1__dummy(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:loginResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__loginResponse;
-      return soap_in_ns1__loginResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__loginResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:login")) {
       *type = SOAP_TYPE_ICat4_ns1__login;
-      return soap_in_ns1__login(soap, NULL, NULL, NULL);
+      return soap_in_ns1__login(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:refreshResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__refreshResponse;
-      return soap_in_ns1__refreshResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__refreshResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:refresh")) {
       *type = SOAP_TYPE_ICat4_ns1__refresh;
-      return soap_in_ns1__refresh(soap, NULL, NULL, NULL);
+      return soap_in_ns1__refresh(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getUserNameResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__getUserNameResponse;
-      return soap_in_ns1__getUserNameResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getUserNameResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getUserName")) {
       *type = SOAP_TYPE_ICat4_ns1__getUserName;
-      return soap_in_ns1__getUserName(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getUserName(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteManyResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__deleteManyResponse;
-      return soap_in_ns1__deleteManyResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteManyResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:deleteMany")) {
       *type = SOAP_TYPE_ICat4_ns1__deleteMany;
-      return soap_in_ns1__deleteMany(soap, NULL, NULL, NULL);
+      return soap_in_ns1__deleteMany(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:updateResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__updateResponse;
-      return soap_in_ns1__updateResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__updateResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:update")) {
       *type = SOAP_TYPE_ICat4_ns1__update;
-      return soap_in_ns1__update(soap, NULL, NULL, NULL);
+      return soap_in_ns1__update(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:luceneGetPopulatingResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__luceneGetPopulatingResponse;
-      return soap_in_ns1__luceneGetPopulatingResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__luceneGetPopulatingResponse(soap, nullptr, nullptr,
+                                                      nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:luceneGetPopulating")) {
       *type = SOAP_TYPE_ICat4_ns1__luceneGetPopulating;
-      return soap_in_ns1__luceneGetPopulating(soap, NULL, NULL, NULL);
+      return soap_in_ns1__luceneGetPopulating(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getApiVersionResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__getApiVersionResponse;
-      return soap_in_ns1__getApiVersionResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getApiVersionResponse(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getApiVersion")) {
       *type = SOAP_TYPE_ICat4_ns1__getApiVersion;
-      return soap_in_ns1__getApiVersion(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getApiVersion(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getEntityNamesResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__getEntityNamesResponse;
-      return soap_in_ns1__getEntityNamesResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getEntityNamesResponse(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getEntityNames")) {
       *type = SOAP_TYPE_ICat4_ns1__getEntityNames;
-      return soap_in_ns1__getEntityNames(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getEntityNames(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__getResponse;
-      return soap_in_ns1__getResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:get")) {
       *type = SOAP_TYPE_ICat4_ns1__get;
-      return soap_in_ns1__get(soap, NULL, NULL, NULL);
+      return soap_in_ns1__get(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:lucenePopulateResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__lucenePopulateResponse;
-      return soap_in_ns1__lucenePopulateResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__lucenePopulateResponse(soap, nullptr, nullptr,
+                                                 nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:lucenePopulate")) {
       *type = SOAP_TYPE_ICat4_ns1__lucenePopulate;
-      return soap_in_ns1__lucenePopulate(soap, NULL, NULL, NULL);
+      return soap_in_ns1__lucenePopulate(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:luceneSearchResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__luceneSearchResponse;
-      return soap_in_ns1__luceneSearchResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__luceneSearchResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:luceneSearch")) {
       *type = SOAP_TYPE_ICat4_ns1__luceneSearch;
-      return soap_in_ns1__luceneSearch(soap, NULL, NULL, NULL);
+      return soap_in_ns1__luceneSearch(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getPropertiesResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__getPropertiesResponse;
-      return soap_in_ns1__getPropertiesResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getPropertiesResponse(soap, nullptr, nullptr,
+                                                nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:getProperties")) {
       *type = SOAP_TYPE_ICat4_ns1__getProperties;
-      return soap_in_ns1__getProperties(soap, NULL, NULL, NULL);
+      return soap_in_ns1__getProperties(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:createResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__createResponse;
-      return soap_in_ns1__createResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__createResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:create")) {
       *type = SOAP_TYPE_ICat4_ns1__create;
-      return soap_in_ns1__create(soap, NULL, NULL, NULL);
+      return soap_in_ns1__create(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:createManyResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__createManyResponse;
-      return soap_in_ns1__createManyResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__createManyResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:entityBaseBean")) {
       *type = SOAP_TYPE_ICat4_ns1__entityBaseBean;
-      return soap_in_ns1__entityBaseBean(soap, NULL, NULL, NULL);
+      return soap_in_ns1__entityBaseBean(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:createMany")) {
       *type = SOAP_TYPE_ICat4_ns1__createMany;
-      return soap_in_ns1__createMany(soap, NULL, NULL, NULL);
+      return soap_in_ns1__createMany(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:IcatException")) {
       *type = SOAP_TYPE_ICat4_ns1__IcatException;
-      return soap_in_ns1__IcatException(soap, NULL, NULL, NULL);
+      return soap_in_ns1__IcatException(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:luceneClearResponse")) {
       *type = SOAP_TYPE_ICat4_ns1__luceneClearResponse;
-      return soap_in_ns1__luceneClearResponse(soap, NULL, NULL, NULL);
+      return soap_in_ns1__luceneClearResponse(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:luceneClear")) {
       *type = SOAP_TYPE_ICat4_ns1__luceneClear;
-      return soap_in_ns1__luceneClear(soap, NULL, NULL, NULL);
+      return soap_in_ns1__luceneClear(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:string")) {
       *type = SOAP_TYPE_ICat4_std__string;
-      return soap_in_std__string(soap, NULL, NULL, NULL);
+      return soap_in_std__string(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:string")) {
       *type = SOAP_TYPE_ICat4_xsd__string;
-      return soap_in_xsd__string(soap, NULL, NULL, NULL);
+      return soap_in_xsd__string(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:long")) {
       *type = SOAP_TYPE_ICat4_xsd__long;
-      return soap_in_xsd__long(soap, NULL, NULL, NULL);
+      return soap_in_xsd__long(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:int")) {
       *type = SOAP_TYPE_ICat4_xsd__int;
-      return soap_in_xsd__int(soap, NULL, NULL, NULL);
+      return soap_in_xsd__int(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:double")) {
       *type = SOAP_TYPE_ICat4_xsd__double;
-      return soap_in_xsd__double(soap, NULL, NULL, NULL);
+      return soap_in_xsd__double(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:dateTime")) {
       *type = SOAP_TYPE_ICat4_xsd__dateTime;
-      return soap_in_xsd__dateTime(soap, NULL, NULL, NULL);
+      return soap_in_xsd__dateTime(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:boolean")) {
       *type = SOAP_TYPE_ICat4_xsd__boolean;
-      return soap_in_xsd__boolean(soap, NULL, NULL, NULL);
+      return soap_in_xsd__boolean(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:anyType")) {
       *type = SOAP_TYPE_ICat4_xsd__anyType;
-      return soap_in_xsd__anyType(soap, NULL, NULL, NULL);
+      return soap_in_xsd__anyType(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:byte")) {
       *type = SOAP_TYPE_ICat4_byte;
-      return soap_in_byte(soap, NULL, NULL, NULL);
+      return soap_in_byte(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:int")) {
       *type = SOAP_TYPE_ICat4_int;
-      return soap_in_int(soap, NULL, NULL, NULL);
+      return soap_in_int(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:long")) {
       *type = SOAP_TYPE_ICat4_LONG64;
-      return soap_in_LONG64(soap, NULL, NULL, NULL);
+      return soap_in_LONG64(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:double")) {
       *type = SOAP_TYPE_ICat4_double;
-      return soap_in_double(soap, NULL, NULL, NULL);
+      return soap_in_double(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:dateTime")) {
       *type = SOAP_TYPE_ICat4_time;
-      return soap_in_time(soap, NULL, NULL, NULL);
+      return soap_in_time(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:accessType")) {
       *type = SOAP_TYPE_ICat4_ns1__accessType;
-      return soap_in_ns1__accessType(soap, NULL, NULL, NULL);
+      return soap_in_ns1__accessType(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:relType")) {
       *type = SOAP_TYPE_ICat4_ns1__relType;
-      return soap_in_ns1__relType(soap, NULL, NULL, NULL);
+      return soap_in_ns1__relType(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:parameterValueType")) {
       *type = SOAP_TYPE_ICat4_ns1__parameterValueType;
-      return soap_in_ns1__parameterValueType(soap, NULL, NULL, NULL);
+      return soap_in_ns1__parameterValueType(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:studyStatus")) {
       *type = SOAP_TYPE_ICat4_ns1__studyStatus;
-      return soap_in_ns1__studyStatus(soap, NULL, NULL, NULL);
+      return soap_in_ns1__studyStatus(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:icatExceptionType")) {
       *type = SOAP_TYPE_ICat4_ns1__icatExceptionType;
-      return soap_in_ns1__icatExceptionType(soap, NULL, NULL, NULL);
+      return soap_in_ns1__icatExceptionType(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:boolean")) {
       *type = SOAP_TYPE_ICat4_bool;
-      return soap_in_bool(soap, NULL, NULL, NULL);
+      return soap_in_bool(soap, nullptr, nullptr, nullptr);
     }
     if (!soap_match_tag(soap, t, "xsd:QName")) {
       char **s;
       *type = SOAP_TYPE_ICat4__QName;
-      s = soap_in__QName(soap, NULL, NULL, NULL);
-      return s ? *s : NULL;
+      s = soap_in__QName(soap, nullptr, nullptr, nullptr);
+      return s ? *s : nullptr;
     }
     if (!soap_match_tag(soap, t, "xsd:string")) {
       char **s;
       *type = SOAP_TYPE_ICat4_string;
-      s = soap_in_string(soap, NULL, NULL, NULL);
-      return s ? *s : NULL;
+      s = soap_in_string(soap, nullptr, nullptr, nullptr);
+      return s ? *s : nullptr;
     }
     t = soap->tag;
     if (!soap_match_tag(soap, t, "ns1:login-credentials-entry")) {
       *type = SOAP_TYPE_ICat4__ns1__login_credentials_entry;
-      return soap_in__ns1__login_credentials_entry(soap, NULL, NULL, NULL);
+      return soap_in__ns1__login_credentials_entry(soap, nullptr, nullptr,
+                                                   nullptr);
     }
     if (!soap_match_tag(soap, t, "ns1:login-credentials")) {
       *type = SOAP_TYPE_ICat4__ns1__login_credentials;
-      return soap_in__ns1__login_credentials(soap, NULL, NULL, NULL);
+      return soap_in__ns1__login_credentials(soap, nullptr, nullptr, nullptr);
     }
 #ifndef WITH_NOIDREF
   }
 #endif
   }
   soap->error = SOAP_TAG_MISMATCH;
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_ignore_element(struct soap *soap) {
@@ -1250,7 +1299,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_ignore_element(struct soap *soap) {
         while (!soap_ignore_element(soap))
           ;
         if (soap->error == SOAP_NO_TAG)
-          soap->error = soap_element_end_in(soap, NULL);
+          soap->error = soap_element_end_in(soap, nullptr);
       }
     }
   }
@@ -1306,10 +1355,10 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr,
     return soap_out_bool(soap, tag, id, (const bool *)ptr, "xsd:boolean");
   case SOAP_TYPE_ICat4__ns1__login_credentials_entry:
     return ((_ns1__login_credentials_entry *)ptr)
-        ->soap_out(soap, "ns1:login-credentials-entry", id, NULL);
+        ->soap_out(soap, "ns1:login-credentials-entry", id, nullptr);
   case SOAP_TYPE_ICat4__ns1__login_credentials:
     return ((_ns1__login_credentials *)ptr)
-        ->soap_out(soap, "ns1:login-credentials", id, NULL);
+        ->soap_out(soap, "ns1:login-credentials", id, nullptr);
   case SOAP_TYPE_ICat4_ns1__accessType_:
     return ((ns1__accessType_ *)ptr)->soap_out(soap, tag, id, "ns1:accessType");
   case SOAP_TYPE_ICat4_ns1__relType_:
@@ -3342,7 +3391,7 @@ ICat4_instantiate(struct soap *soap, int t, const char *type,
         soap_instantiate_std__vectorTemplateOfPointerTons1__entityBaseBean(
             soap, -1, type, arrayType, n);
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC3 int SOAP_FMAC4 ICat4_fdelete(struct soap_clist *p) {
@@ -4824,7 +4873,7 @@ soap_in_byte(struct soap *soap, const char *tag, char *a, const char *type) {
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_byte(struct soap *soap, const char *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat4_byte);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat4_byte);
   if (soap_out_byte(soap, tag ? tag : "byte", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -4834,7 +4883,7 @@ SOAP_FMAC3 char *SOAP_FMAC4
 soap_get_byte(struct soap *soap, char *p, const char *tag, const char *type) {
   if ((p = soap_in_byte(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -4865,7 +4914,7 @@ soap_in_int(struct soap *soap, const char *tag, int *a, const char *type) {
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_int(struct soap *soap, const int *a,
                                        const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat4_int);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat4_int);
   if (soap_out_int(soap, tag ? tag : "int", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -4875,7 +4924,7 @@ SOAP_FMAC3 int *SOAP_FMAC4
 soap_get_int(struct soap *soap, int *p, const char *tag, const char *type) {
   if ((p = soap_in_int(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -4907,7 +4956,7 @@ SOAP_FMAC3 LONG64 *SOAP_FMAC4 soap_in_LONG64(struct soap *soap, const char *tag,
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_LONG64(struct soap *soap, const LONG64 *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat4_LONG64);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat4_LONG64);
   if (soap_out_LONG64(soap, tag ? tag : "long", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -4918,7 +4967,7 @@ SOAP_FMAC3 LONG64 *SOAP_FMAC4 soap_get_LONG64(struct soap *soap, LONG64 *p,
                                               const char *type) {
   if ((p = soap_in_LONG64(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -4950,7 +4999,7 @@ SOAP_FMAC3 double *SOAP_FMAC4 soap_in_double(struct soap *soap, const char *tag,
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_double(struct soap *soap, const double *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat4_double);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat4_double);
   if (soap_out_double(soap, tag ? tag : "double", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -4961,7 +5010,7 @@ SOAP_FMAC3 double *SOAP_FMAC4 soap_get_double(struct soap *soap, double *p,
                                               const char *type) {
   if ((p = soap_in_double(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -4993,7 +5042,7 @@ soap_in_time(struct soap *soap, const char *tag, time_t *a, const char *type) {
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_time(struct soap *soap, const time_t *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat4_time);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat4_time);
   if (soap_out_time(soap, tag ? tag : "dateTime", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -5003,7 +5052,7 @@ SOAP_FMAC3 time_t *SOAP_FMAC4
 soap_get_time(struct soap *soap, time_t *p, const char *tag, const char *type) {
   if ((p = soap_in_time(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -5022,7 +5071,7 @@ static const struct soap_code_map soap_codes_ns1__accessType[] = {
     {(long)ns1__accessType__UPDATE, "UPDATE"},
     {(long)ns1__accessType__DELETE, "DELETE"},
     {(long)ns1__accessType__CREATE, "CREATE"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__accessType2s(struct soap *soap, enum ns1__accessType n) {
@@ -5067,22 +5116,22 @@ SOAP_FMAC3 enum ns1__accessType *SOAP_FMAC4
 soap_in_ns1__accessType(struct soap *soap, const char *tag,
                         enum ns1__accessType *a, const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__accessType *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__accessType,
-      sizeof(enum ns1__accessType), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__accessType), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__accessType(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__accessType *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__accessType, 0,
-        sizeof(enum ns1__accessType), 0, NULL);
+        sizeof(enum ns1__accessType), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -5090,7 +5139,7 @@ soap_in_ns1__accessType(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__accessType(struct soap *soap, const enum ns1__accessType *a,
                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__accessType);
   if (soap_out_ns1__accessType(soap, tag ? tag : "ns1:accessType", id, a, type))
     return soap->error;
@@ -5102,7 +5151,7 @@ soap_get_ns1__accessType(struct soap *soap, enum ns1__accessType *p,
                          const char *tag, const char *type) {
   if ((p = soap_in_ns1__accessType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -5120,7 +5169,7 @@ static const struct soap_code_map soap_codes_ns1__relType[] = {
     {(long)ns1__relType__ATTRIBUTE, "ATTRIBUTE"},
     {(long)ns1__relType__MANY, "MANY"},
     {(long)ns1__relType__ONE, "ONE"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__relType2s(struct soap *soap, enum ns1__relType n) {
@@ -5163,22 +5212,22 @@ SOAP_FMAC3 enum ns1__relType *SOAP_FMAC4
 soap_in_ns1__relType(struct soap *soap, const char *tag, enum ns1__relType *a,
                      const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__relType *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__relType,
-      sizeof(enum ns1__relType), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__relType), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__relType(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__relType *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__relType, 0,
-        sizeof(enum ns1__relType), 0, NULL);
+        sizeof(enum ns1__relType), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -5186,8 +5235,8 @@ soap_in_ns1__relType(struct soap *soap, const char *tag, enum ns1__relType *a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__relType(struct soap *soap, const enum ns1__relType *a,
                       const char *tag, const char *type) {
-  int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__relType);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_ns1__relType);
   if (soap_out_ns1__relType(soap, tag ? tag : "ns1:relType", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -5198,7 +5247,7 @@ soap_get_ns1__relType(struct soap *soap, enum ns1__relType *p, const char *tag,
                       const char *type) {
   if ((p = soap_in_ns1__relType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -5217,7 +5266,7 @@ static const struct soap_code_map soap_codes_ns1__parameterValueType[] = {
     {(long)ns1__parameterValueType__DATE_USCOREAND_USCORETIME, "DATE_AND_TIME"},
     {(long)ns1__parameterValueType__NUMERIC, "NUMERIC"},
     {(long)ns1__parameterValueType__STRING, "STRING"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__parameterValueType2s(struct soap *soap,
@@ -5265,22 +5314,22 @@ soap_in_ns1__parameterValueType(struct soap *soap, const char *tag,
                                 enum ns1__parameterValueType *a,
                                 const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__parameterValueType *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__parameterValueType,
-      sizeof(enum ns1__parameterValueType), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__parameterValueType), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__parameterValueType(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__parameterValueType *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__parameterValueType,
-        0, sizeof(enum ns1__parameterValueType), 0, NULL);
+        0, sizeof(enum ns1__parameterValueType), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -5289,7 +5338,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__parameterValueType(struct soap *soap,
                                  const enum ns1__parameterValueType *a,
                                  const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__parameterValueType);
   if (soap_out_ns1__parameterValueType(
           soap, tag ? tag : "ns1:parameterValueType", id, a, type))
@@ -5303,7 +5352,7 @@ soap_get_ns1__parameterValueType(struct soap *soap,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__parameterValueType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -5322,7 +5371,7 @@ static const struct soap_code_map soap_codes_ns1__studyStatus[] = {
     {(long)ns1__studyStatus__IN_USCOREPROGRESS, "IN_PROGRESS"},
     {(long)ns1__studyStatus__COMPLETE, "COMPLETE"},
     {(long)ns1__studyStatus__CANCELLED, "CANCELLED"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__studyStatus2s(struct soap *soap, enum ns1__studyStatus n) {
@@ -5367,22 +5416,22 @@ SOAP_FMAC3 enum ns1__studyStatus *SOAP_FMAC4
 soap_in_ns1__studyStatus(struct soap *soap, const char *tag,
                          enum ns1__studyStatus *a, const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__studyStatus *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__studyStatus,
-      sizeof(enum ns1__studyStatus), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__studyStatus), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__studyStatus(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__studyStatus *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__studyStatus, 0,
-        sizeof(enum ns1__studyStatus), 0, NULL);
+        sizeof(enum ns1__studyStatus), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -5390,7 +5439,7 @@ soap_in_ns1__studyStatus(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__studyStatus(struct soap *soap, const enum ns1__studyStatus *a,
                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__studyStatus);
   if (soap_out_ns1__studyStatus(soap, tag ? tag : "ns1:studyStatus", id, a,
                                 type))
@@ -5403,7 +5452,7 @@ soap_get_ns1__studyStatus(struct soap *soap, enum ns1__studyStatus *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__studyStatus(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -5429,7 +5478,7 @@ static const struct soap_code_map soap_codes_ns1__icatExceptionType[] = {
      "OBJECT_ALREADY_EXISTS"},
     {(long)ns1__icatExceptionType__SESSION, "SESSION"},
     {(long)ns1__icatExceptionType__VALIDATION, "VALIDATION"},
-    {0, NULL}};
+    {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S
 soap_ns1__icatExceptionType2s(struct soap *soap,
@@ -5477,22 +5526,22 @@ soap_in_ns1__icatExceptionType(struct soap *soap, const char *tag,
                                enum ns1__icatExceptionType *a,
                                const char *type) {
   if (soap_element_begin_in(soap, tag, 0, type))
-    return NULL;
+    return nullptr;
   a = (enum ns1__icatExceptionType *)soap_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__icatExceptionType,
-      sizeof(enum ns1__icatExceptionType), 0, NULL, NULL, NULL);
+      sizeof(enum ns1__icatExceptionType), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2ns1__icatExceptionType(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__icatExceptionType *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__icatExceptionType,
-        0, sizeof(enum ns1__icatExceptionType), 0, NULL);
+        0, sizeof(enum ns1__icatExceptionType), 0, nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -5501,7 +5550,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_ns1__icatExceptionType(struct soap *soap,
                                 const enum ns1__icatExceptionType *a,
                                 const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__icatExceptionType);
   if (soap_out_ns1__icatExceptionType(soap, tag ? tag : "ns1:icatExceptionType",
                                       id, a, type))
@@ -5515,7 +5564,7 @@ soap_get_ns1__icatExceptionType(struct soap *soap,
                                 const char *type) {
   if ((p = soap_in_ns1__icatExceptionType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -5529,7 +5578,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_bool(struct soap *soap, bool *a) {
 }
 
 static const struct soap_code_map soap_codes_bool[] = {
-    {(long)false, "false"}, {(long)true, "true"}, {0, NULL}};
+    {(long)false, "false"}, {(long)true, "true"}, {0, nullptr}};
 
 SOAP_FMAC3S const char *SOAP_FMAC4S soap_bool2s(struct soap *soap, bool n) {
   (void)soap; /* appease -Wall -Werror */
@@ -5566,33 +5615,34 @@ soap_s2bool(struct soap *soap, const char *s, bool *a) {
 
 SOAP_FMAC3 bool *SOAP_FMAC4
 soap_in_bool(struct soap *soap, const char *tag, bool *a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   if (*soap->type && soap_match_tag(soap, soap->type, type) &&
       soap_match_tag(soap, soap->type, ":boolean")) {
     soap->error = SOAP_TYPE;
-    return NULL;
+    return nullptr;
   }
   a = (bool *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ICat4_bool,
-                            sizeof(bool), 0, NULL, NULL, NULL);
+                            sizeof(bool), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->body && !*soap->href) {
     if (!a || soap_s2bool(soap, soap_value(soap), a) ||
         soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (bool *)soap_id_forward(soap, soap->href, (void *)a, 0,
-                                SOAP_TYPE_ICat4_bool, 0, sizeof(bool), 0, NULL);
+                                SOAP_TYPE_ICat4_bool, 0, sizeof(bool), 0,
+                                nullptr);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_bool(struct soap *soap, const bool *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat4_bool);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat4_bool);
   if (soap_out_bool(soap, tag ? tag : "boolean", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -5602,14 +5652,14 @@ SOAP_FMAC3 bool *SOAP_FMAC4
 soap_get_bool(struct soap *soap, bool *p, const char *tag, const char *type) {
   if ((p = soap_in_bool(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
 void _ns1__login_credentials_entry::soap_default(struct soap *soap) {
   (void)soap; /* appease -Wall -Werror */
-  this->_ns1__login_credentials_entry::key = NULL;
-  this->_ns1__login_credentials_entry::value = NULL;
+  this->_ns1__login_credentials_entry::key = nullptr;
+  this->_ns1__login_credentials_entry::value = nullptr;
 }
 
 void _ns1__login_credentials_entry::soap_serialize(struct soap *soap) const {
@@ -5657,13 +5707,13 @@ soap_in__ns1__login_credentials_entry(struct soap *soap, const char *tag,
                                       _ns1__login_credentials_entry *a,
                                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (_ns1__login_credentials_entry *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4__ns1__login_credentials_entry,
       sizeof(_ns1__login_credentials_entry), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4__ns1__login_credentials_entry) {
@@ -5698,10 +5748,10 @@ soap_in__ns1__login_credentials_entry(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (_ns1__login_credentials_entry *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -5709,14 +5759,14 @@ soap_in__ns1__login_credentials_entry(struct soap *soap, const char *tag,
         sizeof(_ns1__login_credentials_entry), 0,
         soap_copy__ns1__login_credentials_entry);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int _ns1__login_credentials_entry::soap_put(struct soap *soap, const char *tag,
                                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4__ns1__login_credentials_entry);
   if (this->soap_out(soap, tag ? tag : "ns1:login-credentials-entry", id, type))
     return soap->error;
@@ -5735,7 +5785,7 @@ soap_get__ns1__login_credentials_entry(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in__ns1__login_credentials_entry(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -5752,10 +5802,10 @@ soap_instantiate__ns1__login_credentials_entry(struct soap *soap, int n,
              "soap_instantiate__ns1__login_credentials_entry(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4__ns1__login_credentials_entry, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4__ns1__login_credentials_entry, n,
                 ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(_ns1__login_credentials_entry);
     if (size)
@@ -5788,7 +5838,7 @@ soap_copy__ns1__login_credentials_entry(struct soap *soap, int st, int tt,
 
 void _ns1__login_credentials::soap_default(struct soap *soap) {
   (void)soap; /* appease -Wall -Werror */
-  this->_ns1__login_credentials::entry = NULL;
+  this->_ns1__login_credentials::entry = nullptr;
 }
 
 void _ns1__login_credentials::soap_serialize(struct soap *soap) const {
@@ -5828,13 +5878,13 @@ SOAP_FMAC3 _ns1__login_credentials *SOAP_FMAC4
 soap_in__ns1__login_credentials(struct soap *soap, const char *tag,
                                 _ns1__login_credentials *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (_ns1__login_credentials *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4__ns1__login_credentials,
       sizeof(_ns1__login_credentials), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4__ns1__login_credentials) {
@@ -5855,24 +5905,24 @@ soap_in__ns1__login_credentials(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (_ns1__login_credentials *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4__ns1__login_credentials,
         0, sizeof(_ns1__login_credentials), 0,
         soap_copy__ns1__login_credentials);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int _ns1__login_credentials::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4__ns1__login_credentials);
   if (this->soap_out(soap, tag ? tag : "ns1:login-credentials", id, type))
     return soap->error;
@@ -5889,7 +5939,7 @@ soap_get__ns1__login_credentials(struct soap *soap, _ns1__login_credentials *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in__ns1__login_credentials(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -5904,9 +5954,9 @@ soap_instantiate__ns1__login_credentials(struct soap *soap, int n,
                       "soap_instantiate__ns1__login_credentials(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4__ns1__login_credentials, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4__ns1__login_credentials, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(_ns1__login_credentials);
     if (size)
@@ -5971,13 +6021,13 @@ SOAP_FMAC3 ns1__accessType_ *SOAP_FMAC4
 soap_in_ns1__accessType_(struct soap *soap, const char *tag,
                          ns1__accessType_ *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__accessType_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__accessType_,
             sizeof(ns1__accessType_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -5988,13 +6038,13 @@ soap_in_ns1__accessType_(struct soap *soap, const char *tag,
   }
   if (!soap_in_ns1__accessType(soap, tag, &(a->ns1__accessType_::__item),
                                "ns1:accessType"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__accessType_::soap_put(struct soap *soap, const char *tag,
                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__accessType_);
   if (this->soap_out(soap, tag ? tag : "ns1:accessType", id, type))
     return soap->error;
@@ -6011,7 +6061,7 @@ soap_get_ns1__accessType_(struct soap *soap, ns1__accessType_ *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__accessType_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -6023,10 +6073,10 @@ soap_instantiate_ns1__accessType_(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__accessType_(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__accessType_, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__accessType_, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__accessType_);
     if (size)
@@ -6095,13 +6145,13 @@ SOAP_FMAC3 ns1__relType_ *SOAP_FMAC4
 soap_in_ns1__relType_(struct soap *soap, const char *tag, ns1__relType_ *a,
                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__relType_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__relType_,
             sizeof(ns1__relType_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -6112,13 +6162,13 @@ soap_in_ns1__relType_(struct soap *soap, const char *tag, ns1__relType_ *a,
   }
   if (!soap_in_ns1__relType(soap, tag, &(a->ns1__relType_::__item),
                             "ns1:relType"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__relType_::soap_put(struct soap *soap, const char *tag,
                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__relType_);
   if (this->soap_out(soap, tag ? tag : "ns1:relType", id, type))
     return soap->error;
@@ -6135,7 +6185,7 @@ soap_get_ns1__relType_(struct soap *soap, ns1__relType_ *p, const char *tag,
                        const char *type) {
   if ((p = soap_in_ns1__relType_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -6148,9 +6198,9 @@ soap_instantiate_ns1__relType_(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__relType_(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__relType_, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__relType_, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__relType_);
     if (size)
@@ -6222,13 +6272,13 @@ soap_in_ns1__parameterValueType_(struct soap *soap, const char *tag,
                                  ns1__parameterValueType_ *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__parameterValueType_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__parameterValueType_,
             sizeof(ns1__parameterValueType_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -6240,13 +6290,13 @@ soap_in_ns1__parameterValueType_(struct soap *soap, const char *tag,
   if (!soap_in_ns1__parameterValueType(soap, tag,
                                        &(a->ns1__parameterValueType_::__item),
                                        "ns1:parameterValueType"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__parameterValueType_::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__parameterValueType_);
   if (this->soap_out(soap, tag ? tag : "ns1:parameterValueType", id, type))
     return soap->error;
@@ -6264,7 +6314,7 @@ soap_get_ns1__parameterValueType_(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__parameterValueType_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -6278,10 +6328,11 @@ soap_instantiate_ns1__parameterValueType_(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__parameterValueType_(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__parameterValueType_, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__parameterValueType_, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__parameterValueType_);
     if (size)
@@ -6351,13 +6402,13 @@ SOAP_FMAC3 ns1__studyStatus_ *SOAP_FMAC4
 soap_in_ns1__studyStatus_(struct soap *soap, const char *tag,
                           ns1__studyStatus_ *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__studyStatus_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__studyStatus_,
             sizeof(ns1__studyStatus_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -6368,13 +6419,13 @@ soap_in_ns1__studyStatus_(struct soap *soap, const char *tag,
   }
   if (!soap_in_ns1__studyStatus(soap, tag, &(a->ns1__studyStatus_::__item),
                                 "ns1:studyStatus"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__studyStatus_::soap_put(struct soap *soap, const char *tag,
                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__studyStatus_);
   if (this->soap_out(soap, tag ? tag : "ns1:studyStatus", id, type))
     return soap->error;
@@ -6391,7 +6442,7 @@ soap_get_ns1__studyStatus_(struct soap *soap, ns1__studyStatus_ *p,
                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__studyStatus_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -6404,9 +6455,9 @@ soap_instantiate_ns1__studyStatus_(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__studyStatus_(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__studyStatus_, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__studyStatus_, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__studyStatus_);
     if (size)
@@ -6478,13 +6529,13 @@ SOAP_FMAC3 ns1__icatExceptionType_ *SOAP_FMAC4
 soap_in_ns1__icatExceptionType_(struct soap *soap, const char *tag,
                                 ns1__icatExceptionType_ *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__icatExceptionType_ *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__icatExceptionType_,
             sizeof(ns1__icatExceptionType_), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -6496,13 +6547,13 @@ soap_in_ns1__icatExceptionType_(struct soap *soap, const char *tag,
   if (!soap_in_ns1__icatExceptionType(soap, tag,
                                       &(a->ns1__icatExceptionType_::__item),
                                       "ns1:icatExceptionType"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__icatExceptionType_::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__icatExceptionType_);
   if (this->soap_out(soap, tag ? tag : "ns1:icatExceptionType", id, type))
     return soap->error;
@@ -6519,7 +6570,7 @@ soap_get_ns1__icatExceptionType_(struct soap *soap, ns1__icatExceptionType_ *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__icatExceptionType_(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -6534,9 +6585,9 @@ soap_instantiate_ns1__icatExceptionType_(struct soap *soap, int n,
                       "soap_instantiate_ns1__icatExceptionType_(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__icatExceptionType_, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__icatExceptionType_, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__icatExceptionType_);
     if (size)
@@ -6617,13 +6668,13 @@ soap_in_ns1__getRemainingMinutesResponse(struct soap *soap, const char *tag,
                                          ns1__getRemainingMinutesResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getRemainingMinutesResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__getRemainingMinutesResponse,
       sizeof(ns1__getRemainingMinutesResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__getRemainingMinutesResponse) {
@@ -6656,10 +6707,10 @@ soap_in_ns1__getRemainingMinutesResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getRemainingMinutesResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -6667,11 +6718,11 @@ soap_in_ns1__getRemainingMinutesResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getRemainingMinutesResponse), 0,
         soap_copy_ns1__getRemainingMinutesResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_return_1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
@@ -6679,7 +6730,7 @@ soap_in_ns1__getRemainingMinutesResponse(struct soap *soap, const char *tag,
 int ns1__getRemainingMinutesResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__getRemainingMinutesResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getRemainingMinutesResponse", id,
                      type))
@@ -6699,7 +6750,7 @@ soap_get_ns1__getRemainingMinutesResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__getRemainingMinutesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -6716,10 +6767,10 @@ soap_instantiate_ns1__getRemainingMinutesResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__getRemainingMinutesResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__getRemainingMinutesResponse, n,
-                ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__getRemainingMinutesResponse,
+                n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getRemainingMinutesResponse);
     if (size)
@@ -6759,7 +6810,7 @@ soap_copy_ns1__getRemainingMinutesResponse(struct soap *soap, int st, int tt,
 void ns1__getRemainingMinutes::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getRemainingMinutes::sessionId = NULL;
+  this->ns1__getRemainingMinutes::sessionId = nullptr;
 }
 
 void ns1__getRemainingMinutes::soap_serialize(struct soap *soap) const {
@@ -6802,13 +6853,13 @@ soap_in_ns1__getRemainingMinutes(struct soap *soap, const char *tag,
                                  ns1__getRemainingMinutes *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getRemainingMinutes *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__getRemainingMinutes,
       sizeof(ns1__getRemainingMinutes), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__getRemainingMinutes) {
@@ -6842,10 +6893,10 @@ soap_in_ns1__getRemainingMinutes(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getRemainingMinutes *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -6853,14 +6904,14 @@ soap_in_ns1__getRemainingMinutes(struct soap *soap, const char *tag,
         sizeof(ns1__getRemainingMinutes), 0,
         soap_copy_ns1__getRemainingMinutes);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getRemainingMinutes::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__getRemainingMinutes);
   if (this->soap_out(soap, tag ? tag : "ns1:getRemainingMinutes", id, type))
     return soap->error;
@@ -6878,7 +6929,7 @@ soap_get_ns1__getRemainingMinutes(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__getRemainingMinutes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -6892,10 +6943,11 @@ soap_instantiate_ns1__getRemainingMinutes(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__getRemainingMinutes(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__getRemainingMinutes, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__getRemainingMinutes, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getRemainingMinutes);
     if (size)
@@ -6962,13 +7014,13 @@ SOAP_FMAC3 ns1__logoutResponse *SOAP_FMAC4
 soap_in_ns1__logoutResponse(struct soap *soap, const char *tag,
                             ns1__logoutResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__logoutResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__logoutResponse,
             sizeof(ns1__logoutResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -6978,13 +7030,13 @@ soap_in_ns1__logoutResponse(struct soap *soap, const char *tag,
       return (ns1__logoutResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__logoutResponse::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__logoutResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:logoutResponse", id, type))
     return soap->error;
@@ -7001,7 +7053,7 @@ soap_get_ns1__logoutResponse(struct soap *soap, ns1__logoutResponse *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__logoutResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -7014,9 +7066,9 @@ soap_instantiate_ns1__logoutResponse(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__logoutResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__logoutResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__logoutResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__logoutResponse);
     if (size)
@@ -7052,7 +7104,7 @@ soap_copy_ns1__logoutResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__logout::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__logout::sessionId = NULL;
+  this->ns1__logout::sessionId = nullptr;
 }
 
 void ns1__logout::soap_serialize(struct soap *soap) const {
@@ -7091,13 +7143,13 @@ SOAP_FMAC3 ns1__logout *SOAP_FMAC4
 soap_in_ns1__logout(struct soap *soap, const char *tag, ns1__logout *a,
                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__logout *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__logout, sizeof(ns1__logout),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__logout) {
@@ -7131,24 +7183,24 @@ soap_in_ns1__logout(struct soap *soap, const char *tag, ns1__logout *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__logout *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__logout, 0,
         sizeof(ns1__logout), 0, soap_copy_ns1__logout);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__logout::soap_put(struct soap *soap, const char *tag,
                           const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__logout);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_ns1__logout);
   if (this->soap_out(soap, tag ? tag : "ns1:logout", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -7164,7 +7216,7 @@ soap_get_ns1__logout(struct soap *soap, ns1__logout *p, const char *tag,
                      const char *type) {
   if ((p = soap_in_ns1__logout(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -7177,9 +7229,9 @@ soap_instantiate_ns1__logout(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__logout(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__logout, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__logout, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__logout);
     if (size)
@@ -7256,13 +7308,13 @@ SOAP_FMAC3 ns1__searchResponse *SOAP_FMAC4
 soap_in_ns1__searchResponse(struct soap *soap, const char *tag,
                             ns1__searchResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__searchResponse,
       sizeof(ns1__searchResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__searchResponse) {
@@ -7292,23 +7344,23 @@ soap_in_ns1__searchResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__searchResponse, 0,
         sizeof(ns1__searchResponse), 0, soap_copy_ns1__searchResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchResponse::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__searchResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchResponse", id, type))
     return soap->error;
@@ -7325,7 +7377,7 @@ soap_get_ns1__searchResponse(struct soap *soap, ns1__searchResponse *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -7338,9 +7390,9 @@ soap_instantiate_ns1__searchResponse(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__searchResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__searchResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__searchResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchResponse);
     if (size)
@@ -7376,8 +7428,8 @@ soap_copy_ns1__searchResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__search::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__search::sessionId = NULL;
-  this->ns1__search::query = NULL;
+  this->ns1__search::sessionId = nullptr;
+  this->ns1__search::query = nullptr;
 }
 
 void ns1__search::soap_serialize(struct soap *soap) const {
@@ -7420,13 +7472,13 @@ SOAP_FMAC3 ns1__search *SOAP_FMAC4
 soap_in_ns1__search(struct soap *soap, const char *tag, ns1__search *a,
                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__search *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__search, sizeof(ns1__search),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__search) {
@@ -7468,24 +7520,24 @@ soap_in_ns1__search(struct soap *soap, const char *tag, ns1__search *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__search *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__search, 0,
         sizeof(ns1__search), 0, soap_copy_ns1__search);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__search::soap_put(struct soap *soap, const char *tag,
                           const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__search);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_ns1__search);
   if (this->soap_out(soap, tag ? tag : "ns1:search", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -7501,7 +7553,7 @@ soap_get_ns1__search(struct soap *soap, ns1__search *p, const char *tag,
                      const char *type) {
   if ((p = soap_in_ns1__search(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -7514,9 +7566,9 @@ soap_instantiate_ns1__search(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__search(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__search, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__search, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__search);
     if (size)
@@ -7594,13 +7646,13 @@ soap_in_ns1__isAccessAllowedResponse(struct soap *soap, const char *tag,
                                      ns1__isAccessAllowedResponse *a,
                                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__isAccessAllowedResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__isAccessAllowedResponse,
       sizeof(ns1__isAccessAllowedResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__isAccessAllowedResponse) {
@@ -7633,10 +7685,10 @@ soap_in_ns1__isAccessAllowedResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__isAccessAllowedResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -7644,18 +7696,18 @@ soap_in_ns1__isAccessAllowedResponse(struct soap *soap, const char *tag,
         sizeof(ns1__isAccessAllowedResponse), 0,
         soap_copy_ns1__isAccessAllowedResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_return_1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__isAccessAllowedResponse::soap_put(struct soap *soap, const char *tag,
                                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__isAccessAllowedResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:isAccessAllowedResponse", id, type))
     return soap->error;
@@ -7673,7 +7725,7 @@ soap_get_ns1__isAccessAllowedResponse(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in_ns1__isAccessAllowedResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -7690,10 +7742,10 @@ soap_instantiate_ns1__isAccessAllowedResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__isAccessAllowedResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__isAccessAllowedResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__isAccessAllowedResponse, n,
                 ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__isAccessAllowedResponse);
     if (size)
@@ -7731,9 +7783,9 @@ soap_copy_ns1__isAccessAllowedResponse(struct soap *soap, int st, int tt,
 void ns1__isAccessAllowed::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__isAccessAllowed::sessionId = NULL;
-  this->ns1__isAccessAllowed::bean = NULL;
-  this->ns1__isAccessAllowed::accessType = NULL;
+  this->ns1__isAccessAllowed::sessionId = nullptr;
+  this->ns1__isAccessAllowed::bean = nullptr;
+  this->ns1__isAccessAllowed::accessType = nullptr;
 }
 
 void ns1__isAccessAllowed::soap_serialize(struct soap *soap) const {
@@ -7784,13 +7836,13 @@ SOAP_FMAC3 ns1__isAccessAllowed *SOAP_FMAC4
 soap_in_ns1__isAccessAllowed(struct soap *soap, const char *tag,
                              ns1__isAccessAllowed *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__isAccessAllowed *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__isAccessAllowed,
       sizeof(ns1__isAccessAllowed), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__isAccessAllowed) {
@@ -7840,23 +7892,23 @@ soap_in_ns1__isAccessAllowed(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__isAccessAllowed *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__isAccessAllowed, 0,
         sizeof(ns1__isAccessAllowed), 0, soap_copy_ns1__isAccessAllowed);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__isAccessAllowed::soap_put(struct soap *soap, const char *tag,
                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__isAccessAllowed);
   if (this->soap_out(soap, tag ? tag : "ns1:isAccessAllowed", id, type))
     return soap->error;
@@ -7873,7 +7925,7 @@ soap_get_ns1__isAccessAllowed(struct soap *soap, ns1__isAccessAllowed *p,
                               const char *tag, const char *type) {
   if ((p = soap_in_ns1__isAccessAllowed(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -7888,9 +7940,9 @@ soap_instantiate_ns1__isAccessAllowed(struct soap *soap, int n,
                       "soap_instantiate_ns1__isAccessAllowed(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__isAccessAllowed, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__isAccessAllowed, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__isAccessAllowed);
     if (size)
@@ -7956,13 +8008,13 @@ SOAP_FMAC3 ns1__deleteResponse *SOAP_FMAC4
 soap_in_ns1__deleteResponse(struct soap *soap, const char *tag,
                             ns1__deleteResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__deleteResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__deleteResponse,
             sizeof(ns1__deleteResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -7972,13 +8024,13 @@ soap_in_ns1__deleteResponse(struct soap *soap, const char *tag,
       return (ns1__deleteResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__deleteResponse::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__deleteResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteResponse", id, type))
     return soap->error;
@@ -7995,7 +8047,7 @@ soap_get_ns1__deleteResponse(struct soap *soap, ns1__deleteResponse *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -8008,9 +8060,9 @@ soap_instantiate_ns1__deleteResponse(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__deleteResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__deleteResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__deleteResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteResponse);
     if (size)
@@ -8046,8 +8098,8 @@ soap_copy_ns1__deleteResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__delete::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__delete::sessionId = NULL;
-  this->ns1__delete::bean = NULL;
+  this->ns1__delete::sessionId = nullptr;
+  this->ns1__delete::bean = nullptr;
 }
 
 void ns1__delete::soap_serialize(struct soap *soap) const {
@@ -8090,13 +8142,13 @@ SOAP_FMAC3 ns1__delete *SOAP_FMAC4
 soap_in_ns1__delete(struct soap *soap, const char *tag, ns1__delete *a,
                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__delete *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__delete, sizeof(ns1__delete),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__delete) {
@@ -8137,24 +8189,24 @@ soap_in_ns1__delete(struct soap *soap, const char *tag, ns1__delete *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__delete *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__delete, 0,
         sizeof(ns1__delete), 0, soap_copy_ns1__delete);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__delete::soap_put(struct soap *soap, const char *tag,
                           const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__delete);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_ns1__delete);
   if (this->soap_out(soap, tag ? tag : "ns1:delete", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -8170,7 +8222,7 @@ soap_get_ns1__delete(struct soap *soap, ns1__delete *p, const char *tag,
                      const char *type) {
   if ((p = soap_in_ns1__delete(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -8183,9 +8235,9 @@ soap_instantiate_ns1__delete(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__delete(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__delete, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__delete, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__delete);
     if (size)
@@ -8263,13 +8315,13 @@ SOAP_FMAC3 ns1__searchTextResponse *SOAP_FMAC4
 soap_in_ns1__searchTextResponse(struct soap *soap, const char *tag,
                                 ns1__searchTextResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchTextResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__searchTextResponse,
       sizeof(ns1__searchTextResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__searchTextResponse) {
@@ -8299,24 +8351,24 @@ soap_in_ns1__searchTextResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchTextResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__searchTextResponse,
         0, sizeof(ns1__searchTextResponse), 0,
         soap_copy_ns1__searchTextResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__searchTextResponse::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__searchTextResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:searchTextResponse", id, type))
     return soap->error;
@@ -8333,7 +8385,7 @@ soap_get_ns1__searchTextResponse(struct soap *soap, ns1__searchTextResponse *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__searchTextResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -8348,9 +8400,9 @@ soap_instantiate_ns1__searchTextResponse(struct soap *soap, int n,
                       "soap_instantiate_ns1__searchTextResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__searchTextResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__searchTextResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchTextResponse);
     if (size)
@@ -8386,10 +8438,10 @@ soap_copy_ns1__searchTextResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__searchText::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__searchText::sessionId = NULL;
-  this->ns1__searchText::query = NULL;
+  this->ns1__searchText::sessionId = nullptr;
+  this->ns1__searchText::query = nullptr;
   soap_default_int(soap, &this->ns1__searchText::maxCount);
-  this->ns1__searchText::entityName = NULL;
+  this->ns1__searchText::entityName = nullptr;
 }
 
 void ns1__searchText::soap_serialize(struct soap *soap) const {
@@ -8440,13 +8492,13 @@ SOAP_FMAC3 ns1__searchText *SOAP_FMAC4
 soap_in_ns1__searchText(struct soap *soap, const char *tag, ns1__searchText *a,
                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__searchText *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__searchText,
       sizeof(ns1__searchText), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__searchText) {
@@ -8504,27 +8556,27 @@ soap_in_ns1__searchText(struct soap *soap, const char *tag, ns1__searchText *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__searchText *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__searchText, 0,
         sizeof(ns1__searchText), 0, soap_copy_ns1__searchText);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_maxCount1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__searchText::soap_put(struct soap *soap, const char *tag,
                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__searchText);
   if (this->soap_out(soap, tag ? tag : "ns1:searchText", id, type))
     return soap->error;
@@ -8541,7 +8593,7 @@ soap_get_ns1__searchText(struct soap *soap, ns1__searchText *p, const char *tag,
                          const char *type) {
   if ((p = soap_in_ns1__searchText(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -8553,10 +8605,10 @@ soap_instantiate_ns1__searchText(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__searchText(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__searchText, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__searchText, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__searchText);
     if (size)
@@ -8624,13 +8676,13 @@ soap_in_ns1__luceneCommitResponse(struct soap *soap, const char *tag,
                                   ns1__luceneCommitResponse *a,
                                   const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__luceneCommitResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__luceneCommitResponse,
             sizeof(ns1__luceneCommitResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -8640,13 +8692,13 @@ soap_in_ns1__luceneCommitResponse(struct soap *soap, const char *tag,
       return (ns1__luceneCommitResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__luceneCommitResponse::soap_put(struct soap *soap, const char *tag,
                                         const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__luceneCommitResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:luceneCommitResponse", id, type))
     return soap->error;
@@ -8664,7 +8716,7 @@ soap_get_ns1__luceneCommitResponse(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in_ns1__luceneCommitResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -8679,10 +8731,11 @@ soap_instantiate_ns1__luceneCommitResponse(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate_ns1__luceneCommitResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__luceneCommitResponse, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__luceneCommitResponse, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__luceneCommitResponse);
     if (size)
@@ -8719,7 +8772,7 @@ soap_copy_ns1__luceneCommitResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__luceneCommit::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__luceneCommit::sessionId = NULL;
+  this->ns1__luceneCommit::sessionId = nullptr;
 }
 
 void ns1__luceneCommit::soap_serialize(struct soap *soap) const {
@@ -8760,13 +8813,13 @@ SOAP_FMAC3 ns1__luceneCommit *SOAP_FMAC4
 soap_in_ns1__luceneCommit(struct soap *soap, const char *tag,
                           ns1__luceneCommit *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__luceneCommit *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__luceneCommit,
       sizeof(ns1__luceneCommit), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__luceneCommit) {
@@ -8800,23 +8853,23 @@ soap_in_ns1__luceneCommit(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__luceneCommit *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__luceneCommit, 0,
         sizeof(ns1__luceneCommit), 0, soap_copy_ns1__luceneCommit);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__luceneCommit::soap_put(struct soap *soap, const char *tag,
                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__luceneCommit);
   if (this->soap_out(soap, tag ? tag : "ns1:luceneCommit", id, type))
     return soap->error;
@@ -8833,7 +8886,7 @@ soap_get_ns1__luceneCommit(struct soap *soap, ns1__luceneCommit *p,
                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__luceneCommit(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -8846,9 +8899,9 @@ soap_instantiate_ns1__luceneCommit(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__luceneCommit(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__luceneCommit, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__luceneCommit, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__luceneCommit);
     if (size)
@@ -8884,12 +8937,12 @@ soap_copy_ns1__luceneCommit(struct soap *soap, int st, int tt, void *p,
 void ns1__entityField::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__entityField::comment = NULL;
-  this->ns1__entityField::name = NULL;
+  this->ns1__entityField::comment = nullptr;
+  this->ns1__entityField::name = nullptr;
   soap_default_bool(soap, &this->ns1__entityField::notNullable);
-  this->ns1__entityField::relType = NULL;
-  this->ns1__entityField::stringLength = NULL;
-  this->ns1__entityField::type = NULL;
+  this->ns1__entityField::relType = nullptr;
+  this->ns1__entityField::stringLength = nullptr;
+  this->ns1__entityField::type = nullptr;
 }
 
 void ns1__entityField::soap_serialize(struct soap *soap) const {
@@ -8948,13 +9001,13 @@ SOAP_FMAC3 ns1__entityField *SOAP_FMAC4
 soap_in_ns1__entityField(struct soap *soap, const char *tag,
                          ns1__entityField *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__entityField *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__entityField,
       sizeof(ns1__entityField), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__entityField) {
@@ -9027,27 +9080,27 @@ soap_in_ns1__entityField(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__entityField *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__entityField, 0,
         sizeof(ns1__entityField), 0, soap_copy_ns1__entityField);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_notNullable1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__entityField::soap_put(struct soap *soap, const char *tag,
                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__entityField);
   if (this->soap_out(soap, tag ? tag : "ns1:entityField", id, type))
     return soap->error;
@@ -9064,7 +9117,7 @@ soap_get_ns1__entityField(struct soap *soap, ns1__entityField *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__entityField(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -9076,10 +9129,10 @@ soap_instantiate_ns1__entityField(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__entityField(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__entityField, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__entityField, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__entityField);
     if (size)
@@ -9157,13 +9210,13 @@ SOAP_FMAC3 ns1__constraint *SOAP_FMAC4
 soap_in_ns1__constraint(struct soap *soap, const char *tag, ns1__constraint *a,
                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__constraint *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__constraint,
       sizeof(ns1__constraint), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__constraint) {
@@ -9193,23 +9246,23 @@ soap_in_ns1__constraint(struct soap *soap, const char *tag, ns1__constraint *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__constraint *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__constraint, 0,
         sizeof(ns1__constraint), 0, soap_copy_ns1__constraint);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__constraint::soap_put(struct soap *soap, const char *tag,
                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__constraint);
   if (this->soap_out(soap, tag ? tag : "ns1:constraint", id, type))
     return soap->error;
@@ -9226,7 +9279,7 @@ soap_get_ns1__constraint(struct soap *soap, ns1__constraint *p, const char *tag,
                          const char *type) {
   if ((p = soap_in_ns1__constraint(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -9238,10 +9291,10 @@ soap_instantiate_ns1__constraint(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__constraint(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__constraint, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__constraint, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__constraint);
     if (size)
@@ -9277,7 +9330,7 @@ soap_copy_ns1__constraint(struct soap *soap, int st, int tt, void *p,
 void ns1__entityInfo::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__entityInfo::classComment = NULL;
+  this->ns1__entityInfo::classComment = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__constraint(
       soap, &this->ns1__entityInfo::constraints);
   soap_default_std__vectorTemplateOfPointerTons1__entityField(
@@ -9332,13 +9385,13 @@ SOAP_FMAC3 ns1__entityInfo *SOAP_FMAC4
 soap_in_ns1__entityInfo(struct soap *soap, const char *tag, ns1__entityInfo *a,
                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__entityInfo *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__entityInfo,
       sizeof(ns1__entityInfo), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__entityInfo) {
@@ -9382,23 +9435,23 @@ soap_in_ns1__entityInfo(struct soap *soap, const char *tag, ns1__entityInfo *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__entityInfo *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__entityInfo, 0,
         sizeof(ns1__entityInfo), 0, soap_copy_ns1__entityInfo);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__entityInfo::soap_put(struct soap *soap, const char *tag,
                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__entityInfo);
   if (this->soap_out(soap, tag ? tag : "ns1:entityInfo", id, type))
     return soap->error;
@@ -9415,7 +9468,7 @@ soap_get_ns1__entityInfo(struct soap *soap, ns1__entityInfo *p, const char *tag,
                          const char *type) {
   if ((p = soap_in_ns1__entityInfo(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -9427,10 +9480,10 @@ soap_instantiate_ns1__entityInfo(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__entityInfo(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__entityInfo, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__entityInfo, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__entityInfo);
     if (size)
@@ -9466,7 +9519,7 @@ soap_copy_ns1__entityInfo(struct soap *soap, int st, int tt, void *p,
 void ns1__getEntityInfoResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getEntityInfoResponse::return_ = NULL;
+  this->ns1__getEntityInfoResponse::return_ = nullptr;
 }
 
 void ns1__getEntityInfoResponse::soap_serialize(struct soap *soap) const {
@@ -9510,13 +9563,13 @@ soap_in_ns1__getEntityInfoResponse(struct soap *soap, const char *tag,
                                    ns1__getEntityInfoResponse *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getEntityInfoResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__getEntityInfoResponse,
       sizeof(ns1__getEntityInfoResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__getEntityInfoResponse) {
@@ -9549,10 +9602,10 @@ soap_in_ns1__getEntityInfoResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getEntityInfoResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -9560,14 +9613,14 @@ soap_in_ns1__getEntityInfoResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getEntityInfoResponse), 0,
         soap_copy_ns1__getEntityInfoResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getEntityInfoResponse::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__getEntityInfoResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getEntityInfoResponse", id, type))
     return soap->error;
@@ -9585,7 +9638,7 @@ soap_get_ns1__getEntityInfoResponse(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__getEntityInfoResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -9600,10 +9653,11 @@ soap_instantiate_ns1__getEntityInfoResponse(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__getEntityInfoResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__getEntityInfoResponse, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__getEntityInfoResponse, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getEntityInfoResponse);
     if (size)
@@ -9640,7 +9694,7 @@ soap_copy_ns1__getEntityInfoResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__getEntityInfo::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getEntityInfo::beanName = NULL;
+  this->ns1__getEntityInfo::beanName = nullptr;
 }
 
 void ns1__getEntityInfo::soap_serialize(struct soap *soap) const {
@@ -9681,13 +9735,13 @@ SOAP_FMAC3 ns1__getEntityInfo *SOAP_FMAC4
 soap_in_ns1__getEntityInfo(struct soap *soap, const char *tag,
                            ns1__getEntityInfo *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getEntityInfo *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__getEntityInfo,
       sizeof(ns1__getEntityInfo), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__getEntityInfo) {
@@ -9721,23 +9775,23 @@ soap_in_ns1__getEntityInfo(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getEntityInfo *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__getEntityInfo, 0,
         sizeof(ns1__getEntityInfo), 0, soap_copy_ns1__getEntityInfo);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getEntityInfo::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__getEntityInfo);
   if (this->soap_out(soap, tag ? tag : "ns1:getEntityInfo", id, type))
     return soap->error;
@@ -9754,7 +9808,7 @@ soap_get_ns1__getEntityInfo(struct soap *soap, ns1__getEntityInfo *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__getEntityInfo(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -9767,9 +9821,9 @@ soap_instantiate_ns1__getEntityInfo(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__getEntityInfo(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__getEntityInfo, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__getEntityInfo, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getEntityInfo);
     if (size)
@@ -9835,13 +9889,13 @@ SOAP_FMAC3 ns1__dummyResponse *SOAP_FMAC4
 soap_in_ns1__dummyResponse(struct soap *soap, const char *tag,
                            ns1__dummyResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__dummyResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__dummyResponse,
             sizeof(ns1__dummyResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -9851,13 +9905,13 @@ soap_in_ns1__dummyResponse(struct soap *soap, const char *tag,
       return (ns1__dummyResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__dummyResponse::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__dummyResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:dummyResponse", id, type))
     return soap->error;
@@ -9874,7 +9928,7 @@ soap_get_ns1__dummyResponse(struct soap *soap, ns1__dummyResponse *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__dummyResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -9887,9 +9941,9 @@ soap_instantiate_ns1__dummyResponse(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__dummyResponse(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__dummyResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__dummyResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__dummyResponse);
     if (size)
@@ -9926,8 +9980,8 @@ void ns1__publicStep::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__publicStep::field = NULL;
-  this->ns1__publicStep::origin = NULL;
+  this->ns1__publicStep::field = nullptr;
+  this->ns1__publicStep::origin = nullptr;
 }
 
 void ns1__publicStep::soap_serialize(struct soap *soap) const {
@@ -9987,13 +10041,13 @@ SOAP_FMAC3 ns1__publicStep *SOAP_FMAC4
 soap_in_ns1__publicStep(struct soap *soap, const char *tag, ns1__publicStep *a,
                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__publicStep *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__publicStep,
       sizeof(ns1__publicStep), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__publicStep) {
@@ -10075,23 +10129,23 @@ soap_in_ns1__publicStep(struct soap *soap, const char *tag, ns1__publicStep *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__publicStep *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__publicStep, 0,
         sizeof(ns1__publicStep), 0, soap_copy_ns1__publicStep);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__publicStep::soap_put(struct soap *soap, const char *tag,
                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__publicStep);
   if (this->soap_out(soap, tag ? tag : "ns1:publicStep", id, type))
     return soap->error;
@@ -10108,7 +10162,7 @@ soap_get_ns1__publicStep(struct soap *soap, ns1__publicStep *p, const char *tag,
                          const char *type) {
   if ((p = soap_in_ns1__publicStep(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -10120,10 +10174,10 @@ soap_instantiate_ns1__publicStep(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__publicStep(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__publicStep, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__publicStep, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__publicStep);
     if (size)
@@ -10161,10 +10215,10 @@ void ns1__log::soap_default(struct soap *soap) {
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
   soap_default_LONG64(soap, &this->ns1__log::duration);
-  this->ns1__log::entityId = NULL;
-  this->ns1__log::entityName = NULL;
-  this->ns1__log::operation = NULL;
-  this->ns1__log::query = NULL;
+  this->ns1__log::entityId = nullptr;
+  this->ns1__log::entityName = nullptr;
+  this->ns1__log::operation = nullptr;
+  this->ns1__log::query = nullptr;
 }
 
 void ns1__log::soap_serialize(struct soap *soap) const {
@@ -10233,13 +10287,13 @@ SOAP_FMAC3 ns1__log *SOAP_FMAC4 soap_in_ns1__log(struct soap *soap,
                                                  const char *tag, ns1__log *a,
                                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__log *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__log, sizeof(ns1__log), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__log) {
@@ -10343,20 +10397,20 @@ SOAP_FMAC3 ns1__log *SOAP_FMAC4 soap_in_ns1__log(struct soap *soap,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__log *)soap_id_forward(soap, soap->href, (void *)a, 0,
                                     SOAP_TYPE_ICat4_ns1__log, 0,
                                     sizeof(ns1__log), 0, soap_copy_ns1__log);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_duration1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
@@ -10364,7 +10418,7 @@ SOAP_FMAC3 ns1__log *SOAP_FMAC4 soap_in_ns1__log(struct soap *soap,
 int ns1__log::soap_put(struct soap *soap, const char *tag,
                        const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__log);
+      soap_embed(soap, (void *)this, nullptr, 0, tag, SOAP_TYPE_ICat4_ns1__log);
   if (this->soap_out(soap, tag ? tag : "ns1:log", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -10379,7 +10433,7 @@ SOAP_FMAC3 ns1__log *SOAP_FMAC4 soap_get_ns1__log(struct soap *soap,
                                                   const char *type) {
   if ((p = soap_in_ns1__log(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -10391,9 +10445,9 @@ soap_instantiate_ns1__log(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__log(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__log, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__log, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__log);
     if (size)
@@ -10429,9 +10483,9 @@ void ns1__relatedDatafile::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__relatedDatafile::destDatafile = NULL;
-  this->ns1__relatedDatafile::relation = NULL;
-  this->ns1__relatedDatafile::sourceDatafile = NULL;
+  this->ns1__relatedDatafile::destDatafile = nullptr;
+  this->ns1__relatedDatafile::relation = nullptr;
+  this->ns1__relatedDatafile::sourceDatafile = nullptr;
 }
 
 void ns1__relatedDatafile::soap_serialize(struct soap *soap) const {
@@ -10500,13 +10554,13 @@ SOAP_FMAC3 ns1__relatedDatafile *SOAP_FMAC4
 soap_in_ns1__relatedDatafile(struct soap *soap, const char *tag,
                              ns1__relatedDatafile *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__relatedDatafile *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__relatedDatafile,
       sizeof(ns1__relatedDatafile), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__relatedDatafile) {
@@ -10597,23 +10651,23 @@ soap_in_ns1__relatedDatafile(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__relatedDatafile *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__relatedDatafile, 0,
         sizeof(ns1__relatedDatafile), 0, soap_copy_ns1__relatedDatafile);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__relatedDatafile::soap_put(struct soap *soap, const char *tag,
                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__relatedDatafile);
   if (this->soap_out(soap, tag ? tag : "ns1:relatedDatafile", id, type))
     return soap->error;
@@ -10630,7 +10684,7 @@ soap_get_ns1__relatedDatafile(struct soap *soap, ns1__relatedDatafile *p,
                               const char *tag, const char *type) {
   if ((p = soap_in_ns1__relatedDatafile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -10645,9 +10699,9 @@ soap_instantiate_ns1__relatedDatafile(struct soap *soap, int n,
                       "soap_instantiate_ns1__relatedDatafile(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__relatedDatafile, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__relatedDatafile, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__relatedDatafile);
     if (size)
@@ -10684,10 +10738,10 @@ void ns1__shift::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__shift::comment = NULL;
-  this->ns1__shift::endDate = NULL;
-  this->ns1__shift::investigation = NULL;
-  this->ns1__shift::startDate = NULL;
+  this->ns1__shift::comment = nullptr;
+  this->ns1__shift::endDate = nullptr;
+  this->ns1__shift::investigation = nullptr;
+  this->ns1__shift::startDate = nullptr;
 }
 
 void ns1__shift::soap_serialize(struct soap *soap) const {
@@ -10755,13 +10809,13 @@ SOAP_FMAC3 ns1__shift *SOAP_FMAC4
 soap_in_ns1__shift(struct soap *soap, const char *tag, ns1__shift *a,
                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__shift *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__shift, sizeof(ns1__shift),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__shift) {
@@ -10858,24 +10912,24 @@ soap_in_ns1__shift(struct soap *soap, const char *tag, ns1__shift *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__shift *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__shift, 0,
         sizeof(ns1__shift), 0, soap_copy_ns1__shift);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__shift::soap_put(struct soap *soap, const char *tag,
                          const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__shift);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_ns1__shift);
   if (this->soap_out(soap, tag ? tag : "ns1:shift", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -10891,7 +10945,7 @@ soap_get_ns1__shift(struct soap *soap, ns1__shift *p, const char *tag,
                     const char *type) {
   if ((p = soap_in_ns1__shift(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -10903,9 +10957,9 @@ soap_instantiate_ns1__shift(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__shift(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__shift, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__shift, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__shift);
     if (size)
@@ -10941,12 +10995,12 @@ void ns1__publication::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__publication::doi = NULL;
-  this->ns1__publication::fullReference = NULL;
-  this->ns1__publication::investigation = NULL;
-  this->ns1__publication::repository = NULL;
-  this->ns1__publication::repositoryId = NULL;
-  this->ns1__publication::url = NULL;
+  this->ns1__publication::doi = nullptr;
+  this->ns1__publication::fullReference = nullptr;
+  this->ns1__publication::investigation = nullptr;
+  this->ns1__publication::repository = nullptr;
+  this->ns1__publication::repositoryId = nullptr;
+  this->ns1__publication::url = nullptr;
 }
 
 void ns1__publication::soap_serialize(struct soap *soap) const {
@@ -11026,13 +11080,13 @@ SOAP_FMAC3 ns1__publication *SOAP_FMAC4
 soap_in_ns1__publication(struct soap *soap, const char *tag,
                          ns1__publication *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__publication *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__publication,
       sizeof(ns1__publication), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__publication) {
@@ -11149,23 +11203,23 @@ soap_in_ns1__publication(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__publication *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__publication, 0,
         sizeof(ns1__publication), 0, soap_copy_ns1__publication);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__publication::soap_put(struct soap *soap, const char *tag,
                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__publication);
   if (this->soap_out(soap, tag ? tag : "ns1:publication", id, type))
     return soap->error;
@@ -11182,7 +11236,7 @@ soap_get_ns1__publication(struct soap *soap, ns1__publication *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__publication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -11194,10 +11248,10 @@ soap_instantiate_ns1__publication(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__publication(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__publication, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__publication, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__publication);
     if (size)
@@ -11234,8 +11288,8 @@ void ns1__keyword::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__keyword::investigation = NULL;
-  this->ns1__keyword::name = NULL;
+  this->ns1__keyword::investigation = nullptr;
+  this->ns1__keyword::name = nullptr;
 }
 
 void ns1__keyword::soap_serialize(struct soap *soap) const {
@@ -11296,13 +11350,13 @@ SOAP_FMAC3 ns1__keyword *SOAP_FMAC4
 soap_in_ns1__keyword(struct soap *soap, const char *tag, ns1__keyword *a,
                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__keyword *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__keyword, sizeof(ns1__keyword),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__keyword) {
@@ -11384,23 +11438,23 @@ soap_in_ns1__keyword(struct soap *soap, const char *tag, ns1__keyword *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__keyword *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__keyword, 0,
         sizeof(ns1__keyword), 0, soap_copy_ns1__keyword);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__keyword::soap_put(struct soap *soap, const char *tag,
                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__keyword);
   if (this->soap_out(soap, tag ? tag : "ns1:keyword", id, type))
     return soap->error;
@@ -11417,7 +11471,7 @@ soap_get_ns1__keyword(struct soap *soap, ns1__keyword *p, const char *tag,
                       const char *type) {
   if ((p = soap_in_ns1__keyword(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -11430,9 +11484,9 @@ soap_instantiate_ns1__keyword(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__keyword(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__keyword, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__keyword, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__keyword);
     if (size)
@@ -11468,10 +11522,10 @@ void ns1__sampleType::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__sampleType::facility = NULL;
-  this->ns1__sampleType::molecularFormula = NULL;
-  this->ns1__sampleType::name = NULL;
-  this->ns1__sampleType::safetyInformation = NULL;
+  this->ns1__sampleType::facility = nullptr;
+  this->ns1__sampleType::molecularFormula = nullptr;
+  this->ns1__sampleType::name = nullptr;
+  this->ns1__sampleType::safetyInformation = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__sample(
       soap, &this->ns1__sampleType::samples);
 }
@@ -11550,13 +11604,13 @@ SOAP_FMAC3 ns1__sampleType *SOAP_FMAC4
 soap_in_ns1__sampleType(struct soap *soap, const char *tag, ns1__sampleType *a,
                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__sampleType *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__sampleType,
       sizeof(ns1__sampleType), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__sampleType) {
@@ -11660,23 +11714,23 @@ soap_in_ns1__sampleType(struct soap *soap, const char *tag, ns1__sampleType *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__sampleType *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__sampleType, 0,
         sizeof(ns1__sampleType), 0, soap_copy_ns1__sampleType);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__sampleType::soap_put(struct soap *soap, const char *tag,
                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__sampleType);
   if (this->soap_out(soap, tag ? tag : "ns1:sampleType", id, type))
     return soap->error;
@@ -11693,7 +11747,7 @@ soap_get_ns1__sampleType(struct soap *soap, ns1__sampleType *p, const char *tag,
                          const char *type) {
   if ((p = soap_in_ns1__sampleType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -11705,10 +11759,10 @@ soap_instantiate_ns1__sampleType(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__sampleType(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__sampleType, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__sampleType, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__sampleType);
     if (size)
@@ -11747,11 +11801,11 @@ void ns1__sample::soap_default(struct soap *soap) {
   this->xsd__anyType::soap_default(soap);
   soap_default_std__vectorTemplateOfPointerTons1__dataset(
       soap, &this->ns1__sample::datasets);
-  this->ns1__sample::investigation = NULL;
-  this->ns1__sample::name = NULL;
+  this->ns1__sample::investigation = nullptr;
+  this->ns1__sample::name = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__sampleParameter(
       soap, &this->ns1__sample::parameters);
-  this->ns1__sample::type = NULL;
+  this->ns1__sample::type = nullptr;
 }
 
 void ns1__sample::soap_serialize(struct soap *soap) const {
@@ -11825,13 +11879,13 @@ SOAP_FMAC3 ns1__sample *SOAP_FMAC4
 soap_in_ns1__sample(struct soap *soap, const char *tag, ns1__sample *a,
                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__sample *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__sample, sizeof(ns1__sample),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__sample) {
@@ -11929,24 +11983,24 @@ soap_in_ns1__sample(struct soap *soap, const char *tag, ns1__sample *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__sample *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__sample, 0,
         sizeof(ns1__sample), 0, soap_copy_ns1__sample);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__sample::soap_put(struct soap *soap, const char *tag,
                           const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__sample);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_ns1__sample);
   if (this->soap_out(soap, tag ? tag : "ns1:sample", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -11962,7 +12016,7 @@ soap_get_ns1__sample(struct soap *soap, ns1__sample *p, const char *tag,
                      const char *type) {
   if ((p = soap_in_ns1__sample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -11975,9 +12029,9 @@ soap_instantiate_ns1__sample(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__sample(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__sample, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__sample, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__sample);
     if (size)
@@ -12014,7 +12068,7 @@ void ns1__sampleParameter::soap_default(struct soap *soap) {
   this->ns1__parameter::soap_default(soap);
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__sampleParameter::sample = NULL;
+  this->ns1__sampleParameter::sample = nullptr;
 }
 
 void ns1__sampleParameter::soap_serialize(struct soap *soap) const {
@@ -12093,13 +12147,13 @@ SOAP_FMAC3 ns1__sampleParameter *SOAP_FMAC4
 soap_in_ns1__sampleParameter(struct soap *soap, const char *tag,
                              ns1__sampleParameter *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__sampleParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__sampleParameter,
       sizeof(ns1__sampleParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__sampleParameter) {
@@ -12229,23 +12283,23 @@ soap_in_ns1__sampleParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__sampleParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__sampleParameter, 0,
         sizeof(ns1__sampleParameter), 0, soap_copy_ns1__sampleParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__sampleParameter::soap_put(struct soap *soap, const char *tag,
                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__sampleParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:sampleParameter", id, type))
     return soap->error;
@@ -12262,7 +12316,7 @@ soap_get_ns1__sampleParameter(struct soap *soap, ns1__sampleParameter *p,
                               const char *tag, const char *type) {
   if ((p = soap_in_ns1__sampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -12277,9 +12331,9 @@ soap_instantiate_ns1__sampleParameter(struct soap *soap, int n,
                       "soap_instantiate_ns1__sampleParameter(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__sampleParameter, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__sampleParameter, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__sampleParameter);
     if (size)
@@ -12316,8 +12370,8 @@ void ns1__permissibleStringValue::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__permissibleStringValue::type = NULL;
-  this->ns1__permissibleStringValue::value = NULL;
+  this->ns1__permissibleStringValue::type = nullptr;
+  this->ns1__permissibleStringValue::value = nullptr;
 }
 
 void ns1__permissibleStringValue::soap_serialize(struct soap *soap) const {
@@ -12382,13 +12436,13 @@ soap_in_ns1__permissibleStringValue(struct soap *soap, const char *tag,
                                     ns1__permissibleStringValue *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__permissibleStringValue *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__permissibleStringValue,
       sizeof(ns1__permissibleStringValue), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__permissibleStringValue) {
@@ -12471,10 +12525,10 @@ soap_in_ns1__permissibleStringValue(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__permissibleStringValue *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -12482,14 +12536,14 @@ soap_in_ns1__permissibleStringValue(struct soap *soap, const char *tag,
         sizeof(ns1__permissibleStringValue), 0,
         soap_copy_ns1__permissibleStringValue);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__permissibleStringValue::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__permissibleStringValue);
   if (this->soap_out(soap, tag ? tag : "ns1:permissibleStringValue", id, type))
     return soap->error;
@@ -12507,7 +12561,7 @@ soap_get_ns1__permissibleStringValue(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__permissibleStringValue(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -12523,10 +12577,10 @@ soap_instantiate_ns1__permissibleStringValue(struct soap *soap, int n,
                    "soap_instantiate_ns1__permissibleStringValue(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__permissibleStringValue, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__permissibleStringValue, n,
                 ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__permissibleStringValue);
     if (size)
@@ -12566,7 +12620,7 @@ void ns1__investigationParameter::soap_default(struct soap *soap) {
   this->ns1__parameter::soap_default(soap);
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__investigationParameter::investigation = NULL;
+  this->ns1__investigationParameter::investigation = nullptr;
 }
 
 void ns1__investigationParameter::soap_serialize(struct soap *soap) const {
@@ -12649,13 +12703,13 @@ soap_in_ns1__investigationParameter(struct soap *soap, const char *tag,
                                     ns1__investigationParameter *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__investigationParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__investigationParameter,
       sizeof(ns1__investigationParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__investigationParameter) {
@@ -12786,10 +12840,10 @@ soap_in_ns1__investigationParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__investigationParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -12797,14 +12851,14 @@ soap_in_ns1__investigationParameter(struct soap *soap, const char *tag,
         sizeof(ns1__investigationParameter), 0,
         soap_copy_ns1__investigationParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__investigationParameter::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__investigationParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:investigationParameter", id, type))
     return soap->error;
@@ -12822,7 +12876,7 @@ soap_get_ns1__investigationParameter(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__investigationParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -12838,10 +12892,10 @@ soap_instantiate_ns1__investigationParameter(struct soap *soap, int n,
                    "soap_instantiate_ns1__investigationParameter(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__investigationParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__investigationParameter, n,
                 ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__investigationParameter);
     if (size)
@@ -12881,7 +12935,7 @@ void ns1__datasetParameter::soap_default(struct soap *soap) {
   this->ns1__parameter::soap_default(soap);
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__datasetParameter::dataset = NULL;
+  this->ns1__datasetParameter::dataset = nullptr;
 }
 
 void ns1__datasetParameter::soap_serialize(struct soap *soap) const {
@@ -12961,13 +13015,13 @@ SOAP_FMAC3 ns1__datasetParameter *SOAP_FMAC4
 soap_in_ns1__datasetParameter(struct soap *soap, const char *tag,
                               ns1__datasetParameter *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__datasetParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__datasetParameter,
       sizeof(ns1__datasetParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__datasetParameter) {
@@ -13097,23 +13151,23 @@ soap_in_ns1__datasetParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__datasetParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__datasetParameter,
         0, sizeof(ns1__datasetParameter), 0, soap_copy_ns1__datasetParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__datasetParameter::soap_put(struct soap *soap, const char *tag,
                                     const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__datasetParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:datasetParameter", id, type))
     return soap->error;
@@ -13130,7 +13184,7 @@ soap_get_ns1__datasetParameter(struct soap *soap, ns1__datasetParameter *p,
                                const char *tag, const char *type) {
   if ((p = soap_in_ns1__datasetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -13145,9 +13199,9 @@ soap_instantiate_ns1__datasetParameter(struct soap *soap, int n,
                       "soap_instantiate_ns1__datasetParameter(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__datasetParameter, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__datasetParameter, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__datasetParameter);
     if (size)
@@ -13185,7 +13239,7 @@ void ns1__datafileParameter::soap_default(struct soap *soap) {
   this->ns1__parameter::soap_default(soap);
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__datafileParameter::datafile = NULL;
+  this->ns1__datafileParameter::datafile = nullptr;
 }
 
 void ns1__datafileParameter::soap_serialize(struct soap *soap) const {
@@ -13265,13 +13319,13 @@ SOAP_FMAC3 ns1__datafileParameter *SOAP_FMAC4
 soap_in_ns1__datafileParameter(struct soap *soap, const char *tag,
                                ns1__datafileParameter *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__datafileParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__datafileParameter,
       sizeof(ns1__datafileParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__datafileParameter) {
@@ -13401,23 +13455,23 @@ soap_in_ns1__datafileParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__datafileParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__datafileParameter,
         0, sizeof(ns1__datafileParameter), 0, soap_copy_ns1__datafileParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__datafileParameter::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__datafileParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:datafileParameter", id, type))
     return soap->error;
@@ -13434,7 +13488,7 @@ soap_get_ns1__datafileParameter(struct soap *soap, ns1__datafileParameter *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__datafileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -13449,9 +13503,9 @@ soap_instantiate_ns1__datafileParameter(struct soap *soap, int n,
                       "soap_instantiate_ns1__datafileParameter(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__datafileParameter, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__datafileParameter, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__datafileParameter);
     if (size)
@@ -13488,13 +13542,13 @@ void ns1__parameter::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__parameter::dateTimeValue = NULL;
-  this->ns1__parameter::error = NULL;
-  this->ns1__parameter::numericValue = NULL;
-  this->ns1__parameter::rangeBottom = NULL;
-  this->ns1__parameter::rangeTop = NULL;
-  this->ns1__parameter::stringValue = NULL;
-  this->ns1__parameter::type = NULL;
+  this->ns1__parameter::dateTimeValue = nullptr;
+  this->ns1__parameter::error = nullptr;
+  this->ns1__parameter::numericValue = nullptr;
+  this->ns1__parameter::rangeBottom = nullptr;
+  this->ns1__parameter::rangeTop = nullptr;
+  this->ns1__parameter::stringValue = nullptr;
+  this->ns1__parameter::type = nullptr;
 }
 
 void ns1__parameter::soap_serialize(struct soap *soap) const {
@@ -13574,13 +13628,13 @@ SOAP_FMAC3 ns1__parameter *SOAP_FMAC4
 soap_in_ns1__parameter(struct soap *soap, const char *tag, ns1__parameter *a,
                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__parameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__parameter, sizeof(ns1__parameter),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__parameter) {
@@ -13702,23 +13756,23 @@ soap_in_ns1__parameter(struct soap *soap, const char *tag, ns1__parameter *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__parameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__parameter, 0,
         sizeof(ns1__parameter), 0, soap_copy_ns1__parameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__parameter::soap_put(struct soap *soap, const char *tag,
                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__parameter);
   if (this->soap_out(soap, tag ? tag : "ns1:parameter", id, type))
     return soap->error;
@@ -13735,7 +13789,7 @@ soap_get_ns1__parameter(struct soap *soap, ns1__parameter *p, const char *tag,
                         const char *type) {
   if ((p = soap_in_ns1__parameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -13747,10 +13801,10 @@ soap_instantiate_ns1__parameter(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__parameter(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__parameter, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__parameter, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (type && !soap_match_tag(soap, type, "ns1:dataCollectionParameter")) {
     cp->type = SOAP_TYPE_ICat4_ns1__dataCollectionParameter;
     if (n < 0) {
@@ -13887,7 +13941,7 @@ void ns1__dataCollectionParameter::soap_default(struct soap *soap) {
   this->ns1__parameter::soap_default(soap);
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__dataCollectionParameter::dataCollection = NULL;
+  this->ns1__dataCollectionParameter::dataCollection = nullptr;
 }
 
 void ns1__dataCollectionParameter::soap_serialize(struct soap *soap) const {
@@ -13971,13 +14025,13 @@ soap_in_ns1__dataCollectionParameter(struct soap *soap, const char *tag,
                                      ns1__dataCollectionParameter *a,
                                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__dataCollectionParameter *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__dataCollectionParameter,
       sizeof(ns1__dataCollectionParameter), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__dataCollectionParameter) {
@@ -14108,10 +14162,10 @@ soap_in_ns1__dataCollectionParameter(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__dataCollectionParameter *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -14119,14 +14173,14 @@ soap_in_ns1__dataCollectionParameter(struct soap *soap, const char *tag,
         sizeof(ns1__dataCollectionParameter), 0,
         soap_copy_ns1__dataCollectionParameter);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__dataCollectionParameter::soap_put(struct soap *soap, const char *tag,
                                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__dataCollectionParameter);
   if (this->soap_out(soap, tag ? tag : "ns1:dataCollectionParameter", id, type))
     return soap->error;
@@ -14144,7 +14198,7 @@ soap_get_ns1__dataCollectionParameter(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in_ns1__dataCollectionParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -14161,10 +14215,10 @@ soap_instantiate_ns1__dataCollectionParameter(struct soap *soap, int n,
              "soap_instantiate_ns1__dataCollectionParameter(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__dataCollectionParameter, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__dataCollectionParameter, n,
                 ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__dataCollectionParameter);
     if (size)
@@ -14215,21 +14269,21 @@ void ns1__parameterType::soap_default(struct soap *soap) {
       soap, &this->ns1__parameterType::datafileParameters);
   soap_default_std__vectorTemplateOfPointerTons1__datasetParameter(
       soap, &this->ns1__parameterType::datasetParameters);
-  this->ns1__parameterType::description = NULL;
+  this->ns1__parameterType::description = nullptr;
   soap_default_bool(soap, &this->ns1__parameterType::enforced);
-  this->ns1__parameterType::facility = NULL;
+  this->ns1__parameterType::facility = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__investigationParameter(
       soap, &this->ns1__parameterType::investigationParameters);
-  this->ns1__parameterType::maximumNumericValue = NULL;
-  this->ns1__parameterType::minimumNumericValue = NULL;
-  this->ns1__parameterType::name = NULL;
+  this->ns1__parameterType::maximumNumericValue = nullptr;
+  this->ns1__parameterType::minimumNumericValue = nullptr;
+  this->ns1__parameterType::name = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__permissibleStringValue(
       soap, &this->ns1__parameterType::permissibleStringValues);
   soap_default_std__vectorTemplateOfPointerTons1__sampleParameter(
       soap, &this->ns1__parameterType::sampleParameters);
-  this->ns1__parameterType::units = NULL;
-  this->ns1__parameterType::unitsFullName = NULL;
-  this->ns1__parameterType::valueType = NULL;
+  this->ns1__parameterType::units = nullptr;
+  this->ns1__parameterType::unitsFullName = nullptr;
+  this->ns1__parameterType::valueType = nullptr;
   soap_default_bool(soap, &this->ns1__parameterType::verified);
 }
 
@@ -14380,13 +14434,13 @@ SOAP_FMAC3 ns1__parameterType *SOAP_FMAC4
 soap_in_ns1__parameterType(struct soap *soap, const char *tag,
                            ns1__parameterType *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__parameterType *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__parameterType,
       sizeof(ns1__parameterType), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__parameterType) {
@@ -14610,16 +14664,16 @@ soap_in_ns1__parameterType(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__parameterType *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__parameterType, 0,
         sizeof(ns1__parameterType), 0, soap_copy_ns1__parameterType);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) &&
       (soap_flag_applicableToDataCollection1 > 0 ||
@@ -14629,14 +14683,14 @@ soap_in_ns1__parameterType(struct soap *soap, const char *tag,
        soap_flag_applicableToSample1 > 0 || soap_flag_enforced1 > 0 ||
        soap_flag_verified1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__parameterType::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__parameterType);
   if (this->soap_out(soap, tag ? tag : "ns1:parameterType", id, type))
     return soap->error;
@@ -14653,7 +14707,7 @@ soap_get_ns1__parameterType(struct soap *soap, ns1__parameterType *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__parameterType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -14666,9 +14720,9 @@ soap_instantiate_ns1__parameterType(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__parameterType(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__parameterType, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__parameterType, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__parameterType);
     if (size)
@@ -14705,11 +14759,11 @@ void ns1__investigationType::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__investigationType::description = NULL;
-  this->ns1__investigationType::facility = NULL;
+  this->ns1__investigationType::description = nullptr;
+  this->ns1__investigationType::facility = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__investigation(
       soap, &this->ns1__investigationType::investigations);
-  this->ns1__investigationType::name = NULL;
+  this->ns1__investigationType::name = nullptr;
 }
 
 void ns1__investigationType::soap_serialize(struct soap *soap) const {
@@ -14784,13 +14838,13 @@ SOAP_FMAC3 ns1__investigationType *SOAP_FMAC4
 soap_in_ns1__investigationType(struct soap *soap, const char *tag,
                                ns1__investigationType *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__investigationType *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__investigationType,
       sizeof(ns1__investigationType), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__investigationType) {
@@ -14888,23 +14942,23 @@ soap_in_ns1__investigationType(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__investigationType *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__investigationType,
         0, sizeof(ns1__investigationType), 0, soap_copy_ns1__investigationType);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__investigationType::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__investigationType);
   if (this->soap_out(soap, tag ? tag : "ns1:investigationType", id, type))
     return soap->error;
@@ -14921,7 +14975,7 @@ soap_get_ns1__investigationType(struct soap *soap, ns1__investigationType *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__investigationType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -14936,9 +14990,9 @@ soap_instantiate_ns1__investigationType(struct soap *soap, int n,
                       "soap_instantiate_ns1__investigationType(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__investigationType, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__investigationType, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__investigationType);
     if (size)
@@ -14975,8 +15029,8 @@ void ns1__investigationInstrument::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__investigationInstrument::instrument = NULL;
-  this->ns1__investigationInstrument::investigation = NULL;
+  this->ns1__investigationInstrument::instrument = nullptr;
+  this->ns1__investigationInstrument::investigation = nullptr;
 }
 
 void ns1__investigationInstrument::soap_serialize(struct soap *soap) const {
@@ -15044,13 +15098,13 @@ soap_in_ns1__investigationInstrument(struct soap *soap, const char *tag,
                                      ns1__investigationInstrument *a,
                                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__investigationInstrument *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__investigationInstrument,
       sizeof(ns1__investigationInstrument), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__investigationInstrument) {
@@ -15134,10 +15188,10 @@ soap_in_ns1__investigationInstrument(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__investigationInstrument *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -15145,14 +15199,14 @@ soap_in_ns1__investigationInstrument(struct soap *soap, const char *tag,
         sizeof(ns1__investigationInstrument), 0,
         soap_copy_ns1__investigationInstrument);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__investigationInstrument::soap_put(struct soap *soap, const char *tag,
                                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__investigationInstrument);
   if (this->soap_out(soap, tag ? tag : "ns1:investigationInstrument", id, type))
     return soap->error;
@@ -15170,7 +15224,7 @@ soap_get_ns1__investigationInstrument(struct soap *soap,
                                       const char *tag, const char *type) {
   if ((p = soap_in_ns1__investigationInstrument(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -15187,10 +15241,10 @@ soap_instantiate_ns1__investigationInstrument(struct soap *soap, int n,
              "soap_instantiate_ns1__investigationInstrument(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__investigationInstrument, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__investigationInstrument, n,
                 ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__investigationInstrument);
     if (size)
@@ -15229,9 +15283,9 @@ void ns1__rule::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__rule::crudFlags = NULL;
-  this->ns1__rule::grouping = NULL;
-  this->ns1__rule::what = NULL;
+  this->ns1__rule::crudFlags = nullptr;
+  this->ns1__rule::grouping = nullptr;
+  this->ns1__rule::what = nullptr;
 }
 
 void ns1__rule::soap_serialize(struct soap *soap) const {
@@ -15293,13 +15347,13 @@ SOAP_FMAC3 ns1__rule *SOAP_FMAC4
 soap_in_ns1__rule(struct soap *soap, const char *tag, ns1__rule *a,
                   const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__rule *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__rule, sizeof(ns1__rule),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__rule) {
@@ -15388,24 +15442,24 @@ soap_in_ns1__rule(struct soap *soap, const char *tag, ns1__rule *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__rule *)soap_id_forward(soap, soap->href, (void *)a, 0,
                                      SOAP_TYPE_ICat4_ns1__rule, 0,
                                      sizeof(ns1__rule), 0, soap_copy_ns1__rule);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__rule::soap_put(struct soap *soap, const char *tag,
                         const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__rule);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_ns1__rule);
   if (this->soap_out(soap, tag ? tag : "ns1:rule", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -15421,7 +15475,7 @@ soap_get_ns1__rule(struct soap *soap, ns1__rule *p, const char *tag,
                    const char *type) {
   if ((p = soap_in_ns1__rule(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -15433,9 +15487,9 @@ soap_instantiate_ns1__rule(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__rule(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__rule, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__rule, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__rule);
     if (size)
@@ -15471,7 +15525,7 @@ void ns1__grouping::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__grouping::name = NULL;
+  this->ns1__grouping::name = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__rule(
       soap, &this->ns1__grouping::rules);
   soap_default_std__vectorTemplateOfPointerTons1__userGroup(
@@ -15541,13 +15595,13 @@ SOAP_FMAC3 ns1__grouping *SOAP_FMAC4
 soap_in_ns1__grouping(struct soap *soap, const char *tag, ns1__grouping *a,
                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__grouping *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__grouping, sizeof(ns1__grouping),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__grouping) {
@@ -15630,23 +15684,23 @@ soap_in_ns1__grouping(struct soap *soap, const char *tag, ns1__grouping *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__grouping *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__grouping, 0,
         sizeof(ns1__grouping), 0, soap_copy_ns1__grouping);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__grouping::soap_put(struct soap *soap, const char *tag,
                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__grouping);
   if (this->soap_out(soap, tag ? tag : "ns1:grouping", id, type))
     return soap->error;
@@ -15663,7 +15717,7 @@ soap_get_ns1__grouping(struct soap *soap, ns1__grouping *p, const char *tag,
                        const char *type) {
   if ((p = soap_in_ns1__grouping(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -15676,9 +15730,9 @@ soap_instantiate_ns1__grouping(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__grouping(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__grouping, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__grouping, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__grouping);
     if (size)
@@ -15714,8 +15768,8 @@ void ns1__userGroup::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__userGroup::grouping = NULL;
-  this->ns1__userGroup::user = NULL;
+  this->ns1__userGroup::grouping = nullptr;
+  this->ns1__userGroup::user = nullptr;
 }
 
 void ns1__userGroup::soap_serialize(struct soap *soap) const {
@@ -15775,13 +15829,13 @@ SOAP_FMAC3 ns1__userGroup *SOAP_FMAC4
 soap_in_ns1__userGroup(struct soap *soap, const char *tag, ns1__userGroup *a,
                        const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__userGroup *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__userGroup, sizeof(ns1__userGroup),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__userGroup) {
@@ -15862,23 +15916,23 @@ soap_in_ns1__userGroup(struct soap *soap, const char *tag, ns1__userGroup *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__userGroup *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__userGroup, 0,
         sizeof(ns1__userGroup), 0, soap_copy_ns1__userGroup);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__userGroup::soap_put(struct soap *soap, const char *tag,
                              const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__userGroup);
   if (this->soap_out(soap, tag ? tag : "ns1:userGroup", id, type))
     return soap->error;
@@ -15895,7 +15949,7 @@ soap_get_ns1__userGroup(struct soap *soap, ns1__userGroup *p, const char *tag,
                         const char *type) {
   if ((p = soap_in_ns1__userGroup(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -15907,10 +15961,10 @@ soap_instantiate_ns1__userGroup(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__userGroup(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__userGroup, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__userGroup, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__userGroup);
     if (size)
@@ -15946,8 +16000,8 @@ void ns1__studyInvestigation::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__studyInvestigation::investigation = NULL;
-  this->ns1__studyInvestigation::study = NULL;
+  this->ns1__studyInvestigation::investigation = nullptr;
+  this->ns1__studyInvestigation::study = nullptr;
 }
 
 void ns1__studyInvestigation::soap_serialize(struct soap *soap) const {
@@ -16011,13 +16065,13 @@ SOAP_FMAC3 ns1__studyInvestigation *SOAP_FMAC4
 soap_in_ns1__studyInvestigation(struct soap *soap, const char *tag,
                                 ns1__studyInvestigation *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__studyInvestigation *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__studyInvestigation,
       sizeof(ns1__studyInvestigation), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__studyInvestigation) {
@@ -16100,24 +16154,24 @@ soap_in_ns1__studyInvestigation(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__studyInvestigation *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__studyInvestigation,
         0, sizeof(ns1__studyInvestigation), 0,
         soap_copy_ns1__studyInvestigation);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__studyInvestigation::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__studyInvestigation);
   if (this->soap_out(soap, tag ? tag : "ns1:studyInvestigation", id, type))
     return soap->error;
@@ -16134,7 +16188,7 @@ soap_get_ns1__studyInvestigation(struct soap *soap, ns1__studyInvestigation *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__studyInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -16149,9 +16203,9 @@ soap_instantiate_ns1__studyInvestigation(struct soap *soap, int n,
                       "soap_instantiate_ns1__studyInvestigation(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__studyInvestigation, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__studyInvestigation, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__studyInvestigation);
     if (size)
@@ -16188,13 +16242,13 @@ void ns1__study::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__study::description = NULL;
-  this->ns1__study::name = NULL;
-  this->ns1__study::startDate = NULL;
-  this->ns1__study::status = NULL;
+  this->ns1__study::description = nullptr;
+  this->ns1__study::name = nullptr;
+  this->ns1__study::startDate = nullptr;
+  this->ns1__study::status = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__studyInvestigation(
       soap, &this->ns1__study::studyInvestigations);
-  this->ns1__study::user = NULL;
+  this->ns1__study::user = nullptr;
 }
 
 void ns1__study::soap_serialize(struct soap *soap) const {
@@ -16270,13 +16324,13 @@ SOAP_FMAC3 ns1__study *SOAP_FMAC4
 soap_in_ns1__study(struct soap *soap, const char *tag, ns1__study *a,
                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__study *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__study, sizeof(ns1__study),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__study) {
@@ -16387,24 +16441,24 @@ soap_in_ns1__study(struct soap *soap, const char *tag, ns1__study *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__study *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__study, 0,
         sizeof(ns1__study), 0, soap_copy_ns1__study);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__study::soap_put(struct soap *soap, const char *tag,
                          const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__study);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_ns1__study);
   if (this->soap_out(soap, tag ? tag : "ns1:study", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -16420,7 +16474,7 @@ soap_get_ns1__study(struct soap *soap, ns1__study *p, const char *tag,
                     const char *type) {
   if ((p = soap_in_ns1__study(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -16432,9 +16486,9 @@ soap_instantiate_ns1__study(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__study(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__study, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__study, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__study);
     if (size)
@@ -16470,9 +16524,9 @@ void ns1__investigationUser::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__investigationUser::investigation = NULL;
-  this->ns1__investigationUser::role = NULL;
-  this->ns1__investigationUser::user = NULL;
+  this->ns1__investigationUser::investigation = nullptr;
+  this->ns1__investigationUser::role = nullptr;
+  this->ns1__investigationUser::user = nullptr;
 }
 
 void ns1__investigationUser::soap_serialize(struct soap *soap) const {
@@ -16540,13 +16594,13 @@ SOAP_FMAC3 ns1__investigationUser *SOAP_FMAC4
 soap_in_ns1__investigationUser(struct soap *soap, const char *tag,
                                ns1__investigationUser *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__investigationUser *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__investigationUser,
       sizeof(ns1__investigationUser), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__investigationUser) {
@@ -16637,23 +16691,23 @@ soap_in_ns1__investigationUser(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__investigationUser *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__investigationUser,
         0, sizeof(ns1__investigationUser), 0, soap_copy_ns1__investigationUser);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__investigationUser::soap_put(struct soap *soap, const char *tag,
                                      const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__investigationUser);
   if (this->soap_out(soap, tag ? tag : "ns1:investigationUser", id, type))
     return soap->error;
@@ -16670,7 +16724,7 @@ soap_get_ns1__investigationUser(struct soap *soap, ns1__investigationUser *p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_ns1__investigationUser(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -16685,9 +16739,9 @@ soap_instantiate_ns1__investigationUser(struct soap *soap, int n,
                       "soap_instantiate_ns1__investigationUser(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__investigationUser, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__investigationUser, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__investigationUser);
     if (size)
@@ -16724,12 +16778,12 @@ void ns1__user::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__user::fullName = NULL;
+  this->ns1__user::fullName = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__instrumentScientist(
       soap, &this->ns1__user::instrumentScientists);
   soap_default_std__vectorTemplateOfPointerTons1__investigationUser(
       soap, &this->ns1__user::investigationUsers);
-  this->ns1__user::name = NULL;
+  this->ns1__user::name = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__study(
       soap, &this->ns1__user::studies);
   soap_default_std__vectorTemplateOfPointerTons1__userGroup(
@@ -16813,13 +16867,13 @@ SOAP_FMAC3 ns1__user *SOAP_FMAC4
 soap_in_ns1__user(struct soap *soap, const char *tag, ns1__user *a,
                   const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__user *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__user, sizeof(ns1__user),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__user) {
@@ -16921,24 +16975,24 @@ soap_in_ns1__user(struct soap *soap, const char *tag, ns1__user *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__user *)soap_id_forward(soap, soap->href, (void *)a, 0,
                                      SOAP_TYPE_ICat4_ns1__user, 0,
                                      sizeof(ns1__user), 0, soap_copy_ns1__user);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__user::soap_put(struct soap *soap, const char *tag,
                         const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__user);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_ns1__user);
   if (this->soap_out(soap, tag ? tag : "ns1:user", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -16954,7 +17008,7 @@ soap_get_ns1__user(struct soap *soap, ns1__user *p, const char *tag,
                    const char *type) {
   if ((p = soap_in_ns1__user(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -16966,9 +17020,9 @@ soap_instantiate_ns1__user(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__user(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__user, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__user, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__user);
     if (size)
@@ -17004,8 +17058,8 @@ void ns1__instrumentScientist::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__instrumentScientist::instrument = NULL;
-  this->ns1__instrumentScientist::user = NULL;
+  this->ns1__instrumentScientist::instrument = nullptr;
+  this->ns1__instrumentScientist::user = nullptr;
 }
 
 void ns1__instrumentScientist::soap_serialize(struct soap *soap) const {
@@ -17070,13 +17124,13 @@ soap_in_ns1__instrumentScientist(struct soap *soap, const char *tag,
                                  ns1__instrumentScientist *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__instrumentScientist *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__instrumentScientist,
       sizeof(ns1__instrumentScientist), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__instrumentScientist) {
@@ -17158,10 +17212,10 @@ soap_in_ns1__instrumentScientist(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__instrumentScientist *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -17169,14 +17223,14 @@ soap_in_ns1__instrumentScientist(struct soap *soap, const char *tag,
         sizeof(ns1__instrumentScientist), 0,
         soap_copy_ns1__instrumentScientist);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__instrumentScientist::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__instrumentScientist);
   if (this->soap_out(soap, tag ? tag : "ns1:instrumentScientist", id, type))
     return soap->error;
@@ -17194,7 +17248,7 @@ soap_get_ns1__instrumentScientist(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__instrumentScientist(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -17208,10 +17262,11 @@ soap_instantiate_ns1__instrumentScientist(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__instrumentScientist(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__instrumentScientist, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__instrumentScientist, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__instrumentScientist);
     if (size)
@@ -17249,16 +17304,16 @@ void ns1__instrument::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__instrument::description = NULL;
-  this->ns1__instrument::facility = NULL;
-  this->ns1__instrument::fullName = NULL;
+  this->ns1__instrument::description = nullptr;
+  this->ns1__instrument::facility = nullptr;
+  this->ns1__instrument::fullName = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__instrumentScientist(
       soap, &this->ns1__instrument::instrumentScientists);
   soap_default_std__vectorTemplateOfPointerTons1__investigationInstrument(
       soap, &this->ns1__instrument::investigationInstruments);
-  this->ns1__instrument::name = NULL;
-  this->ns1__instrument::type = NULL;
-  this->ns1__instrument::url = NULL;
+  this->ns1__instrument::name = nullptr;
+  this->ns1__instrument::type = nullptr;
+  this->ns1__instrument::url = nullptr;
 }
 
 void ns1__instrument::soap_serialize(struct soap *soap) const {
@@ -17347,13 +17402,13 @@ SOAP_FMAC3 ns1__instrument *SOAP_FMAC4
 soap_in_ns1__instrument(struct soap *soap, const char *tag, ns1__instrument *a,
                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__instrument *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__instrument,
       sizeof(ns1__instrument), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__instrument) {
@@ -17481,23 +17536,23 @@ soap_in_ns1__instrument(struct soap *soap, const char *tag, ns1__instrument *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__instrument *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__instrument, 0,
         sizeof(ns1__instrument), 0, soap_copy_ns1__instrument);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__instrument::soap_put(struct soap *soap, const char *tag,
                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__instrument);
   if (this->soap_out(soap, tag ? tag : "ns1:instrument", id, type))
     return soap->error;
@@ -17514,7 +17569,7 @@ soap_get_ns1__instrument(struct soap *soap, ns1__instrument *p, const char *tag,
                          const char *type) {
   if ((p = soap_in_ns1__instrument(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -17526,10 +17581,10 @@ soap_instantiate_ns1__instrument(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__instrument(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__instrument, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__instrument, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__instrument);
     if (size)
@@ -17566,11 +17621,11 @@ void ns1__facilityCycle::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__facilityCycle::description = NULL;
-  this->ns1__facilityCycle::endDate = NULL;
-  this->ns1__facilityCycle::facility = NULL;
-  this->ns1__facilityCycle::name = NULL;
-  this->ns1__facilityCycle::startDate = NULL;
+  this->ns1__facilityCycle::description = nullptr;
+  this->ns1__facilityCycle::endDate = nullptr;
+  this->ns1__facilityCycle::facility = nullptr;
+  this->ns1__facilityCycle::name = nullptr;
+  this->ns1__facilityCycle::startDate = nullptr;
 }
 
 void ns1__facilityCycle::soap_serialize(struct soap *soap) const {
@@ -17644,13 +17699,13 @@ SOAP_FMAC3 ns1__facilityCycle *SOAP_FMAC4
 soap_in_ns1__facilityCycle(struct soap *soap, const char *tag,
                            ns1__facilityCycle *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__facilityCycle *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__facilityCycle,
       sizeof(ns1__facilityCycle), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__facilityCycle) {
@@ -17757,23 +17812,23 @@ soap_in_ns1__facilityCycle(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__facilityCycle *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__facilityCycle, 0,
         sizeof(ns1__facilityCycle), 0, soap_copy_ns1__facilityCycle);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__facilityCycle::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__facilityCycle);
   if (this->soap_out(soap, tag ? tag : "ns1:facilityCycle", id, type))
     return soap->error;
@@ -17790,7 +17845,7 @@ soap_get_ns1__facilityCycle(struct soap *soap, ns1__facilityCycle *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__facilityCycle(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -17803,9 +17858,9 @@ soap_instantiate_ns1__facilityCycle(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__facilityCycle(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__facilityCycle, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__facilityCycle, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__facilityCycle);
     if (size)
@@ -17844,9 +17899,9 @@ void ns1__datasetType::soap_default(struct soap *soap) {
   this->xsd__anyType::soap_default(soap);
   soap_default_std__vectorTemplateOfPointerTons1__dataset(
       soap, &this->ns1__datasetType::datasets);
-  this->ns1__datasetType::description = NULL;
-  this->ns1__datasetType::facility = NULL;
-  this->ns1__datasetType::name = NULL;
+  this->ns1__datasetType::description = nullptr;
+  this->ns1__datasetType::facility = nullptr;
+  this->ns1__datasetType::name = nullptr;
 }
 
 void ns1__datasetType::soap_serialize(struct soap *soap) const {
@@ -17917,13 +17972,13 @@ SOAP_FMAC3 ns1__datasetType *SOAP_FMAC4
 soap_in_ns1__datasetType(struct soap *soap, const char *tag,
                          ns1__datasetType *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__datasetType *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__datasetType,
       sizeof(ns1__datasetType), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__datasetType) {
@@ -18019,23 +18074,23 @@ soap_in_ns1__datasetType(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__datasetType *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__datasetType, 0,
         sizeof(ns1__datasetType), 0, soap_copy_ns1__datasetType);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__datasetType::soap_put(struct soap *soap, const char *tag,
                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__datasetType);
   if (this->soap_out(soap, tag ? tag : "ns1:datasetType", id, type))
     return soap->error;
@@ -18052,7 +18107,7 @@ soap_get_ns1__datasetType(struct soap *soap, ns1__datasetType *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__datasetType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -18064,10 +18119,10 @@ soap_instantiate_ns1__datasetType(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__datasetType(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__datasetType, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__datasetType, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__datasetType);
     if (size)
@@ -18106,11 +18161,11 @@ void ns1__datafileFormat::soap_default(struct soap *soap) {
   this->xsd__anyType::soap_default(soap);
   soap_default_std__vectorTemplateOfPointerTons1__datafile(
       soap, &this->ns1__datafileFormat::datafiles);
-  this->ns1__datafileFormat::description = NULL;
-  this->ns1__datafileFormat::facility = NULL;
-  this->ns1__datafileFormat::name = NULL;
-  this->ns1__datafileFormat::type = NULL;
-  this->ns1__datafileFormat::version = NULL;
+  this->ns1__datafileFormat::description = nullptr;
+  this->ns1__datafileFormat::facility = nullptr;
+  this->ns1__datafileFormat::name = nullptr;
+  this->ns1__datafileFormat::type = nullptr;
+  this->ns1__datafileFormat::version = nullptr;
 }
 
 void ns1__datafileFormat::soap_serialize(struct soap *soap) const {
@@ -18190,13 +18245,13 @@ SOAP_FMAC3 ns1__datafileFormat *SOAP_FMAC4
 soap_in_ns1__datafileFormat(struct soap *soap, const char *tag,
                             ns1__datafileFormat *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__datafileFormat *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__datafileFormat,
       sizeof(ns1__datafileFormat), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__datafileFormat) {
@@ -18309,23 +18364,23 @@ soap_in_ns1__datafileFormat(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__datafileFormat *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__datafileFormat, 0,
         sizeof(ns1__datafileFormat), 0, soap_copy_ns1__datafileFormat);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__datafileFormat::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__datafileFormat);
   if (this->soap_out(soap, tag ? tag : "ns1:datafileFormat", id, type))
     return soap->error;
@@ -18342,7 +18397,7 @@ soap_get_ns1__datafileFormat(struct soap *soap, ns1__datafileFormat *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__datafileFormat(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -18355,9 +18410,9 @@ soap_instantiate_ns1__datafileFormat(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__datafileFormat(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__datafileFormat, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__datafileFormat, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__datafileFormat);
     if (size)
@@ -18394,10 +18449,10 @@ void ns1__job::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__job::application = NULL;
-  this->ns1__job::arguments = NULL;
-  this->ns1__job::inputDataCollection = NULL;
-  this->ns1__job::outputDataCollection = NULL;
+  this->ns1__job::application = nullptr;
+  this->ns1__job::arguments = nullptr;
+  this->ns1__job::inputDataCollection = nullptr;
+  this->ns1__job::outputDataCollection = nullptr;
 }
 
 void ns1__job::soap_serialize(struct soap *soap) const {
@@ -18467,13 +18522,13 @@ SOAP_FMAC3 ns1__job *SOAP_FMAC4 soap_in_ns1__job(struct soap *soap,
                                                  const char *tag, ns1__job *a,
                                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__job *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__job, sizeof(ns1__job), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__job) {
@@ -18571,16 +18626,16 @@ SOAP_FMAC3 ns1__job *SOAP_FMAC4 soap_in_ns1__job(struct soap *soap,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__job *)soap_id_forward(soap, soap->href, (void *)a, 0,
                                     SOAP_TYPE_ICat4_ns1__job, 0,
                                     sizeof(ns1__job), 0, soap_copy_ns1__job);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -18588,7 +18643,7 @@ SOAP_FMAC3 ns1__job *SOAP_FMAC4 soap_in_ns1__job(struct soap *soap,
 int ns1__job::soap_put(struct soap *soap, const char *tag,
                        const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__job);
+      soap_embed(soap, (void *)this, nullptr, 0, tag, SOAP_TYPE_ICat4_ns1__job);
   if (this->soap_out(soap, tag ? tag : "ns1:job", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -18603,7 +18658,7 @@ SOAP_FMAC3 ns1__job *SOAP_FMAC4 soap_get_ns1__job(struct soap *soap,
                                                   const char *type) {
   if ((p = soap_in_ns1__job(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -18615,9 +18670,9 @@ soap_instantiate_ns1__job(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__job(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__job, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__job, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__job);
     if (size)
@@ -18653,11 +18708,11 @@ void ns1__application::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__application::facility = NULL;
+  this->ns1__application::facility = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__job(
       soap, &this->ns1__application::jobs);
-  this->ns1__application::name = NULL;
-  this->ns1__application::version = NULL;
+  this->ns1__application::name = nullptr;
+  this->ns1__application::version = nullptr;
 }
 
 void ns1__application::soap_serialize(struct soap *soap) const {
@@ -18727,13 +18782,13 @@ SOAP_FMAC3 ns1__application *SOAP_FMAC4
 soap_in_ns1__application(struct soap *soap, const char *tag,
                          ns1__application *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__application *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__application,
       sizeof(ns1__application), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__application) {
@@ -18828,23 +18883,23 @@ soap_in_ns1__application(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__application *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__application, 0,
         sizeof(ns1__application), 0, soap_copy_ns1__application);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__application::soap_put(struct soap *soap, const char *tag,
                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__application);
   if (this->soap_out(soap, tag ? tag : "ns1:application", id, type))
     return soap->error;
@@ -18861,7 +18916,7 @@ soap_get_ns1__application(struct soap *soap, ns1__application *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__application(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -18873,10 +18928,10 @@ soap_instantiate_ns1__application(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__application(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__application, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__application, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__application);
     if (size)
@@ -18919,23 +18974,23 @@ void ns1__facility::soap_default(struct soap *soap) {
       soap, &this->ns1__facility::datafileFormats);
   soap_default_std__vectorTemplateOfPointerTons1__datasetType(
       soap, &this->ns1__facility::datasetTypes);
-  this->ns1__facility::daysUntilRelease = NULL;
-  this->ns1__facility::description = NULL;
+  this->ns1__facility::daysUntilRelease = nullptr;
+  this->ns1__facility::description = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__facilityCycle(
       soap, &this->ns1__facility::facilityCycles);
-  this->ns1__facility::fullName = NULL;
+  this->ns1__facility::fullName = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__instrument(
       soap, &this->ns1__facility::instruments);
   soap_default_std__vectorTemplateOfPointerTons1__investigationType(
       soap, &this->ns1__facility::investigationTypes);
   soap_default_std__vectorTemplateOfPointerTons1__investigation(
       soap, &this->ns1__facility::investigations);
-  this->ns1__facility::name = NULL;
+  this->ns1__facility::name = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__parameterType(
       soap, &this->ns1__facility::parameterTypes);
   soap_default_std__vectorTemplateOfPointerTons1__sampleType(
       soap, &this->ns1__facility::sampleTypes);
-  this->ns1__facility::url = NULL;
+  this->ns1__facility::url = nullptr;
 }
 
 void ns1__facility::soap_serialize(struct soap *soap) const {
@@ -19054,13 +19109,13 @@ SOAP_FMAC3 ns1__facility *SOAP_FMAC4
 soap_in_ns1__facility(struct soap *soap, const char *tag, ns1__facility *a,
                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__facility *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__facility, sizeof(ns1__facility),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__facility) {
@@ -19214,23 +19269,23 @@ soap_in_ns1__facility(struct soap *soap, const char *tag, ns1__facility *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__facility *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__facility, 0,
         sizeof(ns1__facility), 0, soap_copy_ns1__facility);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__facility::soap_put(struct soap *soap, const char *tag,
                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__facility);
   if (this->soap_out(soap, tag ? tag : "ns1:facility", id, type))
     return soap->error;
@@ -19247,7 +19302,7 @@ soap_get_ns1__facility(struct soap *soap, ns1__facility *p, const char *tag,
                        const char *type) {
   if ((p = soap_in_ns1__facility(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -19260,9 +19315,9 @@ soap_instantiate_ns1__facility(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__facility(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__facility, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__facility, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__facility);
     if (size)
@@ -19300,32 +19355,32 @@ void ns1__investigation::soap_default(struct soap *soap) {
   this->xsd__anyType::soap_default(soap);
   soap_default_std__vectorTemplateOfPointerTons1__dataset(
       soap, &this->ns1__investigation::datasets);
-  this->ns1__investigation::doi = NULL;
-  this->ns1__investigation::endDate = NULL;
-  this->ns1__investigation::facility = NULL;
+  this->ns1__investigation::doi = nullptr;
+  this->ns1__investigation::endDate = nullptr;
+  this->ns1__investigation::facility = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__investigationInstrument(
       soap, &this->ns1__investigation::investigationInstruments);
   soap_default_std__vectorTemplateOfPointerTons1__investigationUser(
       soap, &this->ns1__investigation::investigationUsers);
   soap_default_std__vectorTemplateOfPointerTons1__keyword(
       soap, &this->ns1__investigation::keywords);
-  this->ns1__investigation::name = NULL;
+  this->ns1__investigation::name = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__investigationParameter(
       soap, &this->ns1__investigation::parameters);
   soap_default_std__vectorTemplateOfPointerTons1__publication(
       soap, &this->ns1__investigation::publications);
-  this->ns1__investigation::releaseDate = NULL;
+  this->ns1__investigation::releaseDate = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__sample(
       soap, &this->ns1__investigation::samples);
   soap_default_std__vectorTemplateOfPointerTons1__shift(
       soap, &this->ns1__investigation::shifts);
-  this->ns1__investigation::startDate = NULL;
+  this->ns1__investigation::startDate = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__studyInvestigation(
       soap, &this->ns1__investigation::studyInvestigations);
-  this->ns1__investigation::summary = NULL;
-  this->ns1__investigation::title = NULL;
-  this->ns1__investigation::type = NULL;
-  this->ns1__investigation::visitId = NULL;
+  this->ns1__investigation::summary = nullptr;
+  this->ns1__investigation::title = nullptr;
+  this->ns1__investigation::type = nullptr;
+  this->ns1__investigation::visitId = nullptr;
 }
 
 void ns1__investigation::soap_serialize(struct soap *soap) const {
@@ -19467,13 +19522,13 @@ SOAP_FMAC3 ns1__investigation *SOAP_FMAC4
 soap_in_ns1__investigation(struct soap *soap, const char *tag,
                            ns1__investigation *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__investigation *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__investigation,
       sizeof(ns1__investigation), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__investigation) {
@@ -19668,23 +19723,23 @@ soap_in_ns1__investigation(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__investigation *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__investigation, 0,
         sizeof(ns1__investigation), 0, soap_copy_ns1__investigation);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__investigation::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__investigation);
   if (this->soap_out(soap, tag ? tag : "ns1:investigation", id, type))
     return soap->error;
@@ -19701,7 +19756,7 @@ soap_get_ns1__investigation(struct soap *soap, ns1__investigation *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__investigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -19714,9 +19769,9 @@ soap_instantiate_ns1__investigation(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__investigation(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__investigation, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__investigation, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__investigation);
     if (size)
@@ -19758,17 +19813,17 @@ void ns1__dataset::soap_default(struct soap *soap) {
       soap, &this->ns1__dataset::dataCollectionDatasets);
   soap_default_std__vectorTemplateOfPointerTons1__datafile(
       soap, &this->ns1__dataset::datafiles);
-  this->ns1__dataset::description = NULL;
-  this->ns1__dataset::doi = NULL;
-  this->ns1__dataset::endDate = NULL;
-  this->ns1__dataset::investigation = NULL;
-  this->ns1__dataset::location = NULL;
-  this->ns1__dataset::name = NULL;
+  this->ns1__dataset::description = nullptr;
+  this->ns1__dataset::doi = nullptr;
+  this->ns1__dataset::endDate = nullptr;
+  this->ns1__dataset::investigation = nullptr;
+  this->ns1__dataset::location = nullptr;
+  this->ns1__dataset::name = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__datasetParameter(
       soap, &this->ns1__dataset::parameters);
-  this->ns1__dataset::sample = NULL;
-  this->ns1__dataset::startDate = NULL;
-  this->ns1__dataset::type = NULL;
+  this->ns1__dataset::sample = nullptr;
+  this->ns1__dataset::startDate = nullptr;
+  this->ns1__dataset::type = nullptr;
 }
 
 void ns1__dataset::soap_serialize(struct soap *soap) const {
@@ -19875,13 +19930,13 @@ SOAP_FMAC3 ns1__dataset *SOAP_FMAC4
 soap_in_ns1__dataset(struct soap *soap, const char *tag, ns1__dataset *a,
                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__dataset *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__dataset, sizeof(ns1__dataset),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__dataset) {
@@ -20040,27 +20095,27 @@ soap_in_ns1__dataset(struct soap *soap, const char *tag, ns1__dataset *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__dataset *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__dataset, 0,
         sizeof(ns1__dataset), 0, soap_copy_ns1__dataset);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_complete1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__dataset::soap_put(struct soap *soap, const char *tag,
                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__dataset);
   if (this->soap_out(soap, tag ? tag : "ns1:dataset", id, type))
     return soap->error;
@@ -20077,7 +20132,7 @@ soap_get_ns1__dataset(struct soap *soap, ns1__dataset *p, const char *tag,
                       const char *type) {
   if ((p = soap_in_ns1__dataset(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -20090,9 +20145,9 @@ soap_instantiate_ns1__dataset(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__dataset(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__dataset, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__dataset, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__dataset);
     if (size)
@@ -20128,8 +20183,8 @@ void ns1__dataCollectionDataset::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__dataCollectionDataset::dataCollection = NULL;
-  this->ns1__dataCollectionDataset::dataset = NULL;
+  this->ns1__dataCollectionDataset::dataCollection = nullptr;
+  this->ns1__dataCollectionDataset::dataset = nullptr;
 }
 
 void ns1__dataCollectionDataset::soap_serialize(struct soap *soap) const {
@@ -20195,13 +20250,13 @@ soap_in_ns1__dataCollectionDataset(struct soap *soap, const char *tag,
                                    ns1__dataCollectionDataset *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__dataCollectionDataset *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__dataCollectionDataset,
       sizeof(ns1__dataCollectionDataset), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__dataCollectionDataset) {
@@ -20284,10 +20339,10 @@ soap_in_ns1__dataCollectionDataset(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__dataCollectionDataset *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -20295,14 +20350,14 @@ soap_in_ns1__dataCollectionDataset(struct soap *soap, const char *tag,
         sizeof(ns1__dataCollectionDataset), 0,
         soap_copy_ns1__dataCollectionDataset);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__dataCollectionDataset::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__dataCollectionDataset);
   if (this->soap_out(soap, tag ? tag : "ns1:dataCollectionDataset", id, type))
     return soap->error;
@@ -20320,7 +20375,7 @@ soap_get_ns1__dataCollectionDataset(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__dataCollectionDataset(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -20335,10 +20390,11 @@ soap_instantiate_ns1__dataCollectionDataset(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__dataCollectionDataset(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__dataCollectionDataset, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__dataCollectionDataset, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__dataCollectionDataset);
     if (size)
@@ -20465,13 +20521,13 @@ SOAP_FMAC3 ns1__dataCollection *SOAP_FMAC4
 soap_in_ns1__dataCollection(struct soap *soap, const char *tag,
                             ns1__dataCollection *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__dataCollection *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__dataCollection,
       sizeof(ns1__dataCollection), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__dataCollection) {
@@ -20564,23 +20620,23 @@ soap_in_ns1__dataCollection(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__dataCollection *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__dataCollection, 0,
         sizeof(ns1__dataCollection), 0, soap_copy_ns1__dataCollection);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__dataCollection::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__dataCollection);
   if (this->soap_out(soap, tag ? tag : "ns1:dataCollection", id, type))
     return soap->error;
@@ -20597,7 +20653,7 @@ soap_get_ns1__dataCollection(struct soap *soap, ns1__dataCollection *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__dataCollection(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -20610,9 +20666,9 @@ soap_instantiate_ns1__dataCollection(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__dataCollection(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__dataCollection, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__dataCollection, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__dataCollection);
     if (size)
@@ -20649,8 +20705,8 @@ void ns1__dataCollectionDatafile::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__dataCollectionDatafile::dataCollection = NULL;
-  this->ns1__dataCollectionDatafile::datafile = NULL;
+  this->ns1__dataCollectionDatafile::dataCollection = nullptr;
+  this->ns1__dataCollectionDatafile::datafile = nullptr;
 }
 
 void ns1__dataCollectionDatafile::soap_serialize(struct soap *soap) const {
@@ -20717,13 +20773,13 @@ soap_in_ns1__dataCollectionDatafile(struct soap *soap, const char *tag,
                                     ns1__dataCollectionDatafile *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__dataCollectionDatafile *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__dataCollectionDatafile,
       sizeof(ns1__dataCollectionDatafile), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__dataCollectionDatafile) {
@@ -20806,10 +20862,10 @@ soap_in_ns1__dataCollectionDatafile(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__dataCollectionDatafile *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -20817,14 +20873,14 @@ soap_in_ns1__dataCollectionDatafile(struct soap *soap, const char *tag,
         sizeof(ns1__dataCollectionDatafile), 0,
         soap_copy_ns1__dataCollectionDatafile);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__dataCollectionDatafile::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__dataCollectionDatafile);
   if (this->soap_out(soap, tag ? tag : "ns1:dataCollectionDatafile", id, type))
     return soap->error;
@@ -20842,7 +20898,7 @@ soap_get_ns1__dataCollectionDatafile(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__dataCollectionDatafile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -20858,10 +20914,10 @@ soap_instantiate_ns1__dataCollectionDatafile(struct soap *soap, int n,
                    "soap_instantiate_ns1__dataCollectionDatafile(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__dataCollectionDatafile, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__dataCollectionDatafile, n,
                 ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__dataCollectionDatafile);
     if (size)
@@ -20900,20 +20956,20 @@ void ns1__datafile::soap_default(struct soap *soap) {
   this->soap = soap;
   this->ns1__entityBaseBean::soap_default(soap);
   this->xsd__anyType::soap_default(soap);
-  this->ns1__datafile::checksum = NULL;
+  this->ns1__datafile::checksum = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__dataCollectionDatafile(
       soap, &this->ns1__datafile::dataCollectionDatafiles);
-  this->ns1__datafile::datafileCreateTime = NULL;
-  this->ns1__datafile::datafileFormat = NULL;
-  this->ns1__datafile::datafileModTime = NULL;
-  this->ns1__datafile::dataset = NULL;
-  this->ns1__datafile::description = NULL;
+  this->ns1__datafile::datafileCreateTime = nullptr;
+  this->ns1__datafile::datafileFormat = nullptr;
+  this->ns1__datafile::datafileModTime = nullptr;
+  this->ns1__datafile::dataset = nullptr;
+  this->ns1__datafile::description = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__relatedDatafile(
       soap, &this->ns1__datafile::destDatafiles);
-  this->ns1__datafile::doi = NULL;
-  this->ns1__datafile::fileSize = NULL;
-  this->ns1__datafile::location = NULL;
-  this->ns1__datafile::name = NULL;
+  this->ns1__datafile::doi = nullptr;
+  this->ns1__datafile::fileSize = nullptr;
+  this->ns1__datafile::location = nullptr;
+  this->ns1__datafile::name = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__datafileParameter(
       soap, &this->ns1__datafile::parameters);
   soap_default_std__vectorTemplateOfPointerTons1__relatedDatafile(
@@ -21032,13 +21088,13 @@ SOAP_FMAC3 ns1__datafile *SOAP_FMAC4
 soap_in_ns1__datafile(struct soap *soap, const char *tag, ns1__datafile *a,
                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__datafile *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__datafile, sizeof(ns1__datafile),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__datafile) {
@@ -21206,23 +21262,23 @@ soap_in_ns1__datafile(struct soap *soap, const char *tag, ns1__datafile *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__datafile *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__datafile, 0,
         sizeof(ns1__datafile), 0, soap_copy_ns1__datafile);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__datafile::soap_put(struct soap *soap, const char *tag,
                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__datafile);
   if (this->soap_out(soap, tag ? tag : "ns1:datafile", id, type))
     return soap->error;
@@ -21239,7 +21295,7 @@ soap_get_ns1__datafile(struct soap *soap, ns1__datafile *p, const char *tag,
                        const char *type) {
   if ((p = soap_in_ns1__datafile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -21252,9 +21308,9 @@ soap_instantiate_ns1__datafile(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__datafile(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__datafile, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__datafile, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__datafile);
     if (size)
@@ -21289,40 +21345,40 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__datafile(struct soap *soap, int st,
 void ns1__dummy::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__dummy::arg0 = NULL;
-  this->ns1__dummy::arg1 = NULL;
-  this->ns1__dummy::arg2 = NULL;
-  this->ns1__dummy::arg3 = NULL;
-  this->ns1__dummy::arg4 = NULL;
-  this->ns1__dummy::arg5 = NULL;
-  this->ns1__dummy::arg6 = NULL;
-  this->ns1__dummy::arg7 = NULL;
-  this->ns1__dummy::arg8 = NULL;
-  this->ns1__dummy::arg9 = NULL;
-  this->ns1__dummy::arg10 = NULL;
-  this->ns1__dummy::arg11 = NULL;
-  this->ns1__dummy::arg12 = NULL;
-  this->ns1__dummy::arg13 = NULL;
-  this->ns1__dummy::arg14 = NULL;
-  this->ns1__dummy::arg15 = NULL;
-  this->ns1__dummy::arg16 = NULL;
-  this->ns1__dummy::arg17 = NULL;
-  this->ns1__dummy::arg18 = NULL;
-  this->ns1__dummy::arg19 = NULL;
-  this->ns1__dummy::arg20 = NULL;
-  this->ns1__dummy::arg21 = NULL;
-  this->ns1__dummy::arg22 = NULL;
-  this->ns1__dummy::arg23 = NULL;
-  this->ns1__dummy::arg24 = NULL;
-  this->ns1__dummy::arg25 = NULL;
-  this->ns1__dummy::arg26 = NULL;
-  this->ns1__dummy::arg27 = NULL;
-  this->ns1__dummy::arg28 = NULL;
-  this->ns1__dummy::arg29 = NULL;
-  this->ns1__dummy::arg30 = NULL;
-  this->ns1__dummy::arg31 = NULL;
-  this->ns1__dummy::arg32 = NULL;
-  this->ns1__dummy::arg33 = NULL;
+  this->ns1__dummy::arg0 = nullptr;
+  this->ns1__dummy::arg1 = nullptr;
+  this->ns1__dummy::arg2 = nullptr;
+  this->ns1__dummy::arg3 = nullptr;
+  this->ns1__dummy::arg4 = nullptr;
+  this->ns1__dummy::arg5 = nullptr;
+  this->ns1__dummy::arg6 = nullptr;
+  this->ns1__dummy::arg7 = nullptr;
+  this->ns1__dummy::arg8 = nullptr;
+  this->ns1__dummy::arg9 = nullptr;
+  this->ns1__dummy::arg10 = nullptr;
+  this->ns1__dummy::arg11 = nullptr;
+  this->ns1__dummy::arg12 = nullptr;
+  this->ns1__dummy::arg13 = nullptr;
+  this->ns1__dummy::arg14 = nullptr;
+  this->ns1__dummy::arg15 = nullptr;
+  this->ns1__dummy::arg16 = nullptr;
+  this->ns1__dummy::arg17 = nullptr;
+  this->ns1__dummy::arg18 = nullptr;
+  this->ns1__dummy::arg19 = nullptr;
+  this->ns1__dummy::arg20 = nullptr;
+  this->ns1__dummy::arg21 = nullptr;
+  this->ns1__dummy::arg22 = nullptr;
+  this->ns1__dummy::arg23 = nullptr;
+  this->ns1__dummy::arg24 = nullptr;
+  this->ns1__dummy::arg25 = nullptr;
+  this->ns1__dummy::arg26 = nullptr;
+  this->ns1__dummy::arg27 = nullptr;
+  this->ns1__dummy::arg28 = nullptr;
+  this->ns1__dummy::arg29 = nullptr;
+  this->ns1__dummy::arg30 = nullptr;
+  this->ns1__dummy::arg31 = nullptr;
+  this->ns1__dummy::arg32 = nullptr;
+  this->ns1__dummy::arg33 = nullptr;
 }
 
 void ns1__dummy::soap_serialize(struct soap *soap) const {
@@ -21499,13 +21555,13 @@ SOAP_FMAC3 ns1__dummy *SOAP_FMAC4
 soap_in_ns1__dummy(struct soap *soap, const char *tag, ns1__dummy *a,
                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__dummy *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__dummy, sizeof(ns1__dummy),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__dummy) {
@@ -21778,24 +21834,24 @@ soap_in_ns1__dummy(struct soap *soap, const char *tag, ns1__dummy *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__dummy *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__dummy, 0,
         sizeof(ns1__dummy), 0, soap_copy_ns1__dummy);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__dummy::soap_put(struct soap *soap, const char *tag,
                          const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__dummy);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_ns1__dummy);
   if (this->soap_out(soap, tag ? tag : "ns1:dummy", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -21811,7 +21867,7 @@ soap_get_ns1__dummy(struct soap *soap, ns1__dummy *p, const char *tag,
                     const char *type) {
   if ((p = soap_in_ns1__dummy(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -21823,9 +21879,9 @@ soap_instantiate_ns1__dummy(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__dummy(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__dummy, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__dummy, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__dummy);
     if (size)
@@ -21860,7 +21916,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__dummy(struct soap *soap, int st,
 void ns1__loginResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__loginResponse::return_ = NULL;
+  this->ns1__loginResponse::return_ = nullptr;
 }
 
 void ns1__loginResponse::soap_serialize(struct soap *soap) const {
@@ -21900,13 +21956,13 @@ SOAP_FMAC3 ns1__loginResponse *SOAP_FMAC4
 soap_in_ns1__loginResponse(struct soap *soap, const char *tag,
                            ns1__loginResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__loginResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__loginResponse,
       sizeof(ns1__loginResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__loginResponse) {
@@ -21940,23 +21996,23 @@ soap_in_ns1__loginResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__loginResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__loginResponse, 0,
         sizeof(ns1__loginResponse), 0, soap_copy_ns1__loginResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__loginResponse::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__loginResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:loginResponse", id, type))
     return soap->error;
@@ -21973,7 +22029,7 @@ soap_get_ns1__loginResponse(struct soap *soap, ns1__loginResponse *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__loginResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -21986,9 +22042,9 @@ soap_instantiate_ns1__loginResponse(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__loginResponse(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__loginResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__loginResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__loginResponse);
     if (size)
@@ -22024,7 +22080,7 @@ soap_copy_ns1__loginResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__login::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__login::plugin = NULL;
+  this->ns1__login::plugin = nullptr;
   this->ns1__login::credentials._ns1__login_credentials::soap_default(soap);
 }
 
@@ -22067,13 +22123,13 @@ SOAP_FMAC3 ns1__login *SOAP_FMAC4
 soap_in_ns1__login(struct soap *soap, const char *tag, ns1__login *a,
                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__login *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__login, sizeof(ns1__login),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__login) {
@@ -22112,28 +22168,28 @@ soap_in_ns1__login(struct soap *soap, const char *tag, ns1__login *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__login *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__login, 0,
         sizeof(ns1__login), 0, soap_copy_ns1__login);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_credentials1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__login::soap_put(struct soap *soap, const char *tag,
                          const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__login);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_ns1__login);
   if (this->soap_out(soap, tag ? tag : "ns1:login", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -22149,7 +22205,7 @@ soap_get_ns1__login(struct soap *soap, ns1__login *p, const char *tag,
                     const char *type) {
   if ((p = soap_in_ns1__login(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -22161,9 +22217,9 @@ soap_instantiate_ns1__login(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__login(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__login, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__login, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__login);
     if (size)
@@ -22228,13 +22284,13 @@ SOAP_FMAC3 ns1__refreshResponse *SOAP_FMAC4
 soap_in_ns1__refreshResponse(struct soap *soap, const char *tag,
                              ns1__refreshResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__refreshResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__refreshResponse,
             sizeof(ns1__refreshResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -22244,13 +22300,13 @@ soap_in_ns1__refreshResponse(struct soap *soap, const char *tag,
       return (ns1__refreshResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__refreshResponse::soap_put(struct soap *soap, const char *tag,
                                    const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__refreshResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:refreshResponse", id, type))
     return soap->error;
@@ -22267,7 +22323,7 @@ soap_get_ns1__refreshResponse(struct soap *soap, ns1__refreshResponse *p,
                               const char *tag, const char *type) {
   if ((p = soap_in_ns1__refreshResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -22282,9 +22338,9 @@ soap_instantiate_ns1__refreshResponse(struct soap *soap, int n,
                       "soap_instantiate_ns1__refreshResponse(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__refreshResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__refreshResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__refreshResponse);
     if (size)
@@ -22320,7 +22376,7 @@ soap_copy_ns1__refreshResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__refresh::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__refresh::sessionId = NULL;
+  this->ns1__refresh::sessionId = nullptr;
 }
 
 void ns1__refresh::soap_serialize(struct soap *soap) const {
@@ -22360,13 +22416,13 @@ SOAP_FMAC3 ns1__refresh *SOAP_FMAC4
 soap_in_ns1__refresh(struct soap *soap, const char *tag, ns1__refresh *a,
                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__refresh *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__refresh, sizeof(ns1__refresh),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__refresh) {
@@ -22400,23 +22456,23 @@ soap_in_ns1__refresh(struct soap *soap, const char *tag, ns1__refresh *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__refresh *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__refresh, 0,
         sizeof(ns1__refresh), 0, soap_copy_ns1__refresh);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__refresh::soap_put(struct soap *soap, const char *tag,
                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__refresh);
   if (this->soap_out(soap, tag ? tag : "ns1:refresh", id, type))
     return soap->error;
@@ -22433,7 +22489,7 @@ soap_get_ns1__refresh(struct soap *soap, ns1__refresh *p, const char *tag,
                       const char *type) {
   if ((p = soap_in_ns1__refresh(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -22446,9 +22502,9 @@ soap_instantiate_ns1__refresh(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__refresh(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__refresh, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__refresh, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__refresh);
     if (size)
@@ -22483,7 +22539,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__refresh(struct soap *soap, int st,
 void ns1__getUserNameResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getUserNameResponse::return_ = NULL;
+  this->ns1__getUserNameResponse::return_ = nullptr;
 }
 
 void ns1__getUserNameResponse::soap_serialize(struct soap *soap) const {
@@ -22526,13 +22582,13 @@ soap_in_ns1__getUserNameResponse(struct soap *soap, const char *tag,
                                  ns1__getUserNameResponse *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getUserNameResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__getUserNameResponse,
       sizeof(ns1__getUserNameResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__getUserNameResponse) {
@@ -22566,10 +22622,10 @@ soap_in_ns1__getUserNameResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getUserNameResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -22577,14 +22633,14 @@ soap_in_ns1__getUserNameResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getUserNameResponse), 0,
         soap_copy_ns1__getUserNameResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getUserNameResponse::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__getUserNameResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getUserNameResponse", id, type))
     return soap->error;
@@ -22602,7 +22658,7 @@ soap_get_ns1__getUserNameResponse(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__getUserNameResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -22616,10 +22672,11 @@ soap_instantiate_ns1__getUserNameResponse(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__getUserNameResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__getUserNameResponse, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__getUserNameResponse, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getUserNameResponse);
     if (size)
@@ -22656,7 +22713,7 @@ soap_copy_ns1__getUserNameResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__getUserName::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getUserName::sessionId = NULL;
+  this->ns1__getUserName::sessionId = nullptr;
 }
 
 void ns1__getUserName::soap_serialize(struct soap *soap) const {
@@ -22696,13 +22753,13 @@ SOAP_FMAC3 ns1__getUserName *SOAP_FMAC4
 soap_in_ns1__getUserName(struct soap *soap, const char *tag,
                          ns1__getUserName *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getUserName *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__getUserName,
       sizeof(ns1__getUserName), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__getUserName) {
@@ -22736,23 +22793,23 @@ soap_in_ns1__getUserName(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getUserName *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__getUserName, 0,
         sizeof(ns1__getUserName), 0, soap_copy_ns1__getUserName);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getUserName::soap_put(struct soap *soap, const char *tag,
                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__getUserName);
   if (this->soap_out(soap, tag ? tag : "ns1:getUserName", id, type))
     return soap->error;
@@ -22769,7 +22826,7 @@ soap_get_ns1__getUserName(struct soap *soap, ns1__getUserName *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__getUserName(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -22781,10 +22838,10 @@ soap_instantiate_ns1__getUserName(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__getUserName(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__getUserName, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__getUserName, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getUserName);
     if (size)
@@ -22851,13 +22908,13 @@ SOAP_FMAC3 ns1__deleteManyResponse *SOAP_FMAC4
 soap_in_ns1__deleteManyResponse(struct soap *soap, const char *tag,
                                 ns1__deleteManyResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__deleteManyResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__deleteManyResponse,
             sizeof(ns1__deleteManyResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -22867,13 +22924,13 @@ soap_in_ns1__deleteManyResponse(struct soap *soap, const char *tag,
       return (ns1__deleteManyResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__deleteManyResponse::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__deleteManyResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteManyResponse", id, type))
     return soap->error;
@@ -22890,7 +22947,7 @@ soap_get_ns1__deleteManyResponse(struct soap *soap, ns1__deleteManyResponse *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__deleteManyResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -22905,9 +22962,9 @@ soap_instantiate_ns1__deleteManyResponse(struct soap *soap, int n,
                       "soap_instantiate_ns1__deleteManyResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__deleteManyResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__deleteManyResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteManyResponse);
     if (size)
@@ -22943,7 +23000,7 @@ soap_copy_ns1__deleteManyResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__deleteMany::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__deleteMany::sessionId = NULL;
+  this->ns1__deleteMany::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__entityBaseBean(
       soap, &this->ns1__deleteMany::beans);
 }
@@ -22990,13 +23047,13 @@ SOAP_FMAC3 ns1__deleteMany *SOAP_FMAC4
 soap_in_ns1__deleteMany(struct soap *soap, const char *tag, ns1__deleteMany *a,
                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__deleteMany *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__deleteMany,
       sizeof(ns1__deleteMany), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__deleteMany) {
@@ -23035,23 +23092,23 @@ soap_in_ns1__deleteMany(struct soap *soap, const char *tag, ns1__deleteMany *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__deleteMany *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__deleteMany, 0,
         sizeof(ns1__deleteMany), 0, soap_copy_ns1__deleteMany);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__deleteMany::soap_put(struct soap *soap, const char *tag,
                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__deleteMany);
   if (this->soap_out(soap, tag ? tag : "ns1:deleteMany", id, type))
     return soap->error;
@@ -23068,7 +23125,7 @@ soap_get_ns1__deleteMany(struct soap *soap, ns1__deleteMany *p, const char *tag,
                          const char *type) {
   if ((p = soap_in_ns1__deleteMany(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -23080,10 +23137,10 @@ soap_instantiate_ns1__deleteMany(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__deleteMany(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__deleteMany, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__deleteMany, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__deleteMany);
     if (size)
@@ -23149,13 +23206,13 @@ SOAP_FMAC3 ns1__updateResponse *SOAP_FMAC4
 soap_in_ns1__updateResponse(struct soap *soap, const char *tag,
                             ns1__updateResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__updateResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__updateResponse,
             sizeof(ns1__updateResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -23165,13 +23222,13 @@ soap_in_ns1__updateResponse(struct soap *soap, const char *tag,
       return (ns1__updateResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__updateResponse::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__updateResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:updateResponse", id, type))
     return soap->error;
@@ -23188,7 +23245,7 @@ soap_get_ns1__updateResponse(struct soap *soap, ns1__updateResponse *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__updateResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -23201,9 +23258,9 @@ soap_instantiate_ns1__updateResponse(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__updateResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__updateResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__updateResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__updateResponse);
     if (size)
@@ -23239,8 +23296,8 @@ soap_copy_ns1__updateResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__update::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__update::sessionId = NULL;
-  this->ns1__update::bean = NULL;
+  this->ns1__update::sessionId = nullptr;
+  this->ns1__update::bean = nullptr;
 }
 
 void ns1__update::soap_serialize(struct soap *soap) const {
@@ -23283,13 +23340,13 @@ SOAP_FMAC3 ns1__update *SOAP_FMAC4
 soap_in_ns1__update(struct soap *soap, const char *tag, ns1__update *a,
                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__update *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__update, sizeof(ns1__update),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__update) {
@@ -23330,24 +23387,24 @@ soap_in_ns1__update(struct soap *soap, const char *tag, ns1__update *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__update *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__update, 0,
         sizeof(ns1__update), 0, soap_copy_ns1__update);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__update::soap_put(struct soap *soap, const char *tag,
                           const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__update);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_ns1__update);
   if (this->soap_out(soap, tag ? tag : "ns1:update", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -23363,7 +23420,7 @@ soap_get_ns1__update(struct soap *soap, ns1__update *p, const char *tag,
                      const char *type) {
   if ((p = soap_in_ns1__update(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -23376,9 +23433,9 @@ soap_instantiate_ns1__update(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__update(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__update, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__update, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__update);
     if (size)
@@ -23460,13 +23517,13 @@ soap_in_ns1__luceneGetPopulatingResponse(struct soap *soap, const char *tag,
                                          ns1__luceneGetPopulatingResponse *a,
                                          const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__luceneGetPopulatingResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__luceneGetPopulatingResponse,
       sizeof(ns1__luceneGetPopulatingResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__luceneGetPopulatingResponse) {
@@ -23496,10 +23553,10 @@ soap_in_ns1__luceneGetPopulatingResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__luceneGetPopulatingResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -23507,7 +23564,7 @@ soap_in_ns1__luceneGetPopulatingResponse(struct soap *soap, const char *tag,
         sizeof(ns1__luceneGetPopulatingResponse), 0,
         soap_copy_ns1__luceneGetPopulatingResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -23515,7 +23572,7 @@ soap_in_ns1__luceneGetPopulatingResponse(struct soap *soap, const char *tag,
 int ns1__luceneGetPopulatingResponse::soap_put(struct soap *soap,
                                                const char *tag,
                                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__luceneGetPopulatingResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:luceneGetPopulatingResponse", id,
                      type))
@@ -23535,7 +23592,7 @@ soap_get_ns1__luceneGetPopulatingResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__luceneGetPopulatingResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -23552,10 +23609,10 @@ soap_instantiate_ns1__luceneGetPopulatingResponse(struct soap *soap, int n,
              "soap_instantiate_ns1__luceneGetPopulatingResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__luceneGetPopulatingResponse, n,
-                ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__luceneGetPopulatingResponse,
+                n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__luceneGetPopulatingResponse);
     if (size)
@@ -23595,7 +23652,7 @@ soap_copy_ns1__luceneGetPopulatingResponse(struct soap *soap, int st, int tt,
 void ns1__luceneGetPopulating::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__luceneGetPopulating::sessionId = NULL;
+  this->ns1__luceneGetPopulating::sessionId = nullptr;
 }
 
 void ns1__luceneGetPopulating::soap_serialize(struct soap *soap) const {
@@ -23638,13 +23695,13 @@ soap_in_ns1__luceneGetPopulating(struct soap *soap, const char *tag,
                                  ns1__luceneGetPopulating *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__luceneGetPopulating *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__luceneGetPopulating,
       sizeof(ns1__luceneGetPopulating), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__luceneGetPopulating) {
@@ -23678,10 +23735,10 @@ soap_in_ns1__luceneGetPopulating(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__luceneGetPopulating *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -23689,14 +23746,14 @@ soap_in_ns1__luceneGetPopulating(struct soap *soap, const char *tag,
         sizeof(ns1__luceneGetPopulating), 0,
         soap_copy_ns1__luceneGetPopulating);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__luceneGetPopulating::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__luceneGetPopulating);
   if (this->soap_out(soap, tag ? tag : "ns1:luceneGetPopulating", id, type))
     return soap->error;
@@ -23714,7 +23771,7 @@ soap_get_ns1__luceneGetPopulating(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__luceneGetPopulating(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -23728,10 +23785,11 @@ soap_instantiate_ns1__luceneGetPopulating(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__luceneGetPopulating(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__luceneGetPopulating, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__luceneGetPopulating, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__luceneGetPopulating);
     if (size)
@@ -23768,7 +23826,7 @@ soap_copy_ns1__luceneGetPopulating(struct soap *soap, int st, int tt, void *p,
 void ns1__getApiVersionResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getApiVersionResponse::return_ = NULL;
+  this->ns1__getApiVersionResponse::return_ = nullptr;
 }
 
 void ns1__getApiVersionResponse::soap_serialize(struct soap *soap) const {
@@ -23812,13 +23870,13 @@ soap_in_ns1__getApiVersionResponse(struct soap *soap, const char *tag,
                                    ns1__getApiVersionResponse *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getApiVersionResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__getApiVersionResponse,
       sizeof(ns1__getApiVersionResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__getApiVersionResponse) {
@@ -23852,10 +23910,10 @@ soap_in_ns1__getApiVersionResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getApiVersionResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -23863,14 +23921,14 @@ soap_in_ns1__getApiVersionResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getApiVersionResponse), 0,
         soap_copy_ns1__getApiVersionResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getApiVersionResponse::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__getApiVersionResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getApiVersionResponse", id, type))
     return soap->error;
@@ -23888,7 +23946,7 @@ soap_get_ns1__getApiVersionResponse(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__getApiVersionResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -23903,10 +23961,11 @@ soap_instantiate_ns1__getApiVersionResponse(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__getApiVersionResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__getApiVersionResponse, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__getApiVersionResponse, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getApiVersionResponse);
     if (size)
@@ -23973,13 +24032,13 @@ SOAP_FMAC3 ns1__getApiVersion *SOAP_FMAC4
 soap_in_ns1__getApiVersion(struct soap *soap, const char *tag,
                            ns1__getApiVersion *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__getApiVersion *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__getApiVersion,
             sizeof(ns1__getApiVersion), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -23989,13 +24048,13 @@ soap_in_ns1__getApiVersion(struct soap *soap, const char *tag,
       return (ns1__getApiVersion *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__getApiVersion::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__getApiVersion);
   if (this->soap_out(soap, tag ? tag : "ns1:getApiVersion", id, type))
     return soap->error;
@@ -24012,7 +24071,7 @@ soap_get_ns1__getApiVersion(struct soap *soap, ns1__getApiVersion *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__getApiVersion(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -24025,9 +24084,9 @@ soap_instantiate_ns1__getApiVersion(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__getApiVersion(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__getApiVersion, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__getApiVersion, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getApiVersion);
     if (size)
@@ -24108,13 +24167,13 @@ soap_in_ns1__getEntityNamesResponse(struct soap *soap, const char *tag,
                                     ns1__getEntityNamesResponse *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getEntityNamesResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__getEntityNamesResponse,
       sizeof(ns1__getEntityNamesResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__getEntityNamesResponse) {
@@ -24144,10 +24203,10 @@ soap_in_ns1__getEntityNamesResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getEntityNamesResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -24155,14 +24214,14 @@ soap_in_ns1__getEntityNamesResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getEntityNamesResponse), 0,
         soap_copy_ns1__getEntityNamesResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getEntityNamesResponse::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__getEntityNamesResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getEntityNamesResponse", id, type))
     return soap->error;
@@ -24180,7 +24239,7 @@ soap_get_ns1__getEntityNamesResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__getEntityNamesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -24196,10 +24255,10 @@ soap_instantiate_ns1__getEntityNamesResponse(struct soap *soap, int n,
                    "soap_instantiate_ns1__getEntityNamesResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__getEntityNamesResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__getEntityNamesResponse, n,
                 ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getEntityNamesResponse);
     if (size)
@@ -24267,13 +24326,13 @@ SOAP_FMAC3 ns1__getEntityNames *SOAP_FMAC4
 soap_in_ns1__getEntityNames(struct soap *soap, const char *tag,
                             ns1__getEntityNames *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__getEntityNames *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__getEntityNames,
             sizeof(ns1__getEntityNames), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -24283,13 +24342,13 @@ soap_in_ns1__getEntityNames(struct soap *soap, const char *tag,
       return (ns1__getEntityNames *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__getEntityNames::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__getEntityNames);
   if (this->soap_out(soap, tag ? tag : "ns1:getEntityNames", id, type))
     return soap->error;
@@ -24306,7 +24365,7 @@ soap_get_ns1__getEntityNames(struct soap *soap, ns1__getEntityNames *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__getEntityNames(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -24319,9 +24378,9 @@ soap_instantiate_ns1__getEntityNames(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__getEntityNames(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__getEntityNames, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__getEntityNames, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getEntityNames);
     if (size)
@@ -24357,7 +24416,7 @@ soap_copy_ns1__getEntityNames(struct soap *soap, int st, int tt, void *p,
 void ns1__getResponse::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getResponse::return_ = NULL;
+  this->ns1__getResponse::return_ = nullptr;
 }
 
 void ns1__getResponse::soap_serialize(struct soap *soap) const {
@@ -24398,13 +24457,13 @@ SOAP_FMAC3 ns1__getResponse *SOAP_FMAC4
 soap_in_ns1__getResponse(struct soap *soap, const char *tag,
                          ns1__getResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__getResponse,
       sizeof(ns1__getResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__getResponse) {
@@ -24437,23 +24496,23 @@ soap_in_ns1__getResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__getResponse, 0,
         sizeof(ns1__getResponse), 0, soap_copy_ns1__getResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getResponse::soap_put(struct soap *soap, const char *tag,
                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__getResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getResponse", id, type))
     return soap->error;
@@ -24470,7 +24529,7 @@ soap_get_ns1__getResponse(struct soap *soap, ns1__getResponse *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__getResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -24482,10 +24541,10 @@ soap_instantiate_ns1__getResponse(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__getResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__getResponse, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__getResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getResponse);
     if (size)
@@ -24521,8 +24580,8 @@ soap_copy_ns1__getResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__get::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__get::sessionId = NULL;
-  this->ns1__get::query = NULL;
+  this->ns1__get::sessionId = nullptr;
+  this->ns1__get::query = nullptr;
   soap_default_LONG64(soap, &this->ns1__get::primaryKey);
 }
 
@@ -24568,13 +24627,13 @@ SOAP_FMAC3 ns1__get *SOAP_FMAC4 soap_in_ns1__get(struct soap *soap,
                                                  const char *tag, ns1__get *a,
                                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__get *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__get, sizeof(ns1__get), soap->type,
       soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__get) {
@@ -24622,20 +24681,20 @@ SOAP_FMAC3 ns1__get *SOAP_FMAC4 soap_in_ns1__get(struct soap *soap,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__get *)soap_id_forward(soap, soap->href, (void *)a, 0,
                                     SOAP_TYPE_ICat4_ns1__get, 0,
                                     sizeof(ns1__get), 0, soap_copy_ns1__get);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_primaryKey1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
@@ -24643,7 +24702,7 @@ SOAP_FMAC3 ns1__get *SOAP_FMAC4 soap_in_ns1__get(struct soap *soap,
 int ns1__get::soap_put(struct soap *soap, const char *tag,
                        const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__get);
+      soap_embed(soap, (void *)this, nullptr, 0, tag, SOAP_TYPE_ICat4_ns1__get);
   if (this->soap_out(soap, tag ? tag : "ns1:get", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -24658,7 +24717,7 @@ SOAP_FMAC3 ns1__get *SOAP_FMAC4 soap_get_ns1__get(struct soap *soap,
                                                   const char *type) {
   if ((p = soap_in_ns1__get(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -24670,9 +24729,9 @@ soap_instantiate_ns1__get(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__get(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__get, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__get, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__get);
     if (size)
@@ -24739,14 +24798,14 @@ soap_in_ns1__lucenePopulateResponse(struct soap *soap, const char *tag,
                                     ns1__lucenePopulateResponse *a,
                                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__lucenePopulateResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__lucenePopulateResponse,
             sizeof(ns1__lucenePopulateResponse), soap->type,
             soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -24756,13 +24815,13 @@ soap_in_ns1__lucenePopulateResponse(struct soap *soap, const char *tag,
       return (ns1__lucenePopulateResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__lucenePopulateResponse::soap_put(struct soap *soap, const char *tag,
                                           const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__lucenePopulateResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:lucenePopulateResponse", id, type))
     return soap->error;
@@ -24780,7 +24839,7 @@ soap_get_ns1__lucenePopulateResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in_ns1__lucenePopulateResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -24796,10 +24855,10 @@ soap_instantiate_ns1__lucenePopulateResponse(struct soap *soap, int n,
                    "soap_instantiate_ns1__lucenePopulateResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__lucenePopulateResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__lucenePopulateResponse, n,
                 ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__lucenePopulateResponse);
     if (size)
@@ -24837,8 +24896,8 @@ soap_copy_ns1__lucenePopulateResponse(struct soap *soap, int st, int tt,
 void ns1__lucenePopulate::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__lucenePopulate::sessionId = NULL;
-  this->ns1__lucenePopulate::entityName = NULL;
+  this->ns1__lucenePopulate::sessionId = nullptr;
+  this->ns1__lucenePopulate::entityName = nullptr;
 }
 
 void ns1__lucenePopulate::soap_serialize(struct soap *soap) const {
@@ -24884,13 +24943,13 @@ SOAP_FMAC3 ns1__lucenePopulate *SOAP_FMAC4
 soap_in_ns1__lucenePopulate(struct soap *soap, const char *tag,
                             ns1__lucenePopulate *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__lucenePopulate *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__lucenePopulate,
       sizeof(ns1__lucenePopulate), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__lucenePopulate) {
@@ -24933,23 +24992,23 @@ soap_in_ns1__lucenePopulate(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__lucenePopulate *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__lucenePopulate, 0,
         sizeof(ns1__lucenePopulate), 0, soap_copy_ns1__lucenePopulate);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__lucenePopulate::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__lucenePopulate);
   if (this->soap_out(soap, tag ? tag : "ns1:lucenePopulate", id, type))
     return soap->error;
@@ -24966,7 +25025,7 @@ soap_get_ns1__lucenePopulate(struct soap *soap, ns1__lucenePopulate *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__lucenePopulate(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -24979,9 +25038,9 @@ soap_instantiate_ns1__lucenePopulate(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__lucenePopulate(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__lucenePopulate, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__lucenePopulate, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__lucenePopulate);
     if (size)
@@ -25062,13 +25121,13 @@ soap_in_ns1__luceneSearchResponse(struct soap *soap, const char *tag,
                                   ns1__luceneSearchResponse *a,
                                   const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__luceneSearchResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__luceneSearchResponse,
       sizeof(ns1__luceneSearchResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__luceneSearchResponse) {
@@ -25098,10 +25157,10 @@ soap_in_ns1__luceneSearchResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__luceneSearchResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -25109,14 +25168,14 @@ soap_in_ns1__luceneSearchResponse(struct soap *soap, const char *tag,
         sizeof(ns1__luceneSearchResponse), 0,
         soap_copy_ns1__luceneSearchResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__luceneSearchResponse::soap_put(struct soap *soap, const char *tag,
                                         const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__luceneSearchResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:luceneSearchResponse", id, type))
     return soap->error;
@@ -25134,7 +25193,7 @@ soap_get_ns1__luceneSearchResponse(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in_ns1__luceneSearchResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -25149,10 +25208,11 @@ soap_instantiate_ns1__luceneSearchResponse(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate_ns1__luceneSearchResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__luceneSearchResponse, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__luceneSearchResponse, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__luceneSearchResponse);
     if (size)
@@ -25189,10 +25249,10 @@ soap_copy_ns1__luceneSearchResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__luceneSearch::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__luceneSearch::sessionId = NULL;
-  this->ns1__luceneSearch::query = NULL;
+  this->ns1__luceneSearch::sessionId = nullptr;
+  this->ns1__luceneSearch::query = nullptr;
   soap_default_int(soap, &this->ns1__luceneSearch::maxCount);
-  this->ns1__luceneSearch::entityName = NULL;
+  this->ns1__luceneSearch::entityName = nullptr;
 }
 
 void ns1__luceneSearch::soap_serialize(struct soap *soap) const {
@@ -25245,13 +25305,13 @@ SOAP_FMAC3 ns1__luceneSearch *SOAP_FMAC4
 soap_in_ns1__luceneSearch(struct soap *soap, const char *tag,
                           ns1__luceneSearch *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__luceneSearch *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__luceneSearch,
       sizeof(ns1__luceneSearch), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__luceneSearch) {
@@ -25309,27 +25369,27 @@ soap_in_ns1__luceneSearch(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__luceneSearch *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__luceneSearch, 0,
         sizeof(ns1__luceneSearch), 0, soap_copy_ns1__luceneSearch);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_maxCount1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__luceneSearch::soap_put(struct soap *soap, const char *tag,
                                 const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__luceneSearch);
   if (this->soap_out(soap, tag ? tag : "ns1:luceneSearch", id, type))
     return soap->error;
@@ -25346,7 +25406,7 @@ soap_get_ns1__luceneSearch(struct soap *soap, ns1__luceneSearch *p,
                            const char *tag, const char *type) {
   if ((p = soap_in_ns1__luceneSearch(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -25359,9 +25419,9 @@ soap_instantiate_ns1__luceneSearch(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__luceneSearch(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__luceneSearch, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__luceneSearch, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__luceneSearch);
     if (size)
@@ -25442,13 +25502,13 @@ soap_in_ns1__getPropertiesResponse(struct soap *soap, const char *tag,
                                    ns1__getPropertiesResponse *a,
                                    const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getPropertiesResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__getPropertiesResponse,
       sizeof(ns1__getPropertiesResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__getPropertiesResponse) {
@@ -25478,10 +25538,10 @@ soap_in_ns1__getPropertiesResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getPropertiesResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0,
@@ -25489,14 +25549,14 @@ soap_in_ns1__getPropertiesResponse(struct soap *soap, const char *tag,
         sizeof(ns1__getPropertiesResponse), 0,
         soap_copy_ns1__getPropertiesResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getPropertiesResponse::soap_put(struct soap *soap, const char *tag,
                                          const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__getPropertiesResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:getPropertiesResponse", id, type))
     return soap->error;
@@ -25514,7 +25574,7 @@ soap_get_ns1__getPropertiesResponse(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in_ns1__getPropertiesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -25529,10 +25589,11 @@ soap_instantiate_ns1__getPropertiesResponse(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate_ns1__getPropertiesResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__getPropertiesResponse, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__getPropertiesResponse, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getPropertiesResponse);
     if (size)
@@ -25569,7 +25630,7 @@ soap_copy_ns1__getPropertiesResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__getProperties::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__getProperties::sessionId = NULL;
+  this->ns1__getProperties::sessionId = nullptr;
 }
 
 void ns1__getProperties::soap_serialize(struct soap *soap) const {
@@ -25610,13 +25671,13 @@ SOAP_FMAC3 ns1__getProperties *SOAP_FMAC4
 soap_in_ns1__getProperties(struct soap *soap, const char *tag,
                            ns1__getProperties *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__getProperties *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__getProperties,
       sizeof(ns1__getProperties), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__getProperties) {
@@ -25650,23 +25711,23 @@ soap_in_ns1__getProperties(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__getProperties *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__getProperties, 0,
         sizeof(ns1__getProperties), 0, soap_copy_ns1__getProperties);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__getProperties::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__getProperties);
   if (this->soap_out(soap, tag ? tag : "ns1:getProperties", id, type))
     return soap->error;
@@ -25683,7 +25744,7 @@ soap_get_ns1__getProperties(struct soap *soap, ns1__getProperties *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__getProperties(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -25696,9 +25757,9 @@ soap_instantiate_ns1__getProperties(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__getProperties(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__getProperties, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__getProperties, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__getProperties);
     if (size)
@@ -25775,13 +25836,13 @@ SOAP_FMAC3 ns1__createResponse *SOAP_FMAC4
 soap_in_ns1__createResponse(struct soap *soap, const char *tag,
                             ns1__createResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__createResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__createResponse,
       sizeof(ns1__createResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__createResponse) {
@@ -25813,27 +25874,27 @@ soap_in_ns1__createResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__createResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__createResponse, 0,
         sizeof(ns1__createResponse), 0, soap_copy_ns1__createResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_return_1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__createResponse::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__createResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:createResponse", id, type))
     return soap->error;
@@ -25850,7 +25911,7 @@ soap_get_ns1__createResponse(struct soap *soap, ns1__createResponse *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__createResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -25863,9 +25924,9 @@ soap_instantiate_ns1__createResponse(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__createResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__createResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__createResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__createResponse);
     if (size)
@@ -25901,8 +25962,8 @@ soap_copy_ns1__createResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__create::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__create::sessionId = NULL;
-  this->ns1__create::bean = NULL;
+  this->ns1__create::sessionId = nullptr;
+  this->ns1__create::bean = nullptr;
 }
 
 void ns1__create::soap_serialize(struct soap *soap) const {
@@ -25945,13 +26006,13 @@ SOAP_FMAC3 ns1__create *SOAP_FMAC4
 soap_in_ns1__create(struct soap *soap, const char *tag, ns1__create *a,
                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__create *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__create, sizeof(ns1__create),
       soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__create) {
@@ -25992,24 +26053,24 @@ soap_in_ns1__create(struct soap *soap, const char *tag, ns1__create *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__create *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__create, 0,
         sizeof(ns1__create), 0, soap_copy_ns1__create);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__create::soap_put(struct soap *soap, const char *tag,
                           const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_ns1__create);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_ns1__create);
   if (this->soap_out(soap, tag ? tag : "ns1:create", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -26025,7 +26086,7 @@ soap_get_ns1__create(struct soap *soap, ns1__create *p, const char *tag,
                      const char *type) {
   if ((p = soap_in_ns1__create(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -26038,9 +26099,9 @@ soap_instantiate_ns1__create(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__create(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__create, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__create, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__create);
     if (size)
@@ -26118,13 +26179,13 @@ SOAP_FMAC3 ns1__createManyResponse *SOAP_FMAC4
 soap_in_ns1__createManyResponse(struct soap *soap, const char *tag,
                                 ns1__createManyResponse *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__createManyResponse *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__createManyResponse,
       sizeof(ns1__createManyResponse), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__createManyResponse) {
@@ -26154,24 +26215,24 @@ soap_in_ns1__createManyResponse(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__createManyResponse *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__createManyResponse,
         0, sizeof(ns1__createManyResponse), 0,
         soap_copy_ns1__createManyResponse);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__createManyResponse::soap_put(struct soap *soap, const char *tag,
                                       const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__createManyResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:createManyResponse", id, type))
     return soap->error;
@@ -26188,7 +26249,7 @@ soap_get_ns1__createManyResponse(struct soap *soap, ns1__createManyResponse *p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_ns1__createManyResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -26203,9 +26264,9 @@ soap_instantiate_ns1__createManyResponse(struct soap *soap, int n,
                       "soap_instantiate_ns1__createManyResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__createManyResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__createManyResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__createManyResponse);
     if (size)
@@ -26241,11 +26302,11 @@ soap_copy_ns1__createManyResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__entityBaseBean::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__entityBaseBean::createId = NULL;
-  this->ns1__entityBaseBean::createTime = NULL;
-  this->ns1__entityBaseBean::modTime = NULL;
-  this->ns1__entityBaseBean::id = NULL;
-  this->ns1__entityBaseBean::modId = NULL;
+  this->ns1__entityBaseBean::createId = nullptr;
+  this->ns1__entityBaseBean::createTime = nullptr;
+  this->ns1__entityBaseBean::modTime = nullptr;
+  this->ns1__entityBaseBean::id = nullptr;
+  this->ns1__entityBaseBean::modId = nullptr;
 }
 
 void ns1__entityBaseBean::soap_serialize(struct soap *soap) const {
@@ -26302,13 +26363,13 @@ SOAP_FMAC3 ns1__entityBaseBean *SOAP_FMAC4
 soap_in_ns1__entityBaseBean(struct soap *soap, const char *tag,
                             ns1__entityBaseBean *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__entityBaseBean *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__entityBaseBean,
       sizeof(ns1__entityBaseBean), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__entityBaseBean) {
@@ -26374,23 +26435,23 @@ soap_in_ns1__entityBaseBean(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__entityBaseBean *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__entityBaseBean, 0,
         sizeof(ns1__entityBaseBean), 0, soap_copy_ns1__entityBaseBean);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__entityBaseBean::soap_put(struct soap *soap, const char *tag,
                                   const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__entityBaseBean);
   if (this->soap_out(soap, tag ? tag : "ns1:entityBaseBean", id, type))
     return soap->error;
@@ -26407,7 +26468,7 @@ soap_get_ns1__entityBaseBean(struct soap *soap, ns1__entityBaseBean *p,
                              const char *tag, const char *type) {
   if ((p = soap_in_ns1__entityBaseBean(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -26420,9 +26481,9 @@ soap_instantiate_ns1__entityBaseBean(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate_ns1__entityBaseBean(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__entityBaseBean, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__entityBaseBean, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (type && !soap_match_tag(soap, type, "ns1:datafile")) {
     cp->type = SOAP_TYPE_ICat4_ns1__datafile;
     if (n < 0) {
@@ -27238,7 +27299,7 @@ soap_copy_ns1__entityBaseBean(struct soap *soap, int st, int tt, void *p,
 void ns1__createMany::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__createMany::sessionId = NULL;
+  this->ns1__createMany::sessionId = nullptr;
   soap_default_std__vectorTemplateOfPointerTons1__entityBaseBean(
       soap, &this->ns1__createMany::beans);
 }
@@ -27285,13 +27346,13 @@ SOAP_FMAC3 ns1__createMany *SOAP_FMAC4
 soap_in_ns1__createMany(struct soap *soap, const char *tag, ns1__createMany *a,
                         const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__createMany *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__createMany,
       sizeof(ns1__createMany), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__createMany) {
@@ -27330,23 +27391,23 @@ soap_in_ns1__createMany(struct soap *soap, const char *tag, ns1__createMany *a,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__createMany *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__createMany, 0,
         sizeof(ns1__createMany), 0, soap_copy_ns1__createMany);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__createMany::soap_put(struct soap *soap, const char *tag,
                               const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__createMany);
   if (this->soap_out(soap, tag ? tag : "ns1:createMany", id, type))
     return soap->error;
@@ -27363,7 +27424,7 @@ soap_get_ns1__createMany(struct soap *soap, ns1__createMany *p, const char *tag,
                          const char *type) {
   if ((p = soap_in_ns1__createMany(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -27375,10 +27436,10 @@ soap_instantiate_ns1__createMany(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__createMany(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__createMany, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__createMany, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__createMany);
     if (size)
@@ -27414,9 +27475,9 @@ soap_copy_ns1__createMany(struct soap *soap, int st, int tt, void *p,
 void ns1__IcatException::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__IcatException::message = NULL;
+  this->ns1__IcatException::message = nullptr;
   soap_default_int(soap, &this->ns1__IcatException::offset);
-  this->ns1__IcatException::type = NULL;
+  this->ns1__IcatException::type = nullptr;
 }
 
 void ns1__IcatException::soap_serialize(struct soap *soap) const {
@@ -27464,13 +27525,13 @@ SOAP_FMAC3 ns1__IcatException *SOAP_FMAC4
 soap_in_ns1__IcatException(struct soap *soap, const char *tag,
                            ns1__IcatException *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__IcatException *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__IcatException,
       sizeof(ns1__IcatException), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__IcatException) {
@@ -27519,27 +27580,27 @@ soap_in_ns1__IcatException(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__IcatException *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__IcatException, 0,
         sizeof(ns1__IcatException), 0, soap_copy_ns1__IcatException);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_offset1 > 0)) {
     soap->error = SOAP_OCCURS;
-    return NULL;
+    return nullptr;
   }
   return a;
 }
 
 int ns1__IcatException::soap_put(struct soap *soap, const char *tag,
                                  const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__IcatException);
   if (this->soap_out(soap, tag ? tag : "ns1:IcatException", id, type))
     return soap->error;
@@ -27556,7 +27617,7 @@ soap_get_ns1__IcatException(struct soap *soap, ns1__IcatException *p,
                             const char *tag, const char *type) {
   if ((p = soap_in_ns1__IcatException(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -27569,9 +27630,9 @@ soap_instantiate_ns1__IcatException(struct soap *soap, int n, const char *type,
                             "soap_instantiate_ns1__IcatException(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__IcatException, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__IcatException, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__IcatException);
     if (size)
@@ -27639,13 +27700,13 @@ soap_in_ns1__luceneClearResponse(struct soap *soap, const char *tag,
                                  ns1__luceneClearResponse *a,
                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (ns1__luceneClearResponse *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_ns1__luceneClearResponse,
             sizeof(ns1__luceneClearResponse), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -27655,13 +27716,13 @@ soap_in_ns1__luceneClearResponse(struct soap *soap, const char *tag,
       return (ns1__luceneClearResponse *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int ns1__luceneClearResponse::soap_put(struct soap *soap, const char *tag,
                                        const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__luceneClearResponse);
   if (this->soap_out(soap, tag ? tag : "ns1:luceneClearResponse", id, type))
     return soap->error;
@@ -27679,7 +27740,7 @@ soap_get_ns1__luceneClearResponse(struct soap *soap,
                                   const char *type) {
   if ((p = soap_in_ns1__luceneClearResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -27693,10 +27754,11 @@ soap_instantiate_ns1__luceneClearResponse(struct soap *soap, int n,
          SOAP_MESSAGE(fdebug,
                       "soap_instantiate_ns1__luceneClearResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_ns1__luceneClearResponse, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_ns1__luceneClearResponse, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__luceneClearResponse);
     if (size)
@@ -27733,7 +27795,7 @@ soap_copy_ns1__luceneClearResponse(struct soap *soap, int st, int tt, void *p,
 void ns1__luceneClear::soap_default(struct soap *soap) {
   this->soap = soap;
   this->xsd__anyType::soap_default(soap);
-  this->ns1__luceneClear::sessionId = NULL;
+  this->ns1__luceneClear::sessionId = nullptr;
 }
 
 void ns1__luceneClear::soap_serialize(struct soap *soap) const {
@@ -27773,13 +27835,13 @@ SOAP_FMAC3 ns1__luceneClear *SOAP_FMAC4
 soap_in_ns1__luceneClear(struct soap *soap, const char *tag,
                          ns1__luceneClear *a, const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 0, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 0, nullptr))
+    return nullptr;
   a = (ns1__luceneClear *)soap_class_id_enter(
       soap, soap->id, a, SOAP_TYPE_ICat4_ns1__luceneClear,
       sizeof(ns1__luceneClear), soap->type, soap->arrayType);
   if (!a)
-    return NULL;
+    return nullptr;
   if (soap->alloced) {
     a->soap_default(soap);
     if (soap->clist->type != SOAP_TYPE_ICat4_ns1__luceneClear) {
@@ -27813,23 +27875,23 @@ soap_in_ns1__luceneClear(struct soap *soap, const char *tag,
       if (soap->error == SOAP_NO_TAG)
         break;
       if (soap->error)
-        return NULL;
+        return nullptr;
     }
     if (soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   } else {
     a = (ns1__luceneClear *)soap_id_forward(
         soap, soap->href, (void *)a, 0, SOAP_TYPE_ICat4_ns1__luceneClear, 0,
         sizeof(ns1__luceneClear), 0, soap_copy_ns1__luceneClear);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
 
 int ns1__luceneClear::soap_put(struct soap *soap, const char *tag,
                                const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_ns1__luceneClear);
   if (this->soap_out(soap, tag ? tag : "ns1:luceneClear", id, type))
     return soap->error;
@@ -27846,7 +27908,7 @@ soap_get_ns1__luceneClear(struct soap *soap, ns1__luceneClear *p,
                           const char *tag, const char *type) {
   if ((p = soap_in_ns1__luceneClear(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -27858,10 +27920,10 @@ soap_instantiate_ns1__luceneClear(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__luceneClear(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_ns1__luceneClear, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4_ns1__luceneClear, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(ns1__luceneClear);
     if (size)
@@ -27922,8 +27984,8 @@ SOAP_FMAC3 std::string *SOAP_FMAC4
 soap_in_std__string(struct soap *soap, const char *tag, std::string *s,
                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!s)
     s = soap_new_std__string(soap, -1);
   if (soap->null)
@@ -27936,7 +27998,7 @@ soap_in_std__string(struct soap *soap, const char *tag, std::string *s,
         soap->type, soap->arrayType);
     if (s) {
       if (!(t = soap_string_in(soap, 1, 0, -1)))
-        return NULL;
+        return nullptr;
       s->assign(t);
     }
   } else
@@ -27947,7 +28009,7 @@ soap_in_std__string(struct soap *soap, const char *tag, std::string *s,
         0, SOAP_TYPE_ICat4_std__string, 0, sizeof(std::string), 0,
         soap_copy_std__string);
   if (soap->body && soap_element_end_in(soap, tag))
-    return NULL;
+    return nullptr;
   return s;
 }
 
@@ -27955,7 +28017,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_std__string(struct soap *soap, const std::string *a, const char *tag,
                      const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat4_std__string);
+      soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat4_std__string);
   if (soap_out_std__string(soap, tag ? tag : "string", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -27966,7 +28028,7 @@ soap_get_std__string(struct soap *soap, std::string *p, const char *tag,
                      const char *type) {
   if ((p = soap_in_std__string(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -27979,9 +28041,9 @@ soap_instantiate_std__string(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_std__string(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_std__string, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_std__string, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::string);
     if (size)
@@ -28045,13 +28107,13 @@ SOAP_FMAC3 xsd__string *SOAP_FMAC4
 soap_in_xsd__string(struct soap *soap, const char *tag, xsd__string *a,
                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__string *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_xsd__string, sizeof(xsd__string),
             soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -28061,14 +28123,14 @@ soap_in_xsd__string(struct soap *soap, const char *tag, xsd__string *a,
       return (xsd__string *)a->soap_in(soap, tag, type);
   }
   if (!soap_in_std__string(soap, tag, &(a->xsd__string::__item), "xsd:string"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__string::soap_put(struct soap *soap, const char *tag,
                           const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_xsd__string);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_xsd__string);
   if (this->soap_out(soap, tag ? tag : "xsd:string", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -28084,7 +28146,7 @@ soap_get_xsd__string(struct soap *soap, xsd__string *p, const char *tag,
                      const char *type) {
   if ((p = soap_in_xsd__string(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -28097,9 +28159,9 @@ soap_instantiate_xsd__string(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__string(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_xsd__string, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_xsd__string, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(xsd__string);
     if (size)
@@ -28164,13 +28226,13 @@ SOAP_FMAC3 xsd__long *SOAP_FMAC4
 soap_in_xsd__long(struct soap *soap, const char *tag, xsd__long *a,
                   const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__long *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_xsd__long, sizeof(xsd__long),
             soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -28180,14 +28242,14 @@ soap_in_xsd__long(struct soap *soap, const char *tag, xsd__long *a,
       return (xsd__long *)a->soap_in(soap, tag, type);
   }
   if (!soap_in_LONG64(soap, tag, &(a->xsd__long::__item), "xsd:long"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__long::soap_put(struct soap *soap, const char *tag,
                         const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_xsd__long);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_xsd__long);
   if (this->soap_out(soap, tag ? tag : "xsd:long", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -28203,7 +28265,7 @@ soap_get_xsd__long(struct soap *soap, xsd__long *p, const char *tag,
                    const char *type) {
   if ((p = soap_in_xsd__long(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -28215,9 +28277,9 @@ soap_instantiate_xsd__long(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__long(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_xsd__long, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_xsd__long, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(xsd__long);
     if (size)
@@ -28282,13 +28344,13 @@ SOAP_FMAC3 xsd__int *SOAP_FMAC4 soap_in_xsd__int(struct soap *soap,
                                                  const char *tag, xsd__int *a,
                                                  const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__int *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_xsd__int, sizeof(xsd__int),
             soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -28298,14 +28360,14 @@ SOAP_FMAC3 xsd__int *SOAP_FMAC4 soap_in_xsd__int(struct soap *soap,
       return (xsd__int *)a->soap_in(soap, tag, type);
   }
   if (!soap_in_int(soap, tag, &(a->xsd__int::__item), "xsd:int"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__int::soap_put(struct soap *soap, const char *tag,
                        const char *type) const {
   int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_xsd__int);
+      soap_embed(soap, (void *)this, nullptr, 0, tag, SOAP_TYPE_ICat4_xsd__int);
   if (this->soap_out(soap, tag ? tag : "xsd:int", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -28320,7 +28382,7 @@ SOAP_FMAC3 xsd__int *SOAP_FMAC4 soap_get_xsd__int(struct soap *soap,
                                                   const char *type) {
   if ((p = soap_in_xsd__int(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -28332,9 +28394,9 @@ soap_instantiate_xsd__int(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__int(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_xsd__int, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_xsd__int, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(xsd__int);
     if (size)
@@ -28401,13 +28463,13 @@ SOAP_FMAC3 xsd__double *SOAP_FMAC4
 soap_in_xsd__double(struct soap *soap, const char *tag, xsd__double *a,
                     const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__double *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_xsd__double, sizeof(xsd__double),
             soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -28417,14 +28479,14 @@ soap_in_xsd__double(struct soap *soap, const char *tag, xsd__double *a,
       return (xsd__double *)a->soap_in(soap, tag, type);
   }
   if (!soap_in_double(soap, tag, &(a->xsd__double::__item), "xsd:double"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__double::soap_put(struct soap *soap, const char *tag,
                           const char *type) const {
-  int id =
-      soap_embed(soap, (void *)this, NULL, 0, tag, SOAP_TYPE_ICat4_xsd__double);
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_xsd__double);
   if (this->soap_out(soap, tag ? tag : "xsd:double", id, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -28440,7 +28502,7 @@ soap_get_xsd__double(struct soap *soap, xsd__double *p, const char *tag,
                      const char *type) {
   if ((p = soap_in_xsd__double(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -28453,9 +28515,9 @@ soap_instantiate_xsd__double(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__double(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_xsd__double, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_xsd__double, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(xsd__double);
     if (size)
@@ -28522,13 +28584,13 @@ SOAP_FMAC3 xsd__dateTime *SOAP_FMAC4
 soap_in_xsd__dateTime(struct soap *soap, const char *tag, xsd__dateTime *a,
                       const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__dateTime *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_xsd__dateTime,
             sizeof(xsd__dateTime), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -28538,13 +28600,13 @@ soap_in_xsd__dateTime(struct soap *soap, const char *tag, xsd__dateTime *a,
       return (xsd__dateTime *)a->soap_in(soap, tag, type);
   }
   if (!soap_in_time(soap, tag, &(a->xsd__dateTime::__item), "xsd:dateTime"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__dateTime::soap_put(struct soap *soap, const char *tag,
                             const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_xsd__dateTime);
   if (this->soap_out(soap, tag ? tag : "xsd:dateTime", id, type))
     return soap->error;
@@ -28561,7 +28623,7 @@ soap_get_xsd__dateTime(struct soap *soap, xsd__dateTime *p, const char *tag,
                        const char *type) {
   if ((p = soap_in_xsd__dateTime(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -28574,9 +28636,9 @@ soap_instantiate_xsd__dateTime(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__dateTime(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_xsd__dateTime, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_xsd__dateTime, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(xsd__dateTime);
     if (size)
@@ -28642,13 +28704,13 @@ SOAP_FMAC3 xsd__boolean *SOAP_FMAC4
 soap_in_xsd__boolean(struct soap *soap, const char *tag, xsd__boolean *a,
                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__boolean *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_xsd__boolean,
             sizeof(xsd__boolean), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -28658,13 +28720,13 @@ soap_in_xsd__boolean(struct soap *soap, const char *tag, xsd__boolean *a,
       return (xsd__boolean *)a->soap_in(soap, tag, type);
   }
   if (!soap_in_bool(soap, tag, &(a->xsd__boolean::__item), "xsd:boolean"))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__boolean::soap_put(struct soap *soap, const char *tag,
                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_xsd__boolean);
   if (this->soap_out(soap, tag ? tag : "xsd:boolean", id, type))
     return soap->error;
@@ -28681,7 +28743,7 @@ soap_get_xsd__boolean(struct soap *soap, xsd__boolean *p, const char *tag,
                       const char *type) {
   if ((p = soap_in_xsd__boolean(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -28694,9 +28756,9 @@ soap_instantiate_xsd__boolean(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__boolean(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_xsd__boolean, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_xsd__boolean, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(xsd__boolean);
     if (size)
@@ -28730,7 +28792,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_xsd__boolean(struct soap *soap, int st,
 
 void xsd__anyType::soap_default(struct soap *soap) {
   this->soap = soap;
-  this->xsd__anyType::__item = NULL;
+  this->xsd__anyType::__item = nullptr;
   /* transient soap skipped */
 }
 
@@ -28749,7 +28811,7 @@ int xsd__anyType::soap_out(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_xsd__anyType(struct soap *soap, const char *tag, int id,
                       const xsd__anyType *a, const char *type) {
-  return soap_outliteral(soap, tag, &(a->xsd__anyType::__item), NULL);
+  return soap_outliteral(soap, tag, &(a->xsd__anyType::__item), nullptr);
 }
 
 void *xsd__anyType::soap_in(struct soap *soap, const char *tag,
@@ -28761,13 +28823,13 @@ SOAP_FMAC3 xsd__anyType *SOAP_FMAC4
 soap_in_xsd__anyType(struct soap *soap, const char *tag, xsd__anyType *a,
                      const char *type) {
   (void)type; /* appease -Wall -Werror */
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!(a = (xsd__anyType *)soap_class_id_enter(
             soap, soap->id, a, SOAP_TYPE_ICat4_xsd__anyType,
             sizeof(xsd__anyType), soap->type, soap->arrayType))) {
     soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+    return nullptr;
   }
   soap_revert(soap);
   *soap->id = '\0';
@@ -28777,13 +28839,13 @@ soap_in_xsd__anyType(struct soap *soap, const char *tag, xsd__anyType *a,
       return (xsd__anyType *)a->soap_in(soap, tag, type);
   }
   if (!soap_inliteral(soap, tag, &(a->xsd__anyType::__item)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
 int xsd__anyType::soap_put(struct soap *soap, const char *tag,
                            const char *type) const {
-  int id = soap_embed(soap, (void *)this, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)this, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_xsd__anyType);
   if (this->soap_out(soap, tag ? tag : "xsd:anyType", id, type))
     return soap->error;
@@ -28800,7 +28862,7 @@ soap_get_xsd__anyType(struct soap *soap, xsd__anyType *p, const char *tag,
                       const char *type) {
   if ((p = soap_in_xsd__anyType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -28813,9 +28875,9 @@ soap_instantiate_xsd__anyType(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate_xsd__anyType(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_xsd__anyType, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_xsd__anyType, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (type && !soap_match_tag(soap, type, "xsd:boolean")) {
     cp->type = SOAP_TYPE_ICat4_xsd__boolean;
     if (n < 0) {
@@ -31561,7 +31623,7 @@ soap_default___ns1__getEntityInfo(struct soap *soap,
                                   struct __ns1__getEntityInfo *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getEntityInfo_ = NULL;
+  a->ns1__getEntityInfo_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -31595,9 +31657,9 @@ soap_in___ns1__getEntityInfo(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getEntityInfo *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__getEntityInfo,
-      sizeof(struct __ns1__getEntityInfo), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getEntityInfo), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getEntityInfo(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -31616,7 +31678,7 @@ soap_in___ns1__getEntityInfo(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -31637,7 +31699,7 @@ soap_get___ns1__getEntityInfo(struct soap *soap, struct __ns1__getEntityInfo *p,
                               const char *tag, const char *type) {
   if ((p = soap_in___ns1__getEntityInfo(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -31652,9 +31714,9 @@ soap_instantiate___ns1__getEntityInfo(struct soap *soap, int n,
                       "soap_instantiate___ns1__getEntityInfo(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__getEntityInfo, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__getEntityInfo, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getEntityInfo);
     if (size)
@@ -31688,7 +31750,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__deleteMany(struct soap *soap, struct __ns1__deleteMany *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteMany_ = NULL;
+  a->ns1__deleteMany_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -31722,9 +31784,9 @@ soap_in___ns1__deleteMany(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteMany *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__deleteMany,
-      sizeof(struct __ns1__deleteMany), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteMany), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteMany(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -31742,7 +31804,7 @@ soap_in___ns1__deleteMany(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -31762,7 +31824,7 @@ soap_get___ns1__deleteMany(struct soap *soap, struct __ns1__deleteMany *p,
                            const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteMany(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -31775,9 +31837,9 @@ soap_instantiate___ns1__deleteMany(struct soap *soap, int n, const char *type,
                             "soap_instantiate___ns1__deleteMany(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__deleteMany, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__deleteMany, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteMany);
     if (size)
@@ -31812,7 +31874,7 @@ soap_default___ns1__deleteManyResponse(struct soap *soap,
                                        struct __ns1__deleteManyResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteManyResponse_ = NULL;
+  a->ns1__deleteManyResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__deleteManyResponse(
@@ -31849,9 +31911,9 @@ soap_in___ns1__deleteManyResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteManyResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__deleteManyResponse,
-      sizeof(struct __ns1__deleteManyResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteManyResponse), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteManyResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -31871,7 +31933,7 @@ soap_in___ns1__deleteManyResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -31893,7 +31955,7 @@ soap_get___ns1__deleteManyResponse(struct soap *soap,
                                    const char *tag, const char *type) {
   if ((p = soap_in___ns1__deleteManyResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -31908,10 +31970,11 @@ soap_instantiate___ns1__deleteManyResponse(struct soap *soap, int n,
          SOAP_MESSAGE(
              fdebug, "soap_instantiate___ns1__deleteManyResponse(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__deleteManyResponse, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4___ns1__deleteManyResponse, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteManyResponse);
     if (size)
@@ -31947,7 +32010,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__createMany(struct soap *soap, struct __ns1__createMany *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__createMany_ = NULL;
+  a->ns1__createMany_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -31981,9 +32044,9 @@ soap_in___ns1__createMany(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__createMany *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__createMany,
-      sizeof(struct __ns1__createMany), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__createMany), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__createMany(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -32001,7 +32064,7 @@ soap_in___ns1__createMany(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -32021,7 +32084,7 @@ soap_get___ns1__createMany(struct soap *soap, struct __ns1__createMany *p,
                            const char *tag, const char *type) {
   if ((p = soap_in___ns1__createMany(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -32034,9 +32097,9 @@ soap_instantiate___ns1__createMany(struct soap *soap, int n, const char *type,
                             "soap_instantiate___ns1__createMany(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__createMany, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__createMany, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__createMany);
     if (size)
@@ -32071,7 +32134,7 @@ soap_default___ns1__luceneGetPopulating(struct soap *soap,
                                         struct __ns1__luceneGetPopulating *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__luceneGetPopulating_ = NULL;
+  a->ns1__luceneGetPopulating_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__luceneGetPopulating(
@@ -32107,9 +32170,9 @@ soap_in___ns1__luceneGetPopulating(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__luceneGetPopulating *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__luceneGetPopulating,
-      sizeof(struct __ns1__luceneGetPopulating), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__luceneGetPopulating), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__luceneGetPopulating(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -32128,7 +32191,7 @@ soap_in___ns1__luceneGetPopulating(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -32150,7 +32213,7 @@ soap_get___ns1__luceneGetPopulating(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__luceneGetPopulating(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -32165,10 +32228,11 @@ soap_instantiate___ns1__luceneGetPopulating(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__luceneGetPopulating(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__luceneGetPopulating, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4___ns1__luceneGetPopulating, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__luceneGetPopulating);
     if (size)
@@ -32205,7 +32269,7 @@ soap_default___ns1__luceneSearch(struct soap *soap,
                                  struct __ns1__luceneSearch *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__luceneSearch_ = NULL;
+  a->ns1__luceneSearch_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -32239,9 +32303,9 @@ soap_in___ns1__luceneSearch(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__luceneSearch *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__luceneSearch,
-      sizeof(struct __ns1__luceneSearch), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__luceneSearch), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__luceneSearch(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -32260,7 +32324,7 @@ soap_in___ns1__luceneSearch(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -32281,7 +32345,7 @@ soap_get___ns1__luceneSearch(struct soap *soap, struct __ns1__luceneSearch *p,
                              const char *tag, const char *type) {
   if ((p = soap_in___ns1__luceneSearch(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -32294,9 +32358,9 @@ soap_instantiate___ns1__luceneSearch(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate___ns1__luceneSearch(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__luceneSearch, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__luceneSearch, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__luceneSearch);
     if (size)
@@ -32331,7 +32395,7 @@ soap_default___ns1__luceneCommit(struct soap *soap,
                                  struct __ns1__luceneCommit *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__luceneCommit_ = NULL;
+  a->ns1__luceneCommit_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -32365,9 +32429,9 @@ soap_in___ns1__luceneCommit(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__luceneCommit *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__luceneCommit,
-      sizeof(struct __ns1__luceneCommit), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__luceneCommit), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__luceneCommit(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -32386,7 +32450,7 @@ soap_in___ns1__luceneCommit(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -32407,7 +32471,7 @@ soap_get___ns1__luceneCommit(struct soap *soap, struct __ns1__luceneCommit *p,
                              const char *tag, const char *type) {
   if ((p = soap_in___ns1__luceneCommit(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -32420,9 +32484,9 @@ soap_instantiate___ns1__luceneCommit(struct soap *soap, int n, const char *type,
                    fdebug, "soap_instantiate___ns1__luceneCommit(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__luceneCommit, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__luceneCommit, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__luceneCommit);
     if (size)
@@ -32456,7 +32520,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__luceneCommitResponse(
     struct soap *soap, struct __ns1__luceneCommitResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__luceneCommitResponse_ = NULL;
+  a->ns1__luceneCommitResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__luceneCommitResponse(
@@ -32493,9 +32557,9 @@ soap_in___ns1__luceneCommitResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__luceneCommitResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__luceneCommitResponse,
-      sizeof(struct __ns1__luceneCommitResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__luceneCommitResponse), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__luceneCommitResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -32516,7 +32580,7 @@ soap_in___ns1__luceneCommitResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -32537,7 +32601,7 @@ soap_get___ns1__luceneCommitResponse(struct soap *soap,
                                      const char *tag, const char *type) {
   if ((p = soap_in___ns1__luceneCommitResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -32553,10 +32617,10 @@ soap_instantiate___ns1__luceneCommitResponse(struct soap *soap, int n,
                    "soap_instantiate___ns1__luceneCommitResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4___ns1__luceneCommitResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4___ns1__luceneCommitResponse, n,
                 ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__luceneCommitResponse);
     if (size)
@@ -32594,7 +32658,7 @@ soap_default___ns1__luceneClear(struct soap *soap,
                                 struct __ns1__luceneClear *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__luceneClear_ = NULL;
+  a->ns1__luceneClear_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -32628,9 +32692,9 @@ soap_in___ns1__luceneClear(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__luceneClear *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__luceneClear,
-      sizeof(struct __ns1__luceneClear), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__luceneClear), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__luceneClear(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -32649,7 +32713,7 @@ soap_in___ns1__luceneClear(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -32670,7 +32734,7 @@ soap_get___ns1__luceneClear(struct soap *soap, struct __ns1__luceneClear *p,
                             const char *tag, const char *type) {
   if ((p = soap_in___ns1__luceneClear(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -32683,9 +32747,9 @@ soap_instantiate___ns1__luceneClear(struct soap *soap, int n, const char *type,
                             "soap_instantiate___ns1__luceneClear(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__luceneClear, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__luceneClear, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__luceneClear);
     if (size)
@@ -32720,7 +32784,7 @@ soap_default___ns1__luceneClearResponse(struct soap *soap,
                                         struct __ns1__luceneClearResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__luceneClearResponse_ = NULL;
+  a->ns1__luceneClearResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__luceneClearResponse(
@@ -32758,9 +32822,9 @@ soap_in___ns1__luceneClearResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__luceneClearResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__luceneClearResponse,
-      sizeof(struct __ns1__luceneClearResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__luceneClearResponse), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__luceneClearResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -32780,7 +32844,7 @@ soap_in___ns1__luceneClearResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -32802,7 +32866,7 @@ soap_get___ns1__luceneClearResponse(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__luceneClearResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -32817,10 +32881,11 @@ soap_instantiate___ns1__luceneClearResponse(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__luceneClearResponse(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__luceneClearResponse, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4___ns1__luceneClearResponse, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__luceneClearResponse);
     if (size)
@@ -32857,7 +32922,7 @@ soap_default___ns1__lucenePopulate(struct soap *soap,
                                    struct __ns1__lucenePopulate *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__lucenePopulate_ = NULL;
+  a->ns1__lucenePopulate_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -32892,9 +32957,9 @@ soap_in___ns1__lucenePopulate(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__lucenePopulate *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__lucenePopulate,
-      sizeof(struct __ns1__lucenePopulate), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__lucenePopulate), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__lucenePopulate(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -32913,7 +32978,7 @@ soap_in___ns1__lucenePopulate(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -32935,7 +33000,7 @@ soap_get___ns1__lucenePopulate(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__lucenePopulate(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -32950,9 +33015,9 @@ soap_instantiate___ns1__lucenePopulate(struct soap *soap, int n,
                       "soap_instantiate___ns1__lucenePopulate(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__lucenePopulate, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__lucenePopulate, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__lucenePopulate);
     if (size)
@@ -32986,7 +33051,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default___ns1__lucenePopulateResponse(
     struct soap *soap, struct __ns1__lucenePopulateResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__lucenePopulateResponse_ = NULL;
+  a->ns1__lucenePopulateResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__lucenePopulateResponse(
@@ -33023,9 +33088,10 @@ soap_in___ns1__lucenePopulateResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__lucenePopulateResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__lucenePopulateResponse,
-      sizeof(struct __ns1__lucenePopulateResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__lucenePopulateResponse), 0, nullptr, nullptr,
+      nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__lucenePopulateResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -33046,7 +33112,7 @@ soap_in___ns1__lucenePopulateResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -33067,7 +33133,7 @@ soap_get___ns1__lucenePopulateResponse(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__lucenePopulateResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -33084,10 +33150,10 @@ soap_instantiate___ns1__lucenePopulateResponse(struct soap *soap, int n,
              "soap_instantiate___ns1__lucenePopulateResponse(%d, %s, %s)\n", n,
              type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4___ns1__lucenePopulateResponse, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4___ns1__lucenePopulateResponse, n,
                 ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__lucenePopulateResponse);
     if (size)
@@ -33125,7 +33191,7 @@ soap_default___ns1__isAccessAllowed(struct soap *soap,
                                     struct __ns1__isAccessAllowed *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__isAccessAllowed_ = NULL;
+  a->ns1__isAccessAllowed_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -33160,9 +33226,9 @@ soap_in___ns1__isAccessAllowed(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__isAccessAllowed *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__isAccessAllowed,
-      sizeof(struct __ns1__isAccessAllowed), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__isAccessAllowed), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__isAccessAllowed(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -33181,7 +33247,7 @@ soap_in___ns1__isAccessAllowed(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -33203,7 +33269,7 @@ soap_get___ns1__isAccessAllowed(struct soap *soap,
                                 const char *tag, const char *type) {
   if ((p = soap_in___ns1__isAccessAllowed(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -33218,9 +33284,9 @@ soap_instantiate___ns1__isAccessAllowed(struct soap *soap, int n,
                       "soap_instantiate___ns1__isAccessAllowed(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__isAccessAllowed, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__isAccessAllowed, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__isAccessAllowed);
     if (size)
@@ -33254,7 +33320,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__searchText(struct soap *soap, struct __ns1__searchText *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__searchText_ = NULL;
+  a->ns1__searchText_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -33288,9 +33354,9 @@ soap_in___ns1__searchText(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__searchText *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__searchText,
-      sizeof(struct __ns1__searchText), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__searchText), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__searchText(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -33308,7 +33374,7 @@ soap_in___ns1__searchText(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -33328,7 +33394,7 @@ soap_get___ns1__searchText(struct soap *soap, struct __ns1__searchText *p,
                            const char *tag, const char *type) {
   if ((p = soap_in___ns1__searchText(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -33341,9 +33407,9 @@ soap_instantiate___ns1__searchText(struct soap *soap, int n, const char *type,
                             "soap_instantiate___ns1__searchText(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__searchText, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__searchText, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__searchText);
     if (size)
@@ -33378,7 +33444,7 @@ soap_default___ns1__getRemainingMinutes(struct soap *soap,
                                         struct __ns1__getRemainingMinutes *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getRemainingMinutes_ = NULL;
+  a->ns1__getRemainingMinutes_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize___ns1__getRemainingMinutes(
@@ -33414,9 +33480,9 @@ soap_in___ns1__getRemainingMinutes(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getRemainingMinutes *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__getRemainingMinutes,
-      sizeof(struct __ns1__getRemainingMinutes), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getRemainingMinutes), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getRemainingMinutes(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -33435,7 +33501,7 @@ soap_in___ns1__getRemainingMinutes(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -33457,7 +33523,7 @@ soap_get___ns1__getRemainingMinutes(struct soap *soap,
                                     const char *tag, const char *type) {
   if ((p = soap_in___ns1__getRemainingMinutes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -33472,10 +33538,11 @@ soap_instantiate___ns1__getRemainingMinutes(struct soap *soap, int n,
                    fdebug,
                    "soap_instantiate___ns1__getRemainingMinutes(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__getRemainingMinutes, n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4___ns1__getRemainingMinutes, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getRemainingMinutes);
     if (size)
@@ -33511,7 +33578,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__logout(struct soap *soap, struct __ns1__logout *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__logout_ = NULL;
+  a->ns1__logout_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -33543,9 +33610,9 @@ soap_in___ns1__logout(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__logout *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__logout, sizeof(struct __ns1__logout),
-      0, NULL, NULL, NULL);
+      0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__logout(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -33563,7 +33630,7 @@ soap_in___ns1__logout(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -33582,7 +33649,7 @@ soap_get___ns1__logout(struct soap *soap, struct __ns1__logout *p,
                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__logout(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -33595,9 +33662,9 @@ soap_instantiate___ns1__logout(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate___ns1__logout(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4___ns1__logout, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4___ns1__logout, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__logout);
     if (size)
@@ -33631,7 +33698,7 @@ soap_default___ns1__logoutResponse(struct soap *soap,
                                    struct __ns1__logoutResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__logoutResponse_ = NULL;
+  a->ns1__logoutResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -33668,9 +33735,9 @@ soap_in___ns1__logoutResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__logoutResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__logoutResponse,
-      sizeof(struct __ns1__logoutResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__logoutResponse), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__logoutResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -33690,7 +33757,7 @@ soap_in___ns1__logoutResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -33712,7 +33779,7 @@ soap_get___ns1__logoutResponse(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__logoutResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -33727,9 +33794,9 @@ soap_instantiate___ns1__logoutResponse(struct soap *soap, int n,
                       "soap_instantiate___ns1__logoutResponse(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__logoutResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__logoutResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__logoutResponse);
     if (size)
@@ -33763,7 +33830,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__dummy(struct soap *soap, struct __ns1__dummy *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__dummy_ = NULL;
+  a->ns1__dummy_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -33794,9 +33861,9 @@ soap_in___ns1__dummy(struct soap *soap, const char *tag, struct __ns1__dummy *a,
   short soap_flag;
   a = (struct __ns1__dummy *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__dummy, sizeof(struct __ns1__dummy), 0,
-      NULL, NULL, NULL);
+      nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__dummy(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -33814,7 +33881,7 @@ soap_in___ns1__dummy(struct soap *soap, const char *tag, struct __ns1__dummy *a,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -33833,7 +33900,7 @@ soap_get___ns1__dummy(struct soap *soap, struct __ns1__dummy *p,
                       const char *tag, const char *type) {
   if ((p = soap_in___ns1__dummy(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -33846,9 +33913,9 @@ soap_instantiate___ns1__dummy(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate___ns1__dummy(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4___ns1__dummy, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4___ns1__dummy, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__dummy);
     if (size)
@@ -33882,7 +33949,7 @@ soap_default___ns1__dummyResponse(struct soap *soap,
                                   struct __ns1__dummyResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__dummyResponse_ = NULL;
+  a->ns1__dummyResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -33918,9 +33985,9 @@ soap_in___ns1__dummyResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__dummyResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__dummyResponse,
-      sizeof(struct __ns1__dummyResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__dummyResponse), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__dummyResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -33940,7 +34007,7 @@ soap_in___ns1__dummyResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -33961,7 +34028,7 @@ soap_get___ns1__dummyResponse(struct soap *soap, struct __ns1__dummyResponse *p,
                               const char *tag, const char *type) {
   if ((p = soap_in___ns1__dummyResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -33976,9 +34043,9 @@ soap_instantiate___ns1__dummyResponse(struct soap *soap, int n,
                       "soap_instantiate___ns1__dummyResponse(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__dummyResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__dummyResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__dummyResponse);
     if (size)
@@ -34012,7 +34079,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__refresh(struct soap *soap, struct __ns1__refresh *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__refresh_ = NULL;
+  a->ns1__refresh_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -34045,9 +34112,9 @@ soap_in___ns1__refresh(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__refresh *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__refresh,
-      sizeof(struct __ns1__refresh), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__refresh), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__refresh(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -34065,7 +34132,7 @@ soap_in___ns1__refresh(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -34084,7 +34151,7 @@ soap_get___ns1__refresh(struct soap *soap, struct __ns1__refresh *p,
                         const char *tag, const char *type) {
   if ((p = soap_in___ns1__refresh(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -34096,10 +34163,10 @@ soap_instantiate___ns1__refresh(struct soap *soap, int n, const char *type,
   DBGLOG(TEST,
          SOAP_MESSAGE(fdebug, "soap_instantiate___ns1__refresh(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4___ns1__refresh, n, ICat4_fdelete);
+  struct soap_clist *cp = soap_link(
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__refresh, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__refresh);
     if (size)
@@ -34133,7 +34200,7 @@ soap_default___ns1__refreshResponse(struct soap *soap,
                                     struct __ns1__refreshResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__refreshResponse_ = NULL;
+  a->ns1__refreshResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -34170,9 +34237,9 @@ soap_in___ns1__refreshResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__refreshResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__refreshResponse,
-      sizeof(struct __ns1__refreshResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__refreshResponse), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__refreshResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -34192,7 +34259,7 @@ soap_in___ns1__refreshResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -34214,7 +34281,7 @@ soap_get___ns1__refreshResponse(struct soap *soap,
                                 const char *tag, const char *type) {
   if ((p = soap_in___ns1__refreshResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -34229,9 +34296,9 @@ soap_instantiate___ns1__refreshResponse(struct soap *soap, int n,
                       "soap_instantiate___ns1__refreshResponse(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__refreshResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__refreshResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__refreshResponse);
     if (size)
@@ -34266,7 +34333,7 @@ soap_default___ns1__getEntityNames(struct soap *soap,
                                    struct __ns1__getEntityNames *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getEntityNames_ = NULL;
+  a->ns1__getEntityNames_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -34301,9 +34368,9 @@ soap_in___ns1__getEntityNames(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getEntityNames *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__getEntityNames,
-      sizeof(struct __ns1__getEntityNames), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getEntityNames), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getEntityNames(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -34322,7 +34389,7 @@ soap_in___ns1__getEntityNames(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -34344,7 +34411,7 @@ soap_get___ns1__getEntityNames(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__getEntityNames(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -34359,9 +34426,9 @@ soap_instantiate___ns1__getEntityNames(struct soap *soap, int n,
                       "soap_instantiate___ns1__getEntityNames(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__getEntityNames, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__getEntityNames, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getEntityNames);
     if (size)
@@ -34396,7 +34463,7 @@ soap_default___ns1__getApiVersion(struct soap *soap,
                                   struct __ns1__getApiVersion *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getApiVersion_ = NULL;
+  a->ns1__getApiVersion_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -34430,9 +34497,9 @@ soap_in___ns1__getApiVersion(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getApiVersion *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__getApiVersion,
-      sizeof(struct __ns1__getApiVersion), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getApiVersion), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getApiVersion(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -34451,7 +34518,7 @@ soap_in___ns1__getApiVersion(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -34472,7 +34539,7 @@ soap_get___ns1__getApiVersion(struct soap *soap, struct __ns1__getApiVersion *p,
                               const char *tag, const char *type) {
   if ((p = soap_in___ns1__getApiVersion(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -34487,9 +34554,9 @@ soap_instantiate___ns1__getApiVersion(struct soap *soap, int n,
                       "soap_instantiate___ns1__getApiVersion(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__getApiVersion, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__getApiVersion, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getApiVersion);
     if (size)
@@ -34523,7 +34590,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__update(struct soap *soap, struct __ns1__update *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__update_ = NULL;
+  a->ns1__update_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -34555,9 +34622,9 @@ soap_in___ns1__update(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__update *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__update, sizeof(struct __ns1__update),
-      0, NULL, NULL, NULL);
+      0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__update(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -34575,7 +34642,7 @@ soap_in___ns1__update(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -34594,7 +34661,7 @@ soap_get___ns1__update(struct soap *soap, struct __ns1__update *p,
                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__update(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -34607,9 +34674,9 @@ soap_instantiate___ns1__update(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate___ns1__update(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4___ns1__update, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4___ns1__update, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__update);
     if (size)
@@ -34643,7 +34710,7 @@ soap_default___ns1__updateResponse(struct soap *soap,
                                    struct __ns1__updateResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__updateResponse_ = NULL;
+  a->ns1__updateResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -34680,9 +34747,9 @@ soap_in___ns1__updateResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__updateResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__updateResponse,
-      sizeof(struct __ns1__updateResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__updateResponse), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__updateResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -34702,7 +34769,7 @@ soap_in___ns1__updateResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -34724,7 +34791,7 @@ soap_get___ns1__updateResponse(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__updateResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -34739,9 +34806,9 @@ soap_instantiate___ns1__updateResponse(struct soap *soap, int n,
                       "soap_instantiate___ns1__updateResponse(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__updateResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__updateResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__updateResponse);
     if (size)
@@ -34775,7 +34842,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__create(struct soap *soap, struct __ns1__create *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__create_ = NULL;
+  a->ns1__create_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -34807,9 +34874,9 @@ soap_in___ns1__create(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__create *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__create, sizeof(struct __ns1__create),
-      0, NULL, NULL, NULL);
+      0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__create(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -34827,7 +34894,7 @@ soap_in___ns1__create(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -34846,7 +34913,7 @@ soap_get___ns1__create(struct soap *soap, struct __ns1__create *p,
                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__create(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -34859,9 +34926,9 @@ soap_instantiate___ns1__create(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate___ns1__create(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4___ns1__create, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4___ns1__create, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__create);
     if (size)
@@ -34894,7 +34961,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__search(struct soap *soap, struct __ns1__search *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__search_ = NULL;
+  a->ns1__search_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -34926,9 +34993,9 @@ soap_in___ns1__search(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__search *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__search, sizeof(struct __ns1__search),
-      0, NULL, NULL, NULL);
+      0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__search(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -34946,7 +35013,7 @@ soap_in___ns1__search(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -34965,7 +35032,7 @@ soap_get___ns1__search(struct soap *soap, struct __ns1__search *p,
                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__search(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -34978,9 +35045,9 @@ soap_instantiate___ns1__search(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate___ns1__search(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4___ns1__search, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4___ns1__search, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__search);
     if (size)
@@ -35013,7 +35080,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__delete(struct soap *soap, struct __ns1__delete *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__delete_ = NULL;
+  a->ns1__delete_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -35045,9 +35112,9 @@ soap_in___ns1__delete(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__delete *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__delete, sizeof(struct __ns1__delete),
-      0, NULL, NULL, NULL);
+      0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__delete(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -35065,7 +35132,7 @@ soap_in___ns1__delete(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -35084,7 +35151,7 @@ soap_get___ns1__delete(struct soap *soap, struct __ns1__delete *p,
                        const char *tag, const char *type) {
   if ((p = soap_in___ns1__delete(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -35097,9 +35164,9 @@ soap_instantiate___ns1__delete(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate___ns1__delete(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4___ns1__delete, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4___ns1__delete, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__delete);
     if (size)
@@ -35133,7 +35200,7 @@ soap_default___ns1__deleteResponse(struct soap *soap,
                                    struct __ns1__deleteResponse *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__deleteResponse_ = NULL;
+  a->ns1__deleteResponse_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -35170,9 +35237,9 @@ soap_in___ns1__deleteResponse(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__deleteResponse *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__deleteResponse,
-      sizeof(struct __ns1__deleteResponse), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__deleteResponse), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__deleteResponse(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -35192,7 +35259,7 @@ soap_in___ns1__deleteResponse(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -35214,7 +35281,7 @@ soap_get___ns1__deleteResponse(struct soap *soap,
                                const char *type) {
   if ((p = soap_in___ns1__deleteResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -35229,9 +35296,9 @@ soap_instantiate___ns1__deleteResponse(struct soap *soap, int n,
                       "soap_instantiate___ns1__deleteResponse(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__deleteResponse, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__deleteResponse, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__deleteResponse);
     if (size)
@@ -35266,7 +35333,7 @@ soap_default___ns1__getProperties(struct soap *soap,
                                   struct __ns1__getProperties *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getProperties_ = NULL;
+  a->ns1__getProperties_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -35300,9 +35367,9 @@ soap_in___ns1__getProperties(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getProperties *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__getProperties,
-      sizeof(struct __ns1__getProperties), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getProperties), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getProperties(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -35321,7 +35388,7 @@ soap_in___ns1__getProperties(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -35342,7 +35409,7 @@ soap_get___ns1__getProperties(struct soap *soap, struct __ns1__getProperties *p,
                               const char *tag, const char *type) {
   if ((p = soap_in___ns1__getProperties(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -35357,9 +35424,9 @@ soap_instantiate___ns1__getProperties(struct soap *soap, int n,
                       "soap_instantiate___ns1__getProperties(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__getProperties, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__getProperties, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getProperties);
     if (size)
@@ -35393,7 +35460,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__get(struct soap *soap, struct __ns1__get *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__get_ = NULL;
+  a->ns1__get_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -35424,9 +35491,9 @@ soap_in___ns1__get(struct soap *soap, const char *tag, struct __ns1__get *a,
   short soap_flag;
   a = (struct __ns1__get *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__get, sizeof(struct __ns1__get), 0,
-      NULL, NULL, NULL);
+      nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__get(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -35444,7 +35511,7 @@ soap_in___ns1__get(struct soap *soap, const char *tag, struct __ns1__get *a,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -35463,7 +35530,7 @@ soap_get___ns1__get(struct soap *soap, struct __ns1__get *p, const char *tag,
                     const char *type) {
   if ((p = soap_in___ns1__get(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -35475,9 +35542,9 @@ soap_instantiate___ns1__get(struct soap *soap, int n, const char *type,
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate___ns1__get(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4___ns1__get, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4___ns1__get, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__get);
     if (size)
@@ -35511,7 +35578,7 @@ soap_default___ns1__getUserName(struct soap *soap,
                                 struct __ns1__getUserName *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__getUserName_ = NULL;
+  a->ns1__getUserName_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -35545,9 +35612,9 @@ soap_in___ns1__getUserName(struct soap *soap, const char *tag,
   short soap_flag;
   a = (struct __ns1__getUserName *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__getUserName,
-      sizeof(struct __ns1__getUserName), 0, NULL, NULL, NULL);
+      sizeof(struct __ns1__getUserName), 0, nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__getUserName(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -35566,7 +35633,7 @@ soap_in___ns1__getUserName(struct soap *soap, const char *tag,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -35587,7 +35654,7 @@ soap_get___ns1__getUserName(struct soap *soap, struct __ns1__getUserName *p,
                             const char *tag, const char *type) {
   if ((p = soap_in___ns1__getUserName(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -35600,9 +35667,9 @@ soap_instantiate___ns1__getUserName(struct soap *soap, int n, const char *type,
                             "soap_instantiate___ns1__getUserName(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4___ns1__getUserName, n, ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4___ns1__getUserName, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__getUserName);
     if (size)
@@ -35636,7 +35703,7 @@ SOAP_FMAC3 void SOAP_FMAC4
 soap_default___ns1__login(struct soap *soap, struct __ns1__login *a) {
   (void)soap;
   (void)a; /* appease -Wall -Werror */
-  a->ns1__login_ = NULL;
+  a->ns1__login_ = nullptr;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4
@@ -35667,9 +35734,9 @@ soap_in___ns1__login(struct soap *soap, const char *tag, struct __ns1__login *a,
   short soap_flag;
   a = (struct __ns1__login *)soap_id_enter(
       soap, "", a, SOAP_TYPE_ICat4___ns1__login, sizeof(struct __ns1__login), 0,
-      NULL, NULL, NULL);
+      nullptr, nullptr, nullptr);
   if (!a)
-    return NULL;
+    return nullptr;
   soap_default___ns1__login(soap, a);
   for (soap_flag = 0;; soap_flag = 1) {
     soap->error = SOAP_TAG_MISMATCH;
@@ -35687,7 +35754,7 @@ soap_in___ns1__login(struct soap *soap, const char *tag, struct __ns1__login *a,
     if (soap_flag && soap->error == SOAP_NO_TAG)
       break;
     if (soap->error)
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -35706,7 +35773,7 @@ soap_get___ns1__login(struct soap *soap, struct __ns1__login *p,
                       const char *tag, const char *type) {
   if ((p = soap_in___ns1__login(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -35719,9 +35786,9 @@ soap_instantiate___ns1__login(struct soap *soap, int n, const char *type,
          SOAP_MESSAGE(fdebug, "soap_instantiate___ns1__login(%d, %s, %s)\n", n,
                       type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4___ns1__login, n, ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4___ns1__login, n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(struct __ns1__login);
     if (size)
@@ -36136,7 +36203,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__getEntityInfoResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getEntityInfoResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getEntityInfoResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__getEntityInfoResponse);
   if (id < 0)
     return soap->error;
@@ -36147,22 +36214,22 @@ SOAP_FMAC3 ns1__getEntityInfoResponse **SOAP_FMAC4
 soap_in_PointerTons1__getEntityInfoResponse(struct soap *soap, const char *tag,
                                             ns1__getEntityInfoResponse **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getEntityInfoResponse **)soap_malloc(
               soap, sizeof(ns1__getEntityInfoResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getEntityInfoResponse *)
               soap_instantiate_ns1__getEntityInfoResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getEntityInfoResponse **p =
         (ns1__getEntityInfoResponse **)soap_id_lookup(
@@ -36171,7 +36238,7 @@ soap_in_PointerTons1__getEntityInfoResponse(struct soap *soap, const char *tag,
             sizeof(ns1__getEntityInfoResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -36179,7 +36246,7 @@ soap_in_PointerTons1__getEntityInfoResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getEntityInfoResponse(
     struct soap *soap, ns1__getEntityInfoResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__getEntityInfoResponse);
   if (soap_out_PointerTons1__getEntityInfoResponse(
           soap, tag ? tag : "ns1:getEntityInfoResponse", id, a, type))
@@ -36194,7 +36261,7 @@ soap_get_PointerTons1__getEntityInfoResponse(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__getEntityInfoResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36211,7 +36278,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getEntityInfo(struct soap *soap, const char *tag, int id,
                                      ns1__getEntityInfo *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__getEntityInfo);
   if (id < 0)
     return soap->error;
@@ -36221,28 +36288,28 @@ soap_out_PointerTons1__getEntityInfo(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__getEntityInfo **SOAP_FMAC4
 soap_in_PointerTons1__getEntityInfo(struct soap *soap, const char *tag,
                                     ns1__getEntityInfo **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getEntityInfo **)soap_malloc(soap,
                                                  sizeof(ns1__getEntityInfo *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getEntityInfo *)soap_instantiate_ns1__getEntityInfo(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getEntityInfo **p = (ns1__getEntityInfo **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__getEntityInfo,
         sizeof(ns1__getEntityInfo), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -36251,7 +36318,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getEntityInfo(struct soap *soap,
                                      ns1__getEntityInfo *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__getEntityInfo);
   if (soap_out_PointerTons1__getEntityInfo(
           soap, tag ? tag : "ns1:getEntityInfo", id, a, type))
@@ -36264,7 +36331,7 @@ soap_get_PointerTons1__getEntityInfo(struct soap *soap, ns1__getEntityInfo **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getEntityInfo(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36281,7 +36348,7 @@ soap_out_PointerTons1__deleteManyResponse(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__deleteManyResponse *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__deleteManyResponse);
   if (id < 0)
     return soap->error;
@@ -36292,29 +36359,29 @@ SOAP_FMAC3 ns1__deleteManyResponse **SOAP_FMAC4
 soap_in_PointerTons1__deleteManyResponse(struct soap *soap, const char *tag,
                                          ns1__deleteManyResponse **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteManyResponse **)soap_malloc(
               soap, sizeof(ns1__deleteManyResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteManyResponse *)
-              soap_instantiate_ns1__deleteManyResponse(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__deleteManyResponse(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteManyResponse **p = (ns1__deleteManyResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__deleteManyResponse,
         sizeof(ns1__deleteManyResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -36323,7 +36390,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__deleteManyResponse(struct soap *soap,
                                           ns1__deleteManyResponse *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__deleteManyResponse);
   if (soap_out_PointerTons1__deleteManyResponse(
           soap, tag ? tag : "ns1:deleteManyResponse", id, a, type))
@@ -36337,7 +36404,7 @@ soap_get_PointerTons1__deleteManyResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__deleteManyResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36353,7 +36420,7 @@ soap_serialize_PointerTons1__deleteMany(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__deleteMany(struct soap *soap, const char *tag, int id,
                                   ns1__deleteMany *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__deleteMany);
   if (id < 0)
     return soap->error;
@@ -36363,27 +36430,27 @@ soap_out_PointerTons1__deleteMany(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__deleteMany **SOAP_FMAC4
 soap_in_PointerTons1__deleteMany(struct soap *soap, const char *tag,
                                  ns1__deleteMany **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteMany **)soap_malloc(soap, sizeof(ns1__deleteMany *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteMany *)soap_instantiate_ns1__deleteMany(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteMany **p = (ns1__deleteMany **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__deleteMany,
         sizeof(ns1__deleteMany), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -36391,7 +36458,7 @@ soap_in_PointerTons1__deleteMany(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__deleteMany(struct soap *soap, ns1__deleteMany *const *a,
                                   const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__deleteMany);
   if (soap_out_PointerTons1__deleteMany(soap, tag ? tag : "ns1:deleteMany", id,
                                         a, type))
@@ -36404,7 +36471,7 @@ soap_get_PointerTons1__deleteMany(struct soap *soap, ns1__deleteMany **p,
                                   const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__deleteMany(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36421,7 +36488,7 @@ soap_out_PointerTons1__createManyResponse(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__createManyResponse *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__createManyResponse);
   if (id < 0)
     return soap->error;
@@ -36432,29 +36499,29 @@ SOAP_FMAC3 ns1__createManyResponse **SOAP_FMAC4
 soap_in_PointerTons1__createManyResponse(struct soap *soap, const char *tag,
                                          ns1__createManyResponse **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__createManyResponse **)soap_malloc(
               soap, sizeof(ns1__createManyResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__createManyResponse *)
-              soap_instantiate_ns1__createManyResponse(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__createManyResponse(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__createManyResponse **p = (ns1__createManyResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__createManyResponse,
         sizeof(ns1__createManyResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -36463,7 +36530,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__createManyResponse(struct soap *soap,
                                           ns1__createManyResponse *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__createManyResponse);
   if (soap_out_PointerTons1__createManyResponse(
           soap, tag ? tag : "ns1:createManyResponse", id, a, type))
@@ -36477,7 +36544,7 @@ soap_get_PointerTons1__createManyResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__createManyResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36493,7 +36560,7 @@ soap_serialize_PointerTons1__createMany(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__createMany(struct soap *soap, const char *tag, int id,
                                   ns1__createMany *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__createMany);
   if (id < 0)
     return soap->error;
@@ -36503,27 +36570,27 @@ soap_out_PointerTons1__createMany(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__createMany **SOAP_FMAC4
 soap_in_PointerTons1__createMany(struct soap *soap, const char *tag,
                                  ns1__createMany **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__createMany **)soap_malloc(soap, sizeof(ns1__createMany *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__createMany *)soap_instantiate_ns1__createMany(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__createMany **p = (ns1__createMany **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__createMany,
         sizeof(ns1__createMany), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -36531,7 +36598,7 @@ soap_in_PointerTons1__createMany(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__createMany(struct soap *soap, ns1__createMany *const *a,
                                   const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__createMany);
   if (soap_out_PointerTons1__createMany(soap, tag ? tag : "ns1:createMany", id,
                                         a, type))
@@ -36544,7 +36611,7 @@ soap_get_PointerTons1__createMany(struct soap *soap, ns1__createMany **p,
                                   const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__createMany(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36561,7 +36628,7 @@ soap_serialize_PointerTons1__luceneGetPopulatingResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__luceneGetPopulatingResponse(
     struct soap *soap, const char *tag, int id,
     ns1__luceneGetPopulatingResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__luceneGetPopulatingResponse);
   if (id < 0)
     return soap->error;
@@ -36572,22 +36639,22 @@ SOAP_FMAC3 ns1__luceneGetPopulatingResponse **SOAP_FMAC4
 soap_in_PointerTons1__luceneGetPopulatingResponse(
     struct soap *soap, const char *tag, ns1__luceneGetPopulatingResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__luceneGetPopulatingResponse **)soap_malloc(
               soap, sizeof(ns1__luceneGetPopulatingResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__luceneGetPopulatingResponse *)
               soap_instantiate_ns1__luceneGetPopulatingResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__luceneGetPopulatingResponse **p =
         (ns1__luceneGetPopulatingResponse **)soap_id_lookup(
@@ -36596,7 +36663,7 @@ soap_in_PointerTons1__luceneGetPopulatingResponse(
             sizeof(ns1__luceneGetPopulatingResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -36605,7 +36672,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__luceneGetPopulatingResponse(
     struct soap *soap, ns1__luceneGetPopulatingResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat4_PointerTons1__luceneGetPopulatingResponse);
   if (soap_out_PointerTons1__luceneGetPopulatingResponse(
           soap, tag ? tag : "ns1:luceneGetPopulatingResponse", id, a, type))
@@ -36620,7 +36687,7 @@ soap_get_PointerTons1__luceneGetPopulatingResponse(
   if ((p = soap_in_PointerTons1__luceneGetPopulatingResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36637,7 +36704,7 @@ soap_out_PointerTons1__luceneGetPopulating(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__luceneGetPopulating *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__luceneGetPopulating);
   if (id < 0)
     return soap->error;
@@ -36648,29 +36715,29 @@ SOAP_FMAC3 ns1__luceneGetPopulating **SOAP_FMAC4
 soap_in_PointerTons1__luceneGetPopulating(struct soap *soap, const char *tag,
                                           ns1__luceneGetPopulating **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__luceneGetPopulating **)soap_malloc(
               soap, sizeof(ns1__luceneGetPopulating *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__luceneGetPopulating *)
-              soap_instantiate_ns1__luceneGetPopulating(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__luceneGetPopulating(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__luceneGetPopulating **p = (ns1__luceneGetPopulating **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__luceneGetPopulating,
         sizeof(ns1__luceneGetPopulating), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -36679,7 +36746,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__luceneGetPopulating(struct soap *soap,
                                            ns1__luceneGetPopulating *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__luceneGetPopulating);
   if (soap_out_PointerTons1__luceneGetPopulating(
           soap, tag ? tag : "ns1:luceneGetPopulating", id, a, type))
@@ -36693,7 +36760,7 @@ soap_get_PointerTons1__luceneGetPopulating(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__luceneGetPopulating(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36710,7 +36777,7 @@ soap_out_PointerTons1__luceneSearchResponse(struct soap *soap, const char *tag,
                                             int id,
                                             ns1__luceneSearchResponse *const *a,
                                             const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__luceneSearchResponse);
   if (id < 0)
     return soap->error;
@@ -36721,22 +36788,22 @@ SOAP_FMAC3 ns1__luceneSearchResponse **SOAP_FMAC4
 soap_in_PointerTons1__luceneSearchResponse(struct soap *soap, const char *tag,
                                            ns1__luceneSearchResponse **a,
                                            const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__luceneSearchResponse **)soap_malloc(
               soap, sizeof(ns1__luceneSearchResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__luceneSearchResponse *)
               soap_instantiate_ns1__luceneSearchResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__luceneSearchResponse **p =
         (ns1__luceneSearchResponse **)soap_id_lookup(
@@ -36745,7 +36812,7 @@ soap_in_PointerTons1__luceneSearchResponse(struct soap *soap, const char *tag,
             sizeof(ns1__luceneSearchResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -36754,7 +36821,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__luceneSearchResponse(struct soap *soap,
                                             ns1__luceneSearchResponse *const *a,
                                             const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__luceneSearchResponse);
   if (soap_out_PointerTons1__luceneSearchResponse(
           soap, tag ? tag : "ns1:luceneSearchResponse", id, a, type))
@@ -36768,7 +36835,7 @@ soap_get_PointerTons1__luceneSearchResponse(struct soap *soap,
                                             const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__luceneSearchResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36785,7 +36852,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__luceneSearch(struct soap *soap, const char *tag, int id,
                                     ns1__luceneSearch *const *a,
                                     const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__luceneSearch);
   if (id < 0)
     return soap->error;
@@ -36795,28 +36862,28 @@ soap_out_PointerTons1__luceneSearch(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__luceneSearch **SOAP_FMAC4
 soap_in_PointerTons1__luceneSearch(struct soap *soap, const char *tag,
                                    ns1__luceneSearch **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__luceneSearch **)soap_malloc(soap,
                                                 sizeof(ns1__luceneSearch *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__luceneSearch *)soap_instantiate_ns1__luceneSearch(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__luceneSearch **p = (ns1__luceneSearch **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__luceneSearch,
         sizeof(ns1__luceneSearch), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -36825,7 +36892,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__luceneSearch(struct soap *soap,
                                     ns1__luceneSearch *const *a,
                                     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__luceneSearch);
   if (soap_out_PointerTons1__luceneSearch(soap, tag ? tag : "ns1:luceneSearch",
                                           id, a, type))
@@ -36838,7 +36905,7 @@ soap_get_PointerTons1__luceneSearch(struct soap *soap, ns1__luceneSearch **p,
                                     const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__luceneSearch(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36855,7 +36922,7 @@ soap_out_PointerTons1__luceneCommitResponse(struct soap *soap, const char *tag,
                                             int id,
                                             ns1__luceneCommitResponse *const *a,
                                             const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__luceneCommitResponse);
   if (id < 0)
     return soap->error;
@@ -36866,22 +36933,22 @@ SOAP_FMAC3 ns1__luceneCommitResponse **SOAP_FMAC4
 soap_in_PointerTons1__luceneCommitResponse(struct soap *soap, const char *tag,
                                            ns1__luceneCommitResponse **a,
                                            const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__luceneCommitResponse **)soap_malloc(
               soap, sizeof(ns1__luceneCommitResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__luceneCommitResponse *)
               soap_instantiate_ns1__luceneCommitResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__luceneCommitResponse **p =
         (ns1__luceneCommitResponse **)soap_id_lookup(
@@ -36890,7 +36957,7 @@ soap_in_PointerTons1__luceneCommitResponse(struct soap *soap, const char *tag,
             sizeof(ns1__luceneCommitResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -36899,7 +36966,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__luceneCommitResponse(struct soap *soap,
                                             ns1__luceneCommitResponse *const *a,
                                             const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__luceneCommitResponse);
   if (soap_out_PointerTons1__luceneCommitResponse(
           soap, tag ? tag : "ns1:luceneCommitResponse", id, a, type))
@@ -36913,7 +36980,7 @@ soap_get_PointerTons1__luceneCommitResponse(struct soap *soap,
                                             const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__luceneCommitResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -36930,7 +36997,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__luceneCommit(struct soap *soap, const char *tag, int id,
                                     ns1__luceneCommit *const *a,
                                     const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__luceneCommit);
   if (id < 0)
     return soap->error;
@@ -36940,28 +37007,28 @@ soap_out_PointerTons1__luceneCommit(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__luceneCommit **SOAP_FMAC4
 soap_in_PointerTons1__luceneCommit(struct soap *soap, const char *tag,
                                    ns1__luceneCommit **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__luceneCommit **)soap_malloc(soap,
                                                 sizeof(ns1__luceneCommit *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__luceneCommit *)soap_instantiate_ns1__luceneCommit(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__luceneCommit **p = (ns1__luceneCommit **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__luceneCommit,
         sizeof(ns1__luceneCommit), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -36970,7 +37037,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__luceneCommit(struct soap *soap,
                                     ns1__luceneCommit *const *a,
                                     const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__luceneCommit);
   if (soap_out_PointerTons1__luceneCommit(soap, tag ? tag : "ns1:luceneCommit",
                                           id, a, type))
@@ -36983,7 +37050,7 @@ soap_get_PointerTons1__luceneCommit(struct soap *soap, ns1__luceneCommit **p,
                                     const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__luceneCommit(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37000,7 +37067,7 @@ soap_out_PointerTons1__luceneClearResponse(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__luceneClearResponse *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__luceneClearResponse);
   if (id < 0)
     return soap->error;
@@ -37011,29 +37078,29 @@ SOAP_FMAC3 ns1__luceneClearResponse **SOAP_FMAC4
 soap_in_PointerTons1__luceneClearResponse(struct soap *soap, const char *tag,
                                           ns1__luceneClearResponse **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__luceneClearResponse **)soap_malloc(
               soap, sizeof(ns1__luceneClearResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__luceneClearResponse *)
-              soap_instantiate_ns1__luceneClearResponse(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__luceneClearResponse(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__luceneClearResponse **p = (ns1__luceneClearResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__luceneClearResponse,
         sizeof(ns1__luceneClearResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37042,7 +37109,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__luceneClearResponse(struct soap *soap,
                                            ns1__luceneClearResponse *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__luceneClearResponse);
   if (soap_out_PointerTons1__luceneClearResponse(
           soap, tag ? tag : "ns1:luceneClearResponse", id, a, type))
@@ -37056,7 +37123,7 @@ soap_get_PointerTons1__luceneClearResponse(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__luceneClearResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37073,7 +37140,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__luceneClear(struct soap *soap, const char *tag, int id,
                                    ns1__luceneClear *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__luceneClear);
   if (id < 0)
     return soap->error;
@@ -37083,28 +37150,28 @@ soap_out_PointerTons1__luceneClear(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__luceneClear **SOAP_FMAC4
 soap_in_PointerTons1__luceneClear(struct soap *soap, const char *tag,
                                   ns1__luceneClear **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__luceneClear **)soap_malloc(soap,
                                                sizeof(ns1__luceneClear *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__luceneClear *)soap_instantiate_ns1__luceneClear(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__luceneClear **p = (ns1__luceneClear **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__luceneClear,
         sizeof(ns1__luceneClear), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37113,7 +37180,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__luceneClear(struct soap *soap,
                                    ns1__luceneClear *const *a, const char *tag,
                                    const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__luceneClear);
   if (soap_out_PointerTons1__luceneClear(soap, tag ? tag : "ns1:luceneClear",
                                          id, a, type))
@@ -37126,7 +37193,7 @@ soap_get_PointerTons1__luceneClear(struct soap *soap, ns1__luceneClear **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__luceneClear(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37141,7 +37208,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__lucenePopulateResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__lucenePopulateResponse(
     struct soap *soap, const char *tag, int id,
     ns1__lucenePopulateResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__lucenePopulateResponse);
   if (id < 0)
     return soap->error;
@@ -37152,22 +37219,22 @@ SOAP_FMAC3 ns1__lucenePopulateResponse **SOAP_FMAC4
 soap_in_PointerTons1__lucenePopulateResponse(struct soap *soap, const char *tag,
                                              ns1__lucenePopulateResponse **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__lucenePopulateResponse **)soap_malloc(
               soap, sizeof(ns1__lucenePopulateResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__lucenePopulateResponse *)
               soap_instantiate_ns1__lucenePopulateResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__lucenePopulateResponse **p =
         (ns1__lucenePopulateResponse **)soap_id_lookup(
@@ -37176,7 +37243,7 @@ soap_in_PointerTons1__lucenePopulateResponse(struct soap *soap, const char *tag,
             sizeof(ns1__lucenePopulateResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37184,7 +37251,7 @@ soap_in_PointerTons1__lucenePopulateResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__lucenePopulateResponse(
     struct soap *soap, ns1__lucenePopulateResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__lucenePopulateResponse);
   if (soap_out_PointerTons1__lucenePopulateResponse(
           soap, tag ? tag : "ns1:lucenePopulateResponse", id, a, type))
@@ -37199,7 +37266,7 @@ soap_get_PointerTons1__lucenePopulateResponse(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__lucenePopulateResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37216,7 +37283,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__lucenePopulate(struct soap *soap, const char *tag,
                                       int id, ns1__lucenePopulate *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__lucenePopulate);
   if (id < 0)
     return soap->error;
@@ -37227,28 +37294,28 @@ SOAP_FMAC3 ns1__lucenePopulate **SOAP_FMAC4
 soap_in_PointerTons1__lucenePopulate(struct soap *soap, const char *tag,
                                      ns1__lucenePopulate **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__lucenePopulate **)soap_malloc(
               soap, sizeof(ns1__lucenePopulate *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__lucenePopulate *)soap_instantiate_ns1__lucenePopulate(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__lucenePopulate **p = (ns1__lucenePopulate **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__lucenePopulate,
         sizeof(ns1__lucenePopulate), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37257,7 +37324,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__lucenePopulate(struct soap *soap,
                                       ns1__lucenePopulate *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__lucenePopulate);
   if (soap_out_PointerTons1__lucenePopulate(
           soap, tag ? tag : "ns1:lucenePopulate", id, a, type))
@@ -37271,7 +37338,7 @@ soap_get_PointerTons1__lucenePopulate(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__lucenePopulate(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37286,7 +37353,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__isAccessAllowedResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__isAccessAllowedResponse(
     struct soap *soap, const char *tag, int id,
     ns1__isAccessAllowedResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__isAccessAllowedResponse);
   if (id < 0)
     return soap->error;
@@ -37298,22 +37365,22 @@ soap_in_PointerTons1__isAccessAllowedResponse(struct soap *soap,
                                               const char *tag,
                                               ns1__isAccessAllowedResponse **a,
                                               const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__isAccessAllowedResponse **)soap_malloc(
               soap, sizeof(ns1__isAccessAllowedResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__isAccessAllowedResponse *)
               soap_instantiate_ns1__isAccessAllowedResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__isAccessAllowedResponse **p =
         (ns1__isAccessAllowedResponse **)soap_id_lookup(
@@ -37322,7 +37389,7 @@ soap_in_PointerTons1__isAccessAllowedResponse(struct soap *soap,
             sizeof(ns1__isAccessAllowedResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37330,7 +37397,7 @@ soap_in_PointerTons1__isAccessAllowedResponse(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__isAccessAllowedResponse(
     struct soap *soap, ns1__isAccessAllowedResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__isAccessAllowedResponse);
   if (soap_out_PointerTons1__isAccessAllowedResponse(
           soap, tag ? tag : "ns1:isAccessAllowedResponse", id, a, type))
@@ -37345,7 +37412,7 @@ soap_get_PointerTons1__isAccessAllowedResponse(struct soap *soap,
                                                const char *type) {
   if ((p = soap_in_PointerTons1__isAccessAllowedResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37362,7 +37429,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__isAccessAllowed(struct soap *soap, const char *tag,
                                        int id, ns1__isAccessAllowed *const *a,
                                        const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__isAccessAllowed);
   if (id < 0)
     return soap->error;
@@ -37373,28 +37440,28 @@ SOAP_FMAC3 ns1__isAccessAllowed **SOAP_FMAC4
 soap_in_PointerTons1__isAccessAllowed(struct soap *soap, const char *tag,
                                       ns1__isAccessAllowed **a,
                                       const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__isAccessAllowed **)soap_malloc(
               soap, sizeof(ns1__isAccessAllowed *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__isAccessAllowed *)soap_instantiate_ns1__isAccessAllowed(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__isAccessAllowed **p = (ns1__isAccessAllowed **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__isAccessAllowed,
         sizeof(ns1__isAccessAllowed), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37403,7 +37470,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__isAccessAllowed(struct soap *soap,
                                        ns1__isAccessAllowed *const *a,
                                        const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__isAccessAllowed);
   if (soap_out_PointerTons1__isAccessAllowed(
           soap, tag ? tag : "ns1:isAccessAllowed", id, a, type))
@@ -37417,7 +37484,7 @@ soap_get_PointerTons1__isAccessAllowed(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__isAccessAllowed(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37434,7 +37501,7 @@ soap_out_PointerTons1__searchTextResponse(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__searchTextResponse *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__searchTextResponse);
   if (id < 0)
     return soap->error;
@@ -37445,29 +37512,29 @@ SOAP_FMAC3 ns1__searchTextResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchTextResponse(struct soap *soap, const char *tag,
                                          ns1__searchTextResponse **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchTextResponse **)soap_malloc(
               soap, sizeof(ns1__searchTextResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchTextResponse *)
-              soap_instantiate_ns1__searchTextResponse(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__searchTextResponse(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchTextResponse **p = (ns1__searchTextResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__searchTextResponse,
         sizeof(ns1__searchTextResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37476,7 +37543,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__searchTextResponse(struct soap *soap,
                                           ns1__searchTextResponse *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__searchTextResponse);
   if (soap_out_PointerTons1__searchTextResponse(
           soap, tag ? tag : "ns1:searchTextResponse", id, a, type))
@@ -37490,7 +37557,7 @@ soap_get_PointerTons1__searchTextResponse(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__searchTextResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37506,7 +37573,7 @@ soap_serialize_PointerTons1__searchText(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchText(struct soap *soap, const char *tag, int id,
                                   ns1__searchText *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__searchText);
   if (id < 0)
     return soap->error;
@@ -37516,27 +37583,27 @@ soap_out_PointerTons1__searchText(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__searchText **SOAP_FMAC4
 soap_in_PointerTons1__searchText(struct soap *soap, const char *tag,
                                  ns1__searchText **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchText **)soap_malloc(soap, sizeof(ns1__searchText *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchText *)soap_instantiate_ns1__searchText(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchText **p = (ns1__searchText **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__searchText,
         sizeof(ns1__searchText), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37544,7 +37611,7 @@ soap_in_PointerTons1__searchText(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__searchText(struct soap *soap, ns1__searchText *const *a,
                                   const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__searchText);
   if (soap_out_PointerTons1__searchText(soap, tag ? tag : "ns1:searchText", id,
                                         a, type))
@@ -37557,7 +37624,7 @@ soap_get_PointerTons1__searchText(struct soap *soap, ns1__searchText **p,
                                   const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__searchText(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37574,7 +37641,7 @@ soap_serialize_PointerTons1__getRemainingMinutesResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getRemainingMinutesResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getRemainingMinutesResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__getRemainingMinutesResponse);
   if (id < 0)
     return soap->error;
@@ -37585,22 +37652,22 @@ SOAP_FMAC3 ns1__getRemainingMinutesResponse **SOAP_FMAC4
 soap_in_PointerTons1__getRemainingMinutesResponse(
     struct soap *soap, const char *tag, ns1__getRemainingMinutesResponse **a,
     const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getRemainingMinutesResponse **)soap_malloc(
               soap, sizeof(ns1__getRemainingMinutesResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getRemainingMinutesResponse *)
               soap_instantiate_ns1__getRemainingMinutesResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getRemainingMinutesResponse **p =
         (ns1__getRemainingMinutesResponse **)soap_id_lookup(
@@ -37609,7 +37676,7 @@ soap_in_PointerTons1__getRemainingMinutesResponse(
             sizeof(ns1__getRemainingMinutesResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37618,7 +37685,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getRemainingMinutesResponse(
     struct soap *soap, ns1__getRemainingMinutesResponse *const *a,
     const char *tag, const char *type) {
   int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag,
+      soap_embed(soap, (void *)a, nullptr, 0, tag,
                  SOAP_TYPE_ICat4_PointerTons1__getRemainingMinutesResponse);
   if (soap_out_PointerTons1__getRemainingMinutesResponse(
           soap, tag ? tag : "ns1:getRemainingMinutesResponse", id, a, type))
@@ -37633,7 +37700,7 @@ soap_get_PointerTons1__getRemainingMinutesResponse(
   if ((p = soap_in_PointerTons1__getRemainingMinutesResponse(soap, tag, p,
                                                              type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37650,7 +37717,7 @@ soap_out_PointerTons1__getRemainingMinutes(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__getRemainingMinutes *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__getRemainingMinutes);
   if (id < 0)
     return soap->error;
@@ -37661,29 +37728,29 @@ SOAP_FMAC3 ns1__getRemainingMinutes **SOAP_FMAC4
 soap_in_PointerTons1__getRemainingMinutes(struct soap *soap, const char *tag,
                                           ns1__getRemainingMinutes **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getRemainingMinutes **)soap_malloc(
               soap, sizeof(ns1__getRemainingMinutes *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getRemainingMinutes *)
-              soap_instantiate_ns1__getRemainingMinutes(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__getRemainingMinutes(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getRemainingMinutes **p = (ns1__getRemainingMinutes **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__getRemainingMinutes,
         sizeof(ns1__getRemainingMinutes), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37692,7 +37759,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getRemainingMinutes(struct soap *soap,
                                            ns1__getRemainingMinutes *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__getRemainingMinutes);
   if (soap_out_PointerTons1__getRemainingMinutes(
           soap, tag ? tag : "ns1:getRemainingMinutes", id, a, type))
@@ -37706,7 +37773,7 @@ soap_get_PointerTons1__getRemainingMinutes(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getRemainingMinutes(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37723,7 +37790,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__logoutResponse(struct soap *soap, const char *tag,
                                       int id, ns1__logoutResponse *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__logoutResponse);
   if (id < 0)
     return soap->error;
@@ -37734,28 +37801,28 @@ SOAP_FMAC3 ns1__logoutResponse **SOAP_FMAC4
 soap_in_PointerTons1__logoutResponse(struct soap *soap, const char *tag,
                                      ns1__logoutResponse **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__logoutResponse **)soap_malloc(
               soap, sizeof(ns1__logoutResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__logoutResponse *)soap_instantiate_ns1__logoutResponse(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__logoutResponse **p = (ns1__logoutResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__logoutResponse,
         sizeof(ns1__logoutResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37764,7 +37831,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__logoutResponse(struct soap *soap,
                                       ns1__logoutResponse *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__logoutResponse);
   if (soap_out_PointerTons1__logoutResponse(
           soap, tag ? tag : "ns1:logoutResponse", id, a, type))
@@ -37778,7 +37845,7 @@ soap_get_PointerTons1__logoutResponse(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__logoutResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37793,7 +37860,7 @@ soap_serialize_PointerTons1__logout(struct soap *soap, ns1__logout *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__logout(struct soap *soap, const char *tag, int id,
                               ns1__logout *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__logout);
   if (id < 0)
     return soap->error;
@@ -37803,27 +37870,27 @@ soap_out_PointerTons1__logout(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__logout **SOAP_FMAC4
 soap_in_PointerTons1__logout(struct soap *soap, const char *tag,
                              ns1__logout **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__logout **)soap_malloc(soap, sizeof(ns1__logout *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__logout *)soap_instantiate_ns1__logout(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__logout **p = (ns1__logout **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__logout,
         sizeof(ns1__logout), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37831,7 +37898,7 @@ soap_in_PointerTons1__logout(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__logout(struct soap *soap, ns1__logout *const *a,
                               const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__logout);
   if (soap_out_PointerTons1__logout(soap, tag ? tag : "ns1:logout", id, a,
                                     type))
@@ -37844,7 +37911,7 @@ soap_get_PointerTons1__logout(struct soap *soap, ns1__logout **p,
                               const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__logout(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37861,7 +37928,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__dummyResponse(struct soap *soap, const char *tag, int id,
                                      ns1__dummyResponse *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__dummyResponse);
   if (id < 0)
     return soap->error;
@@ -37871,28 +37938,28 @@ soap_out_PointerTons1__dummyResponse(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__dummyResponse **SOAP_FMAC4
 soap_in_PointerTons1__dummyResponse(struct soap *soap, const char *tag,
                                     ns1__dummyResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__dummyResponse **)soap_malloc(soap,
                                                  sizeof(ns1__dummyResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__dummyResponse *)soap_instantiate_ns1__dummyResponse(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__dummyResponse **p = (ns1__dummyResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__dummyResponse,
         sizeof(ns1__dummyResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37901,7 +37968,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__dummyResponse(struct soap *soap,
                                      ns1__dummyResponse *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__dummyResponse);
   if (soap_out_PointerTons1__dummyResponse(
           soap, tag ? tag : "ns1:dummyResponse", id, a, type))
@@ -37914,7 +37981,7 @@ soap_get_PointerTons1__dummyResponse(struct soap *soap, ns1__dummyResponse **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__dummyResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37929,7 +37996,7 @@ soap_serialize_PointerTons1__dummy(struct soap *soap, ns1__dummy *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__dummy(struct soap *soap, const char *tag, int id,
                              ns1__dummy *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__dummy);
   if (id < 0)
     return soap->error;
@@ -37939,27 +38006,27 @@ soap_out_PointerTons1__dummy(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__dummy **SOAP_FMAC4
 soap_in_PointerTons1__dummy(struct soap *soap, const char *tag, ns1__dummy **a,
                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__dummy **)soap_malloc(soap, sizeof(ns1__dummy *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__dummy *)soap_instantiate_ns1__dummy(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__dummy **p = (ns1__dummy **)soap_id_lookup(soap, soap->href, (void **)a,
                                                    SOAP_TYPE_ICat4_ns1__dummy,
                                                    sizeof(ns1__dummy), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -37967,7 +38034,7 @@ soap_in_PointerTons1__dummy(struct soap *soap, const char *tag, ns1__dummy **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__dummy(struct soap *soap, ns1__dummy *const *a,
                              const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__dummy);
   if (soap_out_PointerTons1__dummy(soap, tag ? tag : "ns1:dummy", id, a, type))
     return soap->error;
@@ -37979,7 +38046,7 @@ soap_get_PointerTons1__dummy(struct soap *soap, ns1__dummy **p, const char *tag,
                              const char *type) {
   if ((p = soap_in_PointerTons1__dummy(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -37996,7 +38063,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__refreshResponse(struct soap *soap, const char *tag,
                                        int id, ns1__refreshResponse *const *a,
                                        const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__refreshResponse);
   if (id < 0)
     return soap->error;
@@ -38007,28 +38074,28 @@ SOAP_FMAC3 ns1__refreshResponse **SOAP_FMAC4
 soap_in_PointerTons1__refreshResponse(struct soap *soap, const char *tag,
                                       ns1__refreshResponse **a,
                                       const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__refreshResponse **)soap_malloc(
               soap, sizeof(ns1__refreshResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__refreshResponse *)soap_instantiate_ns1__refreshResponse(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__refreshResponse **p = (ns1__refreshResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__refreshResponse,
         sizeof(ns1__refreshResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38037,7 +38104,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__refreshResponse(struct soap *soap,
                                        ns1__refreshResponse *const *a,
                                        const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__refreshResponse);
   if (soap_out_PointerTons1__refreshResponse(
           soap, tag ? tag : "ns1:refreshResponse", id, a, type))
@@ -38051,7 +38118,7 @@ soap_get_PointerTons1__refreshResponse(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__refreshResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38067,7 +38134,7 @@ soap_serialize_PointerTons1__refresh(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__refresh(struct soap *soap, const char *tag, int id,
                                ns1__refresh *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__refresh);
   if (id < 0)
     return soap->error;
@@ -38077,27 +38144,27 @@ soap_out_PointerTons1__refresh(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__refresh **SOAP_FMAC4
 soap_in_PointerTons1__refresh(struct soap *soap, const char *tag,
                               ns1__refresh **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__refresh **)soap_malloc(soap, sizeof(ns1__refresh *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__refresh *)soap_instantiate_ns1__refresh(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__refresh **p = (ns1__refresh **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__refresh,
         sizeof(ns1__refresh), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38105,7 +38172,7 @@ soap_in_PointerTons1__refresh(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__refresh(struct soap *soap, ns1__refresh *const *a,
                                const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__refresh);
   if (soap_out_PointerTons1__refresh(soap, tag ? tag : "ns1:refresh", id, a,
                                      type))
@@ -38118,7 +38185,7 @@ soap_get_PointerTons1__refresh(struct soap *soap, ns1__refresh **p,
                                const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__refresh(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38133,7 +38200,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__getEntityNamesResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getEntityNamesResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getEntityNamesResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__getEntityNamesResponse);
   if (id < 0)
     return soap->error;
@@ -38144,22 +38211,22 @@ SOAP_FMAC3 ns1__getEntityNamesResponse **SOAP_FMAC4
 soap_in_PointerTons1__getEntityNamesResponse(struct soap *soap, const char *tag,
                                              ns1__getEntityNamesResponse **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getEntityNamesResponse **)soap_malloc(
               soap, sizeof(ns1__getEntityNamesResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getEntityNamesResponse *)
               soap_instantiate_ns1__getEntityNamesResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getEntityNamesResponse **p =
         (ns1__getEntityNamesResponse **)soap_id_lookup(
@@ -38168,7 +38235,7 @@ soap_in_PointerTons1__getEntityNamesResponse(struct soap *soap, const char *tag,
             sizeof(ns1__getEntityNamesResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38176,7 +38243,7 @@ soap_in_PointerTons1__getEntityNamesResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getEntityNamesResponse(
     struct soap *soap, ns1__getEntityNamesResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__getEntityNamesResponse);
   if (soap_out_PointerTons1__getEntityNamesResponse(
           soap, tag ? tag : "ns1:getEntityNamesResponse", id, a, type))
@@ -38191,7 +38258,7 @@ soap_get_PointerTons1__getEntityNamesResponse(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__getEntityNamesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38208,7 +38275,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getEntityNames(struct soap *soap, const char *tag,
                                       int id, ns1__getEntityNames *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__getEntityNames);
   if (id < 0)
     return soap->error;
@@ -38219,28 +38286,28 @@ SOAP_FMAC3 ns1__getEntityNames **SOAP_FMAC4
 soap_in_PointerTons1__getEntityNames(struct soap *soap, const char *tag,
                                      ns1__getEntityNames **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getEntityNames **)soap_malloc(
               soap, sizeof(ns1__getEntityNames *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getEntityNames *)soap_instantiate_ns1__getEntityNames(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getEntityNames **p = (ns1__getEntityNames **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__getEntityNames,
         sizeof(ns1__getEntityNames), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38249,7 +38316,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getEntityNames(struct soap *soap,
                                       ns1__getEntityNames *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__getEntityNames);
   if (soap_out_PointerTons1__getEntityNames(
           soap, tag ? tag : "ns1:getEntityNames", id, a, type))
@@ -38263,7 +38330,7 @@ soap_get_PointerTons1__getEntityNames(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__getEntityNames(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38278,7 +38345,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__getApiVersionResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getApiVersionResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getApiVersionResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__getApiVersionResponse);
   if (id < 0)
     return soap->error;
@@ -38289,22 +38356,22 @@ SOAP_FMAC3 ns1__getApiVersionResponse **SOAP_FMAC4
 soap_in_PointerTons1__getApiVersionResponse(struct soap *soap, const char *tag,
                                             ns1__getApiVersionResponse **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getApiVersionResponse **)soap_malloc(
               soap, sizeof(ns1__getApiVersionResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getApiVersionResponse *)
               soap_instantiate_ns1__getApiVersionResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getApiVersionResponse **p =
         (ns1__getApiVersionResponse **)soap_id_lookup(
@@ -38313,7 +38380,7 @@ soap_in_PointerTons1__getApiVersionResponse(struct soap *soap, const char *tag,
             sizeof(ns1__getApiVersionResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38321,7 +38388,7 @@ soap_in_PointerTons1__getApiVersionResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getApiVersionResponse(
     struct soap *soap, ns1__getApiVersionResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__getApiVersionResponse);
   if (soap_out_PointerTons1__getApiVersionResponse(
           soap, tag ? tag : "ns1:getApiVersionResponse", id, a, type))
@@ -38336,7 +38403,7 @@ soap_get_PointerTons1__getApiVersionResponse(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__getApiVersionResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38353,7 +38420,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getApiVersion(struct soap *soap, const char *tag, int id,
                                      ns1__getApiVersion *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__getApiVersion);
   if (id < 0)
     return soap->error;
@@ -38363,28 +38430,28 @@ soap_out_PointerTons1__getApiVersion(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__getApiVersion **SOAP_FMAC4
 soap_in_PointerTons1__getApiVersion(struct soap *soap, const char *tag,
                                     ns1__getApiVersion **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getApiVersion **)soap_malloc(soap,
                                                  sizeof(ns1__getApiVersion *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getApiVersion *)soap_instantiate_ns1__getApiVersion(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getApiVersion **p = (ns1__getApiVersion **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__getApiVersion,
         sizeof(ns1__getApiVersion), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38393,7 +38460,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getApiVersion(struct soap *soap,
                                      ns1__getApiVersion *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__getApiVersion);
   if (soap_out_PointerTons1__getApiVersion(
           soap, tag ? tag : "ns1:getApiVersion", id, a, type))
@@ -38406,7 +38473,7 @@ soap_get_PointerTons1__getApiVersion(struct soap *soap, ns1__getApiVersion **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getApiVersion(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38423,7 +38490,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__updateResponse(struct soap *soap, const char *tag,
                                       int id, ns1__updateResponse *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__updateResponse);
   if (id < 0)
     return soap->error;
@@ -38434,28 +38501,28 @@ SOAP_FMAC3 ns1__updateResponse **SOAP_FMAC4
 soap_in_PointerTons1__updateResponse(struct soap *soap, const char *tag,
                                      ns1__updateResponse **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__updateResponse **)soap_malloc(
               soap, sizeof(ns1__updateResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__updateResponse *)soap_instantiate_ns1__updateResponse(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__updateResponse **p = (ns1__updateResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__updateResponse,
         sizeof(ns1__updateResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38464,7 +38531,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__updateResponse(struct soap *soap,
                                       ns1__updateResponse *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__updateResponse);
   if (soap_out_PointerTons1__updateResponse(
           soap, tag ? tag : "ns1:updateResponse", id, a, type))
@@ -38478,7 +38545,7 @@ soap_get_PointerTons1__updateResponse(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__updateResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38493,7 +38560,7 @@ soap_serialize_PointerTons1__update(struct soap *soap, ns1__update *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__update(struct soap *soap, const char *tag, int id,
                               ns1__update *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__update);
   if (id < 0)
     return soap->error;
@@ -38503,27 +38570,27 @@ soap_out_PointerTons1__update(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__update **SOAP_FMAC4
 soap_in_PointerTons1__update(struct soap *soap, const char *tag,
                              ns1__update **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__update **)soap_malloc(soap, sizeof(ns1__update *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__update *)soap_instantiate_ns1__update(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__update **p = (ns1__update **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__update,
         sizeof(ns1__update), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38531,7 +38598,7 @@ soap_in_PointerTons1__update(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__update(struct soap *soap, ns1__update *const *a,
                               const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__update);
   if (soap_out_PointerTons1__update(soap, tag ? tag : "ns1:update", id, a,
                                     type))
@@ -38544,7 +38611,7 @@ soap_get_PointerTons1__update(struct soap *soap, ns1__update **p,
                               const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__update(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38561,7 +38628,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__createResponse(struct soap *soap, const char *tag,
                                       int id, ns1__createResponse *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__createResponse);
   if (id < 0)
     return soap->error;
@@ -38572,28 +38639,28 @@ SOAP_FMAC3 ns1__createResponse **SOAP_FMAC4
 soap_in_PointerTons1__createResponse(struct soap *soap, const char *tag,
                                      ns1__createResponse **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__createResponse **)soap_malloc(
               soap, sizeof(ns1__createResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__createResponse *)soap_instantiate_ns1__createResponse(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__createResponse **p = (ns1__createResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__createResponse,
         sizeof(ns1__createResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38602,7 +38669,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__createResponse(struct soap *soap,
                                       ns1__createResponse *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__createResponse);
   if (soap_out_PointerTons1__createResponse(
           soap, tag ? tag : "ns1:createResponse", id, a, type))
@@ -38616,7 +38683,7 @@ soap_get_PointerTons1__createResponse(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__createResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38631,7 +38698,7 @@ soap_serialize_PointerTons1__create(struct soap *soap, ns1__create *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__create(struct soap *soap, const char *tag, int id,
                               ns1__create *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__create);
   if (id < 0)
     return soap->error;
@@ -38641,27 +38708,27 @@ soap_out_PointerTons1__create(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__create **SOAP_FMAC4
 soap_in_PointerTons1__create(struct soap *soap, const char *tag,
                              ns1__create **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__create **)soap_malloc(soap, sizeof(ns1__create *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__create *)soap_instantiate_ns1__create(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__create **p = (ns1__create **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__create,
         sizeof(ns1__create), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38669,7 +38736,7 @@ soap_in_PointerTons1__create(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__create(struct soap *soap, ns1__create *const *a,
                               const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__create);
   if (soap_out_PointerTons1__create(soap, tag ? tag : "ns1:create", id, a,
                                     type))
@@ -38682,7 +38749,7 @@ soap_get_PointerTons1__create(struct soap *soap, ns1__create **p,
                               const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__create(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38699,7 +38766,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__searchResponse(struct soap *soap, const char *tag,
                                       int id, ns1__searchResponse *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__searchResponse);
   if (id < 0)
     return soap->error;
@@ -38710,28 +38777,28 @@ SOAP_FMAC3 ns1__searchResponse **SOAP_FMAC4
 soap_in_PointerTons1__searchResponse(struct soap *soap, const char *tag,
                                      ns1__searchResponse **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__searchResponse **)soap_malloc(
               soap, sizeof(ns1__searchResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__searchResponse *)soap_instantiate_ns1__searchResponse(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__searchResponse **p = (ns1__searchResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__searchResponse,
         sizeof(ns1__searchResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38740,7 +38807,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__searchResponse(struct soap *soap,
                                       ns1__searchResponse *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__searchResponse);
   if (soap_out_PointerTons1__searchResponse(
           soap, tag ? tag : "ns1:searchResponse", id, a, type))
@@ -38754,7 +38821,7 @@ soap_get_PointerTons1__searchResponse(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__searchResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38769,7 +38836,7 @@ soap_serialize_PointerTons1__search(struct soap *soap, ns1__search *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__search(struct soap *soap, const char *tag, int id,
                               ns1__search *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__search);
   if (id < 0)
     return soap->error;
@@ -38779,27 +38846,27 @@ soap_out_PointerTons1__search(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__search **SOAP_FMAC4
 soap_in_PointerTons1__search(struct soap *soap, const char *tag,
                              ns1__search **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__search **)soap_malloc(soap, sizeof(ns1__search *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__search *)soap_instantiate_ns1__search(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__search **p = (ns1__search **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__search,
         sizeof(ns1__search), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38807,7 +38874,7 @@ soap_in_PointerTons1__search(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__search(struct soap *soap, ns1__search *const *a,
                               const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__search);
   if (soap_out_PointerTons1__search(soap, tag ? tag : "ns1:search", id, a,
                                     type))
@@ -38820,7 +38887,7 @@ soap_get_PointerTons1__search(struct soap *soap, ns1__search **p,
                               const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__search(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38837,7 +38904,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__deleteResponse(struct soap *soap, const char *tag,
                                       int id, ns1__deleteResponse *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__deleteResponse);
   if (id < 0)
     return soap->error;
@@ -38848,28 +38915,28 @@ SOAP_FMAC3 ns1__deleteResponse **SOAP_FMAC4
 soap_in_PointerTons1__deleteResponse(struct soap *soap, const char *tag,
                                      ns1__deleteResponse **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__deleteResponse **)soap_malloc(
               soap, sizeof(ns1__deleteResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__deleteResponse *)soap_instantiate_ns1__deleteResponse(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__deleteResponse **p = (ns1__deleteResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__deleteResponse,
         sizeof(ns1__deleteResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38878,7 +38945,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__deleteResponse(struct soap *soap,
                                       ns1__deleteResponse *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__deleteResponse);
   if (soap_out_PointerTons1__deleteResponse(
           soap, tag ? tag : "ns1:deleteResponse", id, a, type))
@@ -38892,7 +38959,7 @@ soap_get_PointerTons1__deleteResponse(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__deleteResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38907,7 +38974,7 @@ soap_serialize_PointerTons1__delete(struct soap *soap, ns1__delete *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__delete(struct soap *soap, const char *tag, int id,
                               ns1__delete *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__delete);
   if (id < 0)
     return soap->error;
@@ -38917,27 +38984,27 @@ soap_out_PointerTons1__delete(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__delete **SOAP_FMAC4
 soap_in_PointerTons1__delete(struct soap *soap, const char *tag,
                              ns1__delete **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__delete **)soap_malloc(soap, sizeof(ns1__delete *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__delete *)soap_instantiate_ns1__delete(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__delete **p = (ns1__delete **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__delete,
         sizeof(ns1__delete), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -38945,7 +39012,7 @@ soap_in_PointerTons1__delete(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__delete(struct soap *soap, ns1__delete *const *a,
                               const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__delete);
   if (soap_out_PointerTons1__delete(soap, tag ? tag : "ns1:delete", id, a,
                                     type))
@@ -38958,7 +39025,7 @@ soap_get_PointerTons1__delete(struct soap *soap, ns1__delete **p,
                               const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__delete(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -38973,7 +39040,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__getPropertiesResponse(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__getPropertiesResponse(
     struct soap *soap, const char *tag, int id,
     ns1__getPropertiesResponse *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__getPropertiesResponse);
   if (id < 0)
     return soap->error;
@@ -38984,22 +39051,22 @@ SOAP_FMAC3 ns1__getPropertiesResponse **SOAP_FMAC4
 soap_in_PointerTons1__getPropertiesResponse(struct soap *soap, const char *tag,
                                             ns1__getPropertiesResponse **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getPropertiesResponse **)soap_malloc(
               soap, sizeof(ns1__getPropertiesResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getPropertiesResponse *)
               soap_instantiate_ns1__getPropertiesResponse(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getPropertiesResponse **p =
         (ns1__getPropertiesResponse **)soap_id_lookup(
@@ -39008,7 +39075,7 @@ soap_in_PointerTons1__getPropertiesResponse(struct soap *soap, const char *tag,
             sizeof(ns1__getPropertiesResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39016,7 +39083,7 @@ soap_in_PointerTons1__getPropertiesResponse(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__getPropertiesResponse(
     struct soap *soap, ns1__getPropertiesResponse *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__getPropertiesResponse);
   if (soap_out_PointerTons1__getPropertiesResponse(
           soap, tag ? tag : "ns1:getPropertiesResponse", id, a, type))
@@ -39031,7 +39098,7 @@ soap_get_PointerTons1__getPropertiesResponse(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__getPropertiesResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39048,7 +39115,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getProperties(struct soap *soap, const char *tag, int id,
                                      ns1__getProperties *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__getProperties);
   if (id < 0)
     return soap->error;
@@ -39058,28 +39125,28 @@ soap_out_PointerTons1__getProperties(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__getProperties **SOAP_FMAC4
 soap_in_PointerTons1__getProperties(struct soap *soap, const char *tag,
                                     ns1__getProperties **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getProperties **)soap_malloc(soap,
                                                  sizeof(ns1__getProperties *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getProperties *)soap_instantiate_ns1__getProperties(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getProperties **p = (ns1__getProperties **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__getProperties,
         sizeof(ns1__getProperties), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39088,7 +39155,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getProperties(struct soap *soap,
                                      ns1__getProperties *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__getProperties);
   if (soap_out_PointerTons1__getProperties(
           soap, tag ? tag : "ns1:getProperties", id, a, type))
@@ -39101,7 +39168,7 @@ soap_get_PointerTons1__getProperties(struct soap *soap, ns1__getProperties **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getProperties(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39118,7 +39185,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getResponse(struct soap *soap, const char *tag, int id,
                                    ns1__getResponse *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__getResponse);
   if (id < 0)
     return soap->error;
@@ -39128,28 +39195,28 @@ soap_out_PointerTons1__getResponse(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__getResponse **SOAP_FMAC4
 soap_in_PointerTons1__getResponse(struct soap *soap, const char *tag,
                                   ns1__getResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getResponse **)soap_malloc(soap,
                                                sizeof(ns1__getResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getResponse *)soap_instantiate_ns1__getResponse(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getResponse **p = (ns1__getResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__getResponse,
         sizeof(ns1__getResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39158,7 +39225,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getResponse(struct soap *soap,
                                    ns1__getResponse *const *a, const char *tag,
                                    const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__getResponse);
   if (soap_out_PointerTons1__getResponse(soap, tag ? tag : "ns1:getResponse",
                                          id, a, type))
@@ -39171,7 +39238,7 @@ soap_get_PointerTons1__getResponse(struct soap *soap, ns1__getResponse **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39186,7 +39253,7 @@ soap_serialize_PointerTons1__get(struct soap *soap, ns1__get *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__get(struct soap *soap, const char *tag, int id,
                            ns1__get *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__get);
   if (id < 0)
     return soap->error;
@@ -39196,27 +39263,27 @@ soap_out_PointerTons1__get(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__get **SOAP_FMAC4
 soap_in_PointerTons1__get(struct soap *soap, const char *tag, ns1__get **a,
                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__get **)soap_malloc(soap, sizeof(ns1__get *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__get *)soap_instantiate_ns1__get(soap, -1, soap->type,
-                                                     soap->arrayType, NULL)))
-      return NULL;
+                                                     soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__get **p = (ns1__get **)soap_id_lookup(soap, soap->href, (void **)a,
                                                SOAP_TYPE_ICat4_ns1__get,
                                                sizeof(ns1__get), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39224,7 +39291,7 @@ soap_in_PointerTons1__get(struct soap *soap, const char *tag, ns1__get **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__get(struct soap *soap, ns1__get *const *a,
                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__get);
   if (soap_out_PointerTons1__get(soap, tag ? tag : "ns1:get", id, a, type))
     return soap->error;
@@ -39236,7 +39303,7 @@ soap_get_PointerTons1__get(struct soap *soap, ns1__get **p, const char *tag,
                            const char *type) {
   if ((p = soap_in_PointerTons1__get(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39253,7 +39320,7 @@ soap_out_PointerTons1__getUserNameResponse(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__getUserNameResponse *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__getUserNameResponse);
   if (id < 0)
     return soap->error;
@@ -39264,29 +39331,29 @@ SOAP_FMAC3 ns1__getUserNameResponse **SOAP_FMAC4
 soap_in_PointerTons1__getUserNameResponse(struct soap *soap, const char *tag,
                                           ns1__getUserNameResponse **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getUserNameResponse **)soap_malloc(
               soap, sizeof(ns1__getUserNameResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getUserNameResponse *)
-              soap_instantiate_ns1__getUserNameResponse(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__getUserNameResponse(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getUserNameResponse **p = (ns1__getUserNameResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__getUserNameResponse,
         sizeof(ns1__getUserNameResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39295,7 +39362,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getUserNameResponse(struct soap *soap,
                                            ns1__getUserNameResponse *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__getUserNameResponse);
   if (soap_out_PointerTons1__getUserNameResponse(
           soap, tag ? tag : "ns1:getUserNameResponse", id, a, type))
@@ -39309,7 +39376,7 @@ soap_get_PointerTons1__getUserNameResponse(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getUserNameResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39326,7 +39393,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__getUserName(struct soap *soap, const char *tag, int id,
                                    ns1__getUserName *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__getUserName);
   if (id < 0)
     return soap->error;
@@ -39336,28 +39403,28 @@ soap_out_PointerTons1__getUserName(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__getUserName **SOAP_FMAC4
 soap_in_PointerTons1__getUserName(struct soap *soap, const char *tag,
                                   ns1__getUserName **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__getUserName **)soap_malloc(soap,
                                                sizeof(ns1__getUserName *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__getUserName *)soap_instantiate_ns1__getUserName(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__getUserName **p = (ns1__getUserName **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__getUserName,
         sizeof(ns1__getUserName), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39366,7 +39433,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__getUserName(struct soap *soap,
                                    ns1__getUserName *const *a, const char *tag,
                                    const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__getUserName);
   if (soap_out_PointerTons1__getUserName(soap, tag ? tag : "ns1:getUserName",
                                          id, a, type))
@@ -39379,7 +39446,7 @@ soap_get_PointerTons1__getUserName(struct soap *soap, ns1__getUserName **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__getUserName(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39396,7 +39463,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__loginResponse(struct soap *soap, const char *tag, int id,
                                      ns1__loginResponse *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__loginResponse);
   if (id < 0)
     return soap->error;
@@ -39406,28 +39473,28 @@ soap_out_PointerTons1__loginResponse(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__loginResponse **SOAP_FMAC4
 soap_in_PointerTons1__loginResponse(struct soap *soap, const char *tag,
                                     ns1__loginResponse **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__loginResponse **)soap_malloc(soap,
                                                  sizeof(ns1__loginResponse *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__loginResponse *)soap_instantiate_ns1__loginResponse(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__loginResponse **p = (ns1__loginResponse **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__loginResponse,
         sizeof(ns1__loginResponse), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39436,7 +39503,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__loginResponse(struct soap *soap,
                                      ns1__loginResponse *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__loginResponse);
   if (soap_out_PointerTons1__loginResponse(
           soap, tag ? tag : "ns1:loginResponse", id, a, type))
@@ -39449,7 +39516,7 @@ soap_get_PointerTons1__loginResponse(struct soap *soap, ns1__loginResponse **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__loginResponse(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39464,7 +39531,7 @@ soap_serialize_PointerTons1__login(struct soap *soap, ns1__login *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__login(struct soap *soap, const char *tag, int id,
                              ns1__login *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__login);
   if (id < 0)
     return soap->error;
@@ -39474,27 +39541,27 @@ soap_out_PointerTons1__login(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__login **SOAP_FMAC4
 soap_in_PointerTons1__login(struct soap *soap, const char *tag, ns1__login **a,
                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__login **)soap_malloc(soap, sizeof(ns1__login *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__login *)soap_instantiate_ns1__login(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__login **p = (ns1__login **)soap_id_lookup(soap, soap->href, (void **)a,
                                                    SOAP_TYPE_ICat4_ns1__login,
                                                    sizeof(ns1__login), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39502,7 +39569,7 @@ soap_in_PointerTons1__login(struct soap *soap, const char *tag, ns1__login **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__login(struct soap *soap, ns1__login *const *a,
                              const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__login);
   if (soap_out_PointerTons1__login(soap, tag ? tag : "ns1:login", id, a, type))
     return soap->error;
@@ -39514,7 +39581,7 @@ soap_get_PointerTons1__login(struct soap *soap, ns1__login **p, const char *tag,
                              const char *type) {
   if ((p = soap_in_PointerTons1__login(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39531,7 +39598,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__IcatException(struct soap *soap, const char *tag, int id,
                                      ns1__IcatException *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__IcatException);
   if (id < 0)
     return soap->error;
@@ -39541,28 +39608,28 @@ soap_out_PointerTons1__IcatException(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__IcatException **SOAP_FMAC4
 soap_in_PointerTons1__IcatException(struct soap *soap, const char *tag,
                                     ns1__IcatException **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__IcatException **)soap_malloc(soap,
                                                  sizeof(ns1__IcatException *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__IcatException *)soap_instantiate_ns1__IcatException(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__IcatException **p = (ns1__IcatException **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__IcatException,
         sizeof(ns1__IcatException), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39571,7 +39638,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__IcatException(struct soap *soap,
                                      ns1__IcatException *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__IcatException);
   if (soap_out_PointerTons1__IcatException(
           soap, tag ? tag : "ns1:IcatException", id, a, type))
@@ -39584,7 +39651,7 @@ soap_get_PointerTons1__IcatException(struct soap *soap, ns1__IcatException **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__IcatException(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39598,7 +39665,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__parameterValueType(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__parameterValueType(
     struct soap *soap, const char *tag, int id,
     enum ns1__parameterValueType *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__parameterValueType);
   if (id < 0)
     return soap->error;
@@ -39609,23 +39676,23 @@ SOAP_FMAC3 enum ns1__parameterValueType **SOAP_FMAC4
 soap_in_PointerTons1__parameterValueType(struct soap *soap, const char *tag,
                                          enum ns1__parameterValueType **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__parameterValueType **)soap_malloc(
               soap, sizeof(enum ns1__parameterValueType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__parameterValueType(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__parameterValueType **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__parameterValueType,
         sizeof(enum ns1__parameterValueType), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39633,7 +39700,7 @@ soap_in_PointerTons1__parameterValueType(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__parameterValueType(
     struct soap *soap, enum ns1__parameterValueType *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__parameterValueType);
   if (soap_out_PointerTons1__parameterValueType(
           soap, tag ? tag : "ns1:parameterValueType", id, a, type))
@@ -39647,7 +39714,7 @@ soap_get_PointerTons1__parameterValueType(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__parameterValueType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39662,7 +39729,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__permissibleStringValue(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__permissibleStringValue(
     struct soap *soap, const char *tag, int id,
     ns1__permissibleStringValue *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__permissibleStringValue);
   if (id < 0)
     return soap->error;
@@ -39673,22 +39740,22 @@ SOAP_FMAC3 ns1__permissibleStringValue **SOAP_FMAC4
 soap_in_PointerTons1__permissibleStringValue(struct soap *soap, const char *tag,
                                              ns1__permissibleStringValue **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__permissibleStringValue **)soap_malloc(
               soap, sizeof(ns1__permissibleStringValue *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__permissibleStringValue *)
               soap_instantiate_ns1__permissibleStringValue(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__permissibleStringValue **p =
         (ns1__permissibleStringValue **)soap_id_lookup(
@@ -39697,7 +39764,7 @@ soap_in_PointerTons1__permissibleStringValue(struct soap *soap, const char *tag,
             sizeof(ns1__permissibleStringValue), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39705,7 +39772,7 @@ soap_in_PointerTons1__permissibleStringValue(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__permissibleStringValue(
     struct soap *soap, ns1__permissibleStringValue *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__permissibleStringValue);
   if (soap_out_PointerTons1__permissibleStringValue(
           soap, tag ? tag : "ns1:permissibleStringValue", id, a, type))
@@ -39720,7 +39787,7 @@ soap_get_PointerTons1__permissibleStringValue(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__permissibleStringValue(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39734,8 +39801,8 @@ soap_serialize_PointerTodouble(struct soap *soap, double *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTodouble(struct soap *soap, const char *tag, int id,
                          double *const *a, const char *type) {
-  id =
-      soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ICat4_double);
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
+                       SOAP_TYPE_ICat4_double);
   if (id < 0)
     return soap->error;
   return soap_out_double(soap, tag, id, *a, type);
@@ -39744,21 +39811,21 @@ soap_out_PointerTodouble(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 double **SOAP_FMAC4
 soap_in_PointerTodouble(struct soap *soap, const char *tag, double **a,
                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (double **)soap_malloc(soap, sizeof(double *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_double(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (double **)soap_id_lookup(soap, soap->href, (void **)a,
                                   SOAP_TYPE_ICat4_double, sizeof(double), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39766,7 +39833,7 @@ soap_in_PointerTodouble(struct soap *soap, const char *tag, double **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTodouble(struct soap *soap, double *const *a, const char *tag,
                          const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTodouble);
   if (soap_out_PointerTodouble(soap, tag ? tag : "double", id, a, type))
     return soap->error;
@@ -39778,7 +39845,7 @@ soap_get_PointerTodouble(struct soap *soap, double **p, const char *tag,
                          const char *type) {
   if ((p = soap_in_PointerTodouble(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39793,7 +39860,7 @@ soap_serialize_PointerTons1__rule(struct soap *soap, ns1__rule *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__rule(struct soap *soap, const char *tag, int id,
                             ns1__rule *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__rule);
   if (id < 0)
     return soap->error;
@@ -39803,27 +39870,27 @@ soap_out_PointerTons1__rule(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__rule **SOAP_FMAC4
 soap_in_PointerTons1__rule(struct soap *soap, const char *tag, ns1__rule **a,
                            const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__rule **)soap_malloc(soap, sizeof(ns1__rule *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
-    if (!(*a = (ns1__rule *)soap_instantiate_ns1__rule(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+    if (!(*a = (ns1__rule *)soap_instantiate_ns1__rule(
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__rule **p = (ns1__rule **)soap_id_lookup(soap, soap->href, (void **)a,
                                                  SOAP_TYPE_ICat4_ns1__rule,
                                                  sizeof(ns1__rule), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39831,7 +39898,7 @@ soap_in_PointerTons1__rule(struct soap *soap, const char *tag, ns1__rule **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__rule(struct soap *soap, ns1__rule *const *a,
                             const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__rule);
   if (soap_out_PointerTons1__rule(soap, tag ? tag : "ns1:rule", id, a, type))
     return soap->error;
@@ -39843,7 +39910,7 @@ soap_get_PointerTons1__rule(struct soap *soap, ns1__rule **p, const char *tag,
                             const char *type) {
   if ((p = soap_in_PointerTons1__rule(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39859,7 +39926,7 @@ soap_serialize_PointerTons1__sampleType(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__sampleType(struct soap *soap, const char *tag, int id,
                                   ns1__sampleType *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__sampleType);
   if (id < 0)
     return soap->error;
@@ -39869,27 +39936,27 @@ soap_out_PointerTons1__sampleType(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__sampleType **SOAP_FMAC4
 soap_in_PointerTons1__sampleType(struct soap *soap, const char *tag,
                                  ns1__sampleType **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__sampleType **)soap_malloc(soap, sizeof(ns1__sampleType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__sampleType *)soap_instantiate_ns1__sampleType(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__sampleType **p = (ns1__sampleType **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__sampleType,
         sizeof(ns1__sampleType), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39897,7 +39964,7 @@ soap_in_PointerTons1__sampleType(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__sampleType(struct soap *soap, ns1__sampleType *const *a,
                                   const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__sampleType);
   if (soap_out_PointerTons1__sampleType(soap, tag ? tag : "ns1:sampleType", id,
                                         a, type))
@@ -39910,7 +39977,7 @@ soap_get_PointerTons1__sampleType(struct soap *soap, ns1__sampleType **p,
                                   const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__sampleType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39925,7 +39992,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__investigationParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__investigationParameter(
     struct soap *soap, const char *tag, int id,
     ns1__investigationParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__investigationParameter);
   if (id < 0)
     return soap->error;
@@ -39936,22 +40003,22 @@ SOAP_FMAC3 ns1__investigationParameter **SOAP_FMAC4
 soap_in_PointerTons1__investigationParameter(struct soap *soap, const char *tag,
                                              ns1__investigationParameter **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__investigationParameter **)soap_malloc(
               soap, sizeof(ns1__investigationParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__investigationParameter *)
               soap_instantiate_ns1__investigationParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__investigationParameter **p =
         (ns1__investigationParameter **)soap_id_lookup(
@@ -39960,7 +40027,7 @@ soap_in_PointerTons1__investigationParameter(struct soap *soap, const char *tag,
             sizeof(ns1__investigationParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -39968,7 +40035,7 @@ soap_in_PointerTons1__investigationParameter(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__investigationParameter(
     struct soap *soap, ns1__investigationParameter *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__investigationParameter);
   if (soap_out_PointerTons1__investigationParameter(
           soap, tag ? tag : "ns1:investigationParameter", id, a, type))
@@ -39983,7 +40050,7 @@ soap_get_PointerTons1__investigationParameter(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__investigationParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -39998,7 +40065,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__investigationInstrument(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__investigationInstrument(
     struct soap *soap, const char *tag, int id,
     ns1__investigationInstrument *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__investigationInstrument);
   if (id < 0)
     return soap->error;
@@ -40010,22 +40077,22 @@ soap_in_PointerTons1__investigationInstrument(struct soap *soap,
                                               const char *tag,
                                               ns1__investigationInstrument **a,
                                               const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__investigationInstrument **)soap_malloc(
               soap, sizeof(ns1__investigationInstrument *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__investigationInstrument *)
               soap_instantiate_ns1__investigationInstrument(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__investigationInstrument **p =
         (ns1__investigationInstrument **)soap_id_lookup(
@@ -40034,7 +40101,7 @@ soap_in_PointerTons1__investigationInstrument(struct soap *soap,
             sizeof(ns1__investigationInstrument), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -40042,7 +40109,7 @@ soap_in_PointerTons1__investigationInstrument(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__investigationInstrument(
     struct soap *soap, ns1__investigationInstrument *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__investigationInstrument);
   if (soap_out_PointerTons1__investigationInstrument(
           soap, tag ? tag : "ns1:investigationInstrument", id, a, type))
@@ -40057,7 +40124,7 @@ soap_get_PointerTons1__investigationInstrument(struct soap *soap,
                                                const char *type) {
   if ((p = soap_in_PointerTons1__investigationInstrument(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -40073,7 +40140,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__accessType(struct soap *soap, const char *tag, int id,
                                   enum ns1__accessType *const *a,
                                   const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__accessType);
   if (id < 0)
     return soap->error;
@@ -40083,23 +40150,23 @@ soap_out_PointerTons1__accessType(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 enum ns1__accessType **SOAP_FMAC4
 soap_in_PointerTons1__accessType(struct soap *soap, const char *tag,
                                  enum ns1__accessType **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__accessType **)soap_malloc(
               soap, sizeof(enum ns1__accessType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__accessType(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__accessType **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__accessType,
         sizeof(enum ns1__accessType), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -40108,7 +40175,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__accessType(struct soap *soap,
                                   enum ns1__accessType *const *a,
                                   const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__accessType);
   if (soap_out_PointerTons1__accessType(soap, tag ? tag : "ns1:accessType", id,
                                         a, type))
@@ -40121,7 +40188,7 @@ soap_get_PointerTons1__accessType(struct soap *soap, enum ns1__accessType **p,
                                   const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__accessType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -40137,7 +40204,7 @@ soap_serialize_PointerToxsd__anyType(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerToxsd__anyType(struct soap *soap, const char *tag, int id,
                                xsd__anyType *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_xsd__anyType);
   if (id < 0)
     return soap->error;
@@ -40147,20 +40214,20 @@ soap_out_PointerToxsd__anyType(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 xsd__anyType **SOAP_FMAC4
 soap_in_PointerToxsd__anyType(struct soap *soap, const char *tag,
                               xsd__anyType **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (xsd__anyType **)soap_malloc(soap, sizeof(xsd__anyType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (xsd__anyType *)soap_instantiate_xsd__anyType(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     xsd__anyType **p = (xsd__anyType **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_xsd__anyType,
@@ -40807,7 +40874,7 @@ soap_in_PointerToxsd__anyType(struct soap *soap, const char *tag,
     }
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -40815,7 +40882,7 @@ soap_in_PointerToxsd__anyType(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerToxsd__anyType(struct soap *soap, xsd__anyType *const *a,
                                const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerToxsd__anyType);
   if (soap_out_PointerToxsd__anyType(soap, tag ? tag : "xsd:anyType", id, a,
                                      type))
@@ -40828,7 +40895,7 @@ soap_get_PointerToxsd__anyType(struct soap *soap, xsd__anyType **p,
                                const char *tag, const char *type) {
   if ((p = soap_in_PointerToxsd__anyType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -40842,7 +40909,8 @@ soap_serialize_PointerToint(struct soap *soap, int *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerToint(struct soap *soap, const char *tag, int id, int *const *a,
                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ICat4_int);
+  id =
+      soap_element_id(soap, tag, id, *a, nullptr, 0, type, SOAP_TYPE_ICat4_int);
   if (id < 0)
     return soap->error;
   return soap_out_int(soap, tag, id, *a, type);
@@ -40851,21 +40919,21 @@ soap_out_PointerToint(struct soap *soap, const char *tag, int id, int *const *a,
 SOAP_FMAC3 int **SOAP_FMAC4 soap_in_PointerToint(struct soap *soap,
                                                  const char *tag, int **a,
                                                  const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (int **)soap_malloc(soap, sizeof(int *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_int(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (int **)soap_id_lookup(soap, soap->href, (void **)a,
                                SOAP_TYPE_ICat4_int, sizeof(int), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -40873,8 +40941,8 @@ SOAP_FMAC3 int **SOAP_FMAC4 soap_in_PointerToint(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerToint(struct soap *soap,
                                                 int *const *a, const char *tag,
                                                 const char *type) {
-  int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat4_PointerToint);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_PointerToint);
   if (soap_out_PointerToint(soap, tag ? tag : "int", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -40885,7 +40953,7 @@ SOAP_FMAC3 int **SOAP_FMAC4 soap_get_PointerToint(struct soap *soap, int **p,
                                                   const char *type) {
   if ((p = soap_in_PointerToint(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -40900,7 +40968,7 @@ soap_serialize_PointerTons1__relType(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__relType(struct soap *soap, const char *tag, int id,
                                enum ns1__relType *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__relType);
   if (id < 0)
     return soap->error;
@@ -40910,23 +40978,23 @@ soap_out_PointerTons1__relType(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 enum ns1__relType **SOAP_FMAC4
 soap_in_PointerTons1__relType(struct soap *soap, const char *tag,
                               enum ns1__relType **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__relType **)soap_malloc(soap,
                                                 sizeof(enum ns1__relType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__relType(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__relType **)soap_id_lookup(soap, soap->href, (void **)a,
                                              SOAP_TYPE_ICat4_ns1__relType,
                                              sizeof(enum ns1__relType), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -40934,7 +41002,7 @@ soap_in_PointerTons1__relType(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__relType(struct soap *soap, enum ns1__relType *const *a,
                                const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__relType);
   if (soap_out_PointerTons1__relType(soap, tag ? tag : "ns1:relType", id, a,
                                      type))
@@ -40947,7 +41015,7 @@ soap_get_PointerTons1__relType(struct soap *soap, enum ns1__relType **p,
                                const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__relType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -40964,7 +41032,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__entityField(struct soap *soap, const char *tag, int id,
                                    ns1__entityField *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__entityField);
   if (id < 0)
     return soap->error;
@@ -40974,28 +41042,28 @@ soap_out_PointerTons1__entityField(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__entityField **SOAP_FMAC4
 soap_in_PointerTons1__entityField(struct soap *soap, const char *tag,
                                   ns1__entityField **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__entityField **)soap_malloc(soap,
                                                sizeof(ns1__entityField *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__entityField *)soap_instantiate_ns1__entityField(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__entityField **p = (ns1__entityField **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__entityField,
         sizeof(ns1__entityField), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41004,7 +41072,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__entityField(struct soap *soap,
                                    ns1__entityField *const *a, const char *tag,
                                    const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__entityField);
   if (soap_out_PointerTons1__entityField(soap, tag ? tag : "ns1:entityField",
                                          id, a, type))
@@ -41017,7 +41085,7 @@ soap_get_PointerTons1__entityField(struct soap *soap, ns1__entityField **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__entityField(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41033,7 +41101,7 @@ soap_serialize_PointerTons1__constraint(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__constraint(struct soap *soap, const char *tag, int id,
                                   ns1__constraint *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__constraint);
   if (id < 0)
     return soap->error;
@@ -41043,27 +41111,27 @@ soap_out_PointerTons1__constraint(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__constraint **SOAP_FMAC4
 soap_in_PointerTons1__constraint(struct soap *soap, const char *tag,
                                  ns1__constraint **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__constraint **)soap_malloc(soap, sizeof(ns1__constraint *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__constraint *)soap_instantiate_ns1__constraint(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__constraint **p = (ns1__constraint **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__constraint,
         sizeof(ns1__constraint), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41071,7 +41139,7 @@ soap_in_PointerTons1__constraint(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__constraint(struct soap *soap, ns1__constraint *const *a,
                                   const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__constraint);
   if (soap_out_PointerTons1__constraint(soap, tag ? tag : "ns1:constraint", id,
                                         a, type))
@@ -41084,7 +41152,7 @@ soap_get_PointerTons1__constraint(struct soap *soap, ns1__constraint **p,
                                   const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__constraint(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41100,7 +41168,7 @@ soap_serialize_PointerTons1__entityInfo(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__entityInfo(struct soap *soap, const char *tag, int id,
                                   ns1__entityInfo *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__entityInfo);
   if (id < 0)
     return soap->error;
@@ -41110,27 +41178,27 @@ soap_out_PointerTons1__entityInfo(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__entityInfo **SOAP_FMAC4
 soap_in_PointerTons1__entityInfo(struct soap *soap, const char *tag,
                                  ns1__entityInfo **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__entityInfo **)soap_malloc(soap, sizeof(ns1__entityInfo *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__entityInfo *)soap_instantiate_ns1__entityInfo(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__entityInfo **p = (ns1__entityInfo **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__entityInfo,
         sizeof(ns1__entityInfo), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41138,7 +41206,7 @@ soap_in_PointerTons1__entityInfo(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__entityInfo(struct soap *soap, ns1__entityInfo *const *a,
                                   const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__entityInfo);
   if (soap_out_PointerTons1__entityInfo(soap, tag ? tag : "ns1:entityInfo", id,
                                         a, type))
@@ -41151,7 +41219,7 @@ soap_get_PointerTons1__entityInfo(struct soap *soap, ns1__entityInfo **p,
                                   const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__entityInfo(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41167,7 +41235,7 @@ soap_serialize_PointerTons1__publicStep(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__publicStep(struct soap *soap, const char *tag, int id,
                                   ns1__publicStep *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__publicStep);
   if (id < 0)
     return soap->error;
@@ -41177,27 +41245,27 @@ soap_out_PointerTons1__publicStep(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__publicStep **SOAP_FMAC4
 soap_in_PointerTons1__publicStep(struct soap *soap, const char *tag,
                                  ns1__publicStep **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__publicStep **)soap_malloc(soap, sizeof(ns1__publicStep *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__publicStep *)soap_instantiate_ns1__publicStep(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__publicStep **p = (ns1__publicStep **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__publicStep,
         sizeof(ns1__publicStep), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41205,7 +41273,7 @@ soap_in_PointerTons1__publicStep(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__publicStep(struct soap *soap, ns1__publicStep *const *a,
                                   const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__publicStep);
   if (soap_out_PointerTons1__publicStep(soap, tag ? tag : "ns1:publicStep", id,
                                         a, type))
@@ -41218,7 +41286,7 @@ soap_get_PointerTons1__publicStep(struct soap *soap, ns1__publicStep **p,
                                   const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__publicStep(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41233,7 +41301,7 @@ soap_serialize_PointerTons1__log(struct soap *soap, ns1__log *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__log(struct soap *soap, const char *tag, int id,
                            ns1__log *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__log);
   if (id < 0)
     return soap->error;
@@ -41243,27 +41311,27 @@ soap_out_PointerTons1__log(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__log **SOAP_FMAC4
 soap_in_PointerTons1__log(struct soap *soap, const char *tag, ns1__log **a,
                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__log **)soap_malloc(soap, sizeof(ns1__log *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__log *)soap_instantiate_ns1__log(soap, -1, soap->type,
-                                                     soap->arrayType, NULL)))
-      return NULL;
+                                                     soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__log **p = (ns1__log **)soap_id_lookup(soap, soap->href, (void **)a,
                                                SOAP_TYPE_ICat4_ns1__log,
                                                sizeof(ns1__log), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41271,7 +41339,7 @@ soap_in_PointerTons1__log(struct soap *soap, const char *tag, ns1__log **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__log(struct soap *soap, ns1__log *const *a,
                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__log);
   if (soap_out_PointerTons1__log(soap, tag ? tag : "ns1:log", id, a, type))
     return soap->error;
@@ -41283,7 +41351,7 @@ soap_get_PointerTons1__log(struct soap *soap, ns1__log **p, const char *tag,
                            const char *type) {
   if ((p = soap_in_PointerTons1__log(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41299,7 +41367,7 @@ soap_serialize_PointerTons1__userGroup(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__userGroup(struct soap *soap, const char *tag, int id,
                                  ns1__userGroup *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__userGroup);
   if (id < 0)
     return soap->error;
@@ -41309,27 +41377,27 @@ soap_out_PointerTons1__userGroup(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__userGroup **SOAP_FMAC4
 soap_in_PointerTons1__userGroup(struct soap *soap, const char *tag,
                                 ns1__userGroup **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__userGroup **)soap_malloc(soap, sizeof(ns1__userGroup *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__userGroup *)soap_instantiate_ns1__userGroup(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__userGroup **p = (ns1__userGroup **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__userGroup,
         sizeof(ns1__userGroup), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41337,7 +41405,7 @@ soap_in_PointerTons1__userGroup(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__userGroup(struct soap *soap, ns1__userGroup *const *a,
                                  const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__userGroup);
   if (soap_out_PointerTons1__userGroup(soap, tag ? tag : "ns1:userGroup", id, a,
                                        type))
@@ -41350,7 +41418,7 @@ soap_get_PointerTons1__userGroup(struct soap *soap, ns1__userGroup **p,
                                  const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__userGroup(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41366,7 +41434,7 @@ soap_serialize_PointerTons1__grouping(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__grouping(struct soap *soap, const char *tag, int id,
                                 ns1__grouping *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__grouping);
   if (id < 0)
     return soap->error;
@@ -41376,27 +41444,27 @@ soap_out_PointerTons1__grouping(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__grouping **SOAP_FMAC4
 soap_in_PointerTons1__grouping(struct soap *soap, const char *tag,
                                ns1__grouping **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__grouping **)soap_malloc(soap, sizeof(ns1__grouping *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__grouping *)soap_instantiate_ns1__grouping(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__grouping **p = (ns1__grouping **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__grouping,
         sizeof(ns1__grouping), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41404,7 +41472,7 @@ soap_in_PointerTons1__grouping(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__grouping(struct soap *soap, ns1__grouping *const *a,
                                 const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__grouping);
   if (soap_out_PointerTons1__grouping(soap, tag ? tag : "ns1:grouping", id, a,
                                       type))
@@ -41417,7 +41485,7 @@ soap_get_PointerTons1__grouping(struct soap *soap, ns1__grouping **p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__grouping(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41432,7 +41500,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__dataCollectionDatafile(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__dataCollectionDatafile(
     struct soap *soap, const char *tag, int id,
     ns1__dataCollectionDatafile *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__dataCollectionDatafile);
   if (id < 0)
     return soap->error;
@@ -41443,22 +41511,22 @@ SOAP_FMAC3 ns1__dataCollectionDatafile **SOAP_FMAC4
 soap_in_PointerTons1__dataCollectionDatafile(struct soap *soap, const char *tag,
                                              ns1__dataCollectionDatafile **a,
                                              const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__dataCollectionDatafile **)soap_malloc(
               soap, sizeof(ns1__dataCollectionDatafile *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__dataCollectionDatafile *)
               soap_instantiate_ns1__dataCollectionDatafile(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__dataCollectionDatafile **p =
         (ns1__dataCollectionDatafile **)soap_id_lookup(
@@ -41467,7 +41535,7 @@ soap_in_PointerTons1__dataCollectionDatafile(struct soap *soap, const char *tag,
             sizeof(ns1__dataCollectionDatafile), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41475,7 +41543,7 @@ soap_in_PointerTons1__dataCollectionDatafile(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__dataCollectionDatafile(
     struct soap *soap, ns1__dataCollectionDatafile *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__dataCollectionDatafile);
   if (soap_out_PointerTons1__dataCollectionDatafile(
           soap, tag ? tag : "ns1:dataCollectionDatafile", id, a, type))
@@ -41490,7 +41558,7 @@ soap_get_PointerTons1__dataCollectionDatafile(struct soap *soap,
                                               const char *type) {
   if ((p = soap_in_PointerTons1__dataCollectionDatafile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41505,7 +41573,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__dataCollectionDataset(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__dataCollectionDataset(
     struct soap *soap, const char *tag, int id,
     ns1__dataCollectionDataset *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__dataCollectionDataset);
   if (id < 0)
     return soap->error;
@@ -41516,22 +41584,22 @@ SOAP_FMAC3 ns1__dataCollectionDataset **SOAP_FMAC4
 soap_in_PointerTons1__dataCollectionDataset(struct soap *soap, const char *tag,
                                             ns1__dataCollectionDataset **a,
                                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__dataCollectionDataset **)soap_malloc(
               soap, sizeof(ns1__dataCollectionDataset *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__dataCollectionDataset *)
               soap_instantiate_ns1__dataCollectionDataset(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__dataCollectionDataset **p =
         (ns1__dataCollectionDataset **)soap_id_lookup(
@@ -41540,7 +41608,7 @@ soap_in_PointerTons1__dataCollectionDataset(struct soap *soap, const char *tag,
             sizeof(ns1__dataCollectionDataset), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41548,7 +41616,7 @@ soap_in_PointerTons1__dataCollectionDataset(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__dataCollectionDataset(
     struct soap *soap, ns1__dataCollectionDataset *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__dataCollectionDataset);
   if (soap_out_PointerTons1__dataCollectionDataset(
           soap, tag ? tag : "ns1:dataCollectionDataset", id, a, type))
@@ -41563,7 +41631,7 @@ soap_get_PointerTons1__dataCollectionDataset(struct soap *soap,
                                              const char *type) {
   if ((p = soap_in_PointerTons1__dataCollectionDataset(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41578,7 +41646,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTons1__dataCollectionParameter(
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTons1__dataCollectionParameter(
     struct soap *soap, const char *tag, int id,
     ns1__dataCollectionParameter *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__dataCollectionParameter);
   if (id < 0)
     return soap->error;
@@ -41590,22 +41658,22 @@ soap_in_PointerTons1__dataCollectionParameter(struct soap *soap,
                                               const char *tag,
                                               ns1__dataCollectionParameter **a,
                                               const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__dataCollectionParameter **)soap_malloc(
               soap, sizeof(ns1__dataCollectionParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__dataCollectionParameter *)
               soap_instantiate_ns1__dataCollectionParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__dataCollectionParameter **p =
         (ns1__dataCollectionParameter **)soap_id_lookup(
@@ -41614,7 +41682,7 @@ soap_in_PointerTons1__dataCollectionParameter(struct soap *soap,
             sizeof(ns1__dataCollectionParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41622,7 +41690,7 @@ soap_in_PointerTons1__dataCollectionParameter(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTons1__dataCollectionParameter(
     struct soap *soap, ns1__dataCollectionParameter *const *a, const char *tag,
     const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__dataCollectionParameter);
   if (soap_out_PointerTons1__dataCollectionParameter(
           soap, tag ? tag : "ns1:dataCollectionParameter", id, a, type))
@@ -41637,7 +41705,7 @@ soap_get_PointerTons1__dataCollectionParameter(struct soap *soap,
                                                const char *type) {
   if ((p = soap_in_PointerTons1__dataCollectionParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41654,7 +41722,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__dataCollection(struct soap *soap, const char *tag,
                                       int id, ns1__dataCollection *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__dataCollection);
   if (id < 0)
     return soap->error;
@@ -41665,28 +41733,28 @@ SOAP_FMAC3 ns1__dataCollection **SOAP_FMAC4
 soap_in_PointerTons1__dataCollection(struct soap *soap, const char *tag,
                                      ns1__dataCollection **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__dataCollection **)soap_malloc(
               soap, sizeof(ns1__dataCollection *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__dataCollection *)soap_instantiate_ns1__dataCollection(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__dataCollection **p = (ns1__dataCollection **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__dataCollection,
         sizeof(ns1__dataCollection), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41695,7 +41763,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__dataCollection(struct soap *soap,
                                       ns1__dataCollection *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__dataCollection);
   if (soap_out_PointerTons1__dataCollection(
           soap, tag ? tag : "ns1:dataCollection", id, a, type))
@@ -41709,7 +41777,7 @@ soap_get_PointerTons1__dataCollection(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__dataCollection(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41724,7 +41792,7 @@ soap_serialize_PointerTons1__job(struct soap *soap, ns1__job *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__job(struct soap *soap, const char *tag, int id,
                            ns1__job *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__job);
   if (id < 0)
     return soap->error;
@@ -41734,27 +41802,27 @@ soap_out_PointerTons1__job(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__job **SOAP_FMAC4
 soap_in_PointerTons1__job(struct soap *soap, const char *tag, ns1__job **a,
                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__job **)soap_malloc(soap, sizeof(ns1__job *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__job *)soap_instantiate_ns1__job(soap, -1, soap->type,
-                                                     soap->arrayType, NULL)))
-      return NULL;
+                                                     soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__job **p = (ns1__job **)soap_id_lookup(soap, soap->href, (void **)a,
                                                SOAP_TYPE_ICat4_ns1__job,
                                                sizeof(ns1__job), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41762,7 +41830,7 @@ soap_in_PointerTons1__job(struct soap *soap, const char *tag, ns1__job **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__job(struct soap *soap, ns1__job *const *a,
                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__job);
   if (soap_out_PointerTons1__job(soap, tag ? tag : "ns1:job", id, a, type))
     return soap->error;
@@ -41774,7 +41842,7 @@ soap_get_PointerTons1__job(struct soap *soap, ns1__job **p, const char *tag,
                            const char *type) {
   if ((p = soap_in_PointerTons1__job(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41791,7 +41859,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__application(struct soap *soap, const char *tag, int id,
                                    ns1__application *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__application);
   if (id < 0)
     return soap->error;
@@ -41801,28 +41869,28 @@ soap_out_PointerTons1__application(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__application **SOAP_FMAC4
 soap_in_PointerTons1__application(struct soap *soap, const char *tag,
                                   ns1__application **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__application **)soap_malloc(soap,
                                                sizeof(ns1__application *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__application *)soap_instantiate_ns1__application(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__application **p = (ns1__application **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__application,
         sizeof(ns1__application), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41831,7 +41899,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__application(struct soap *soap,
                                    ns1__application *const *a, const char *tag,
                                    const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__application);
   if (soap_out_PointerTons1__application(soap, tag ? tag : "ns1:application",
                                          id, a, type))
@@ -41844,7 +41912,7 @@ soap_get_PointerTons1__application(struct soap *soap, ns1__application **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__application(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41860,7 +41928,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__studyStatus(struct soap *soap, const char *tag, int id,
                                    enum ns1__studyStatus *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__studyStatus);
   if (id < 0)
     return soap->error;
@@ -41870,23 +41938,23 @@ soap_out_PointerTons1__studyStatus(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 enum ns1__studyStatus **SOAP_FMAC4
 soap_in_PointerTons1__studyStatus(struct soap *soap, const char *tag,
                                   enum ns1__studyStatus **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__studyStatus **)soap_malloc(
               soap, sizeof(enum ns1__studyStatus *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__studyStatus(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__studyStatus **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__studyStatus,
         sizeof(enum ns1__studyStatus), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41895,7 +41963,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__studyStatus(struct soap *soap,
                                    enum ns1__studyStatus *const *a,
                                    const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__studyStatus);
   if (soap_out_PointerTons1__studyStatus(soap, tag ? tag : "ns1:studyStatus",
                                          id, a, type))
@@ -41908,7 +41976,7 @@ soap_get_PointerTons1__studyStatus(struct soap *soap, enum ns1__studyStatus **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__studyStatus(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41925,7 +41993,7 @@ soap_out_PointerTons1__studyInvestigation(struct soap *soap, const char *tag,
                                           int id,
                                           ns1__studyInvestigation *const *a,
                                           const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__studyInvestigation);
   if (id < 0)
     return soap->error;
@@ -41936,29 +42004,29 @@ SOAP_FMAC3 ns1__studyInvestigation **SOAP_FMAC4
 soap_in_PointerTons1__studyInvestigation(struct soap *soap, const char *tag,
                                          ns1__studyInvestigation **a,
                                          const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__studyInvestigation **)soap_malloc(
               soap, sizeof(ns1__studyInvestigation *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__studyInvestigation *)
-              soap_instantiate_ns1__studyInvestigation(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__studyInvestigation(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__studyInvestigation **p = (ns1__studyInvestigation **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__studyInvestigation,
         sizeof(ns1__studyInvestigation), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -41967,7 +42035,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__studyInvestigation(struct soap *soap,
                                           ns1__studyInvestigation *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__studyInvestigation);
   if (soap_out_PointerTons1__studyInvestigation(
           soap, tag ? tag : "ns1:studyInvestigation", id, a, type))
@@ -41981,7 +42049,7 @@ soap_get_PointerTons1__studyInvestigation(struct soap *soap,
                                           const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__studyInvestigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -41996,7 +42064,7 @@ soap_serialize_PointerTons1__study(struct soap *soap, ns1__study *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__study(struct soap *soap, const char *tag, int id,
                              ns1__study *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__study);
   if (id < 0)
     return soap->error;
@@ -42006,27 +42074,27 @@ soap_out_PointerTons1__study(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__study **SOAP_FMAC4
 soap_in_PointerTons1__study(struct soap *soap, const char *tag, ns1__study **a,
                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__study **)soap_malloc(soap, sizeof(ns1__study *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__study *)soap_instantiate_ns1__study(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__study **p = (ns1__study **)soap_id_lookup(soap, soap->href, (void **)a,
                                                    SOAP_TYPE_ICat4_ns1__study,
                                                    sizeof(ns1__study), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42034,7 +42102,7 @@ soap_in_PointerTons1__study(struct soap *soap, const char *tag, ns1__study **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__study(struct soap *soap, ns1__study *const *a,
                              const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__study);
   if (soap_out_PointerTons1__study(soap, tag ? tag : "ns1:study", id, a, type))
     return soap->error;
@@ -42046,7 +42114,7 @@ soap_get_PointerTons1__study(struct soap *soap, ns1__study **p, const char *tag,
                              const char *type) {
   if ((p = soap_in_PointerTons1__study(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42061,7 +42129,7 @@ soap_serialize_PointerTons1__shift(struct soap *soap, ns1__shift *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__shift(struct soap *soap, const char *tag, int id,
                              ns1__shift *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__shift);
   if (id < 0)
     return soap->error;
@@ -42071,27 +42139,27 @@ soap_out_PointerTons1__shift(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__shift **SOAP_FMAC4
 soap_in_PointerTons1__shift(struct soap *soap, const char *tag, ns1__shift **a,
                             const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__shift **)soap_malloc(soap, sizeof(ns1__shift *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__shift *)soap_instantiate_ns1__shift(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__shift **p = (ns1__shift **)soap_id_lookup(soap, soap->href, (void **)a,
                                                    SOAP_TYPE_ICat4_ns1__shift,
                                                    sizeof(ns1__shift), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42099,7 +42167,7 @@ soap_in_PointerTons1__shift(struct soap *soap, const char *tag, ns1__shift **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__shift(struct soap *soap, ns1__shift *const *a,
                              const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__shift);
   if (soap_out_PointerTons1__shift(soap, tag ? tag : "ns1:shift", id, a, type))
     return soap->error;
@@ -42111,7 +42179,7 @@ soap_get_PointerTons1__shift(struct soap *soap, ns1__shift **p, const char *tag,
                              const char *type) {
   if ((p = soap_in_PointerTons1__shift(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42128,7 +42196,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__sampleParameter(struct soap *soap, const char *tag,
                                        int id, ns1__sampleParameter *const *a,
                                        const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__sampleParameter);
   if (id < 0)
     return soap->error;
@@ -42139,28 +42207,28 @@ SOAP_FMAC3 ns1__sampleParameter **SOAP_FMAC4
 soap_in_PointerTons1__sampleParameter(struct soap *soap, const char *tag,
                                       ns1__sampleParameter **a,
                                       const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__sampleParameter **)soap_malloc(
               soap, sizeof(ns1__sampleParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__sampleParameter *)soap_instantiate_ns1__sampleParameter(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__sampleParameter **p = (ns1__sampleParameter **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__sampleParameter,
         sizeof(ns1__sampleParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42169,7 +42237,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__sampleParameter(struct soap *soap,
                                        ns1__sampleParameter *const *a,
                                        const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__sampleParameter);
   if (soap_out_PointerTons1__sampleParameter(
           soap, tag ? tag : "ns1:sampleParameter", id, a, type))
@@ -42183,7 +42251,7 @@ soap_get_PointerTons1__sampleParameter(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__sampleParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42198,7 +42266,7 @@ soap_serialize_PointerTons1__sample(struct soap *soap, ns1__sample *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__sample(struct soap *soap, const char *tag, int id,
                               ns1__sample *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__sample);
   if (id < 0)
     return soap->error;
@@ -42208,27 +42276,27 @@ soap_out_PointerTons1__sample(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__sample **SOAP_FMAC4
 soap_in_PointerTons1__sample(struct soap *soap, const char *tag,
                              ns1__sample **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__sample **)soap_malloc(soap, sizeof(ns1__sample *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__sample *)soap_instantiate_ns1__sample(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__sample **p = (ns1__sample **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__sample,
         sizeof(ns1__sample), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42236,7 +42304,7 @@ soap_in_PointerTons1__sample(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__sample(struct soap *soap, ns1__sample *const *a,
                               const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__sample);
   if (soap_out_PointerTons1__sample(soap, tag ? tag : "ns1:sample", id, a,
                                     type))
@@ -42249,7 +42317,7 @@ soap_get_PointerTons1__sample(struct soap *soap, ns1__sample **p,
                               const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__sample(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42266,7 +42334,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__relatedDatafile(struct soap *soap, const char *tag,
                                        int id, ns1__relatedDatafile *const *a,
                                        const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__relatedDatafile);
   if (id < 0)
     return soap->error;
@@ -42277,28 +42345,28 @@ SOAP_FMAC3 ns1__relatedDatafile **SOAP_FMAC4
 soap_in_PointerTons1__relatedDatafile(struct soap *soap, const char *tag,
                                       ns1__relatedDatafile **a,
                                       const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__relatedDatafile **)soap_malloc(
               soap, sizeof(ns1__relatedDatafile *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__relatedDatafile *)soap_instantiate_ns1__relatedDatafile(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__relatedDatafile **p = (ns1__relatedDatafile **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__relatedDatafile,
         sizeof(ns1__relatedDatafile), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42307,7 +42375,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__relatedDatafile(struct soap *soap,
                                        ns1__relatedDatafile *const *a,
                                        const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__relatedDatafile);
   if (soap_out_PointerTons1__relatedDatafile(
           soap, tag ? tag : "ns1:relatedDatafile", id, a, type))
@@ -42321,7 +42389,7 @@ soap_get_PointerTons1__relatedDatafile(struct soap *soap,
                                        const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__relatedDatafile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42338,7 +42406,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__publication(struct soap *soap, const char *tag, int id,
                                    ns1__publication *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__publication);
   if (id < 0)
     return soap->error;
@@ -42348,28 +42416,28 @@ soap_out_PointerTons1__publication(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__publication **SOAP_FMAC4
 soap_in_PointerTons1__publication(struct soap *soap, const char *tag,
                                   ns1__publication **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__publication **)soap_malloc(soap,
                                                sizeof(ns1__publication *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__publication *)soap_instantiate_ns1__publication(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__publication **p = (ns1__publication **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__publication,
         sizeof(ns1__publication), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42378,7 +42446,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__publication(struct soap *soap,
                                    ns1__publication *const *a, const char *tag,
                                    const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__publication);
   if (soap_out_PointerTons1__publication(soap, tag ? tag : "ns1:publication",
                                          id, a, type))
@@ -42391,7 +42459,7 @@ soap_get_PointerTons1__publication(struct soap *soap, ns1__publication **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__publication(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42408,7 +42476,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__parameterType(struct soap *soap, const char *tag, int id,
                                      ns1__parameterType *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__parameterType);
   if (id < 0)
     return soap->error;
@@ -42418,28 +42486,28 @@ soap_out_PointerTons1__parameterType(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__parameterType **SOAP_FMAC4
 soap_in_PointerTons1__parameterType(struct soap *soap, const char *tag,
                                     ns1__parameterType **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__parameterType **)soap_malloc(soap,
                                                  sizeof(ns1__parameterType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__parameterType *)soap_instantiate_ns1__parameterType(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__parameterType **p = (ns1__parameterType **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__parameterType,
         sizeof(ns1__parameterType), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42448,7 +42516,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__parameterType(struct soap *soap,
                                      ns1__parameterType *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__parameterType);
   if (soap_out_PointerTons1__parameterType(
           soap, tag ? tag : "ns1:parameterType", id, a, type))
@@ -42461,7 +42529,7 @@ soap_get_PointerTons1__parameterType(struct soap *soap, ns1__parameterType **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__parameterType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42477,7 +42545,7 @@ soap_serialize_PointerTons1__keyword(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__keyword(struct soap *soap, const char *tag, int id,
                                ns1__keyword *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__keyword);
   if (id < 0)
     return soap->error;
@@ -42487,27 +42555,27 @@ soap_out_PointerTons1__keyword(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__keyword **SOAP_FMAC4
 soap_in_PointerTons1__keyword(struct soap *soap, const char *tag,
                               ns1__keyword **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__keyword **)soap_malloc(soap, sizeof(ns1__keyword *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__keyword *)soap_instantiate_ns1__keyword(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__keyword **p = (ns1__keyword **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__keyword,
         sizeof(ns1__keyword), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42515,7 +42583,7 @@ soap_in_PointerTons1__keyword(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__keyword(struct soap *soap, ns1__keyword *const *a,
                                const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__keyword);
   if (soap_out_PointerTons1__keyword(soap, tag ? tag : "ns1:keyword", id, a,
                                      type))
@@ -42528,7 +42596,7 @@ soap_get_PointerTons1__keyword(struct soap *soap, ns1__keyword **p,
                                const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__keyword(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42545,7 +42613,7 @@ soap_out_PointerTons1__investigationUser(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__investigationUser *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__investigationUser);
   if (id < 0)
     return soap->error;
@@ -42556,29 +42624,29 @@ SOAP_FMAC3 ns1__investigationUser **SOAP_FMAC4
 soap_in_PointerTons1__investigationUser(struct soap *soap, const char *tag,
                                         ns1__investigationUser **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__investigationUser **)soap_malloc(
               soap, sizeof(ns1__investigationUser *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__investigationUser *)soap_instantiate_ns1__investigationUser(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__investigationUser **p = (ns1__investigationUser **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__investigationUser,
         sizeof(ns1__investigationUser), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42587,7 +42655,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__investigationUser(struct soap *soap,
                                          ns1__investigationUser *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__investigationUser);
   if (soap_out_PointerTons1__investigationUser(
           soap, tag ? tag : "ns1:investigationUser", id, a, type))
@@ -42601,7 +42669,7 @@ soap_get_PointerTons1__investigationUser(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__investigationUser(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42618,7 +42686,7 @@ soap_out_PointerTons1__investigationType(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__investigationType *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__investigationType);
   if (id < 0)
     return soap->error;
@@ -42629,29 +42697,29 @@ SOAP_FMAC3 ns1__investigationType **SOAP_FMAC4
 soap_in_PointerTons1__investigationType(struct soap *soap, const char *tag,
                                         ns1__investigationType **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__investigationType **)soap_malloc(
               soap, sizeof(ns1__investigationType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__investigationType *)soap_instantiate_ns1__investigationType(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__investigationType **p = (ns1__investigationType **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__investigationType,
         sizeof(ns1__investigationType), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42660,7 +42728,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__investigationType(struct soap *soap,
                                          ns1__investigationType *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__investigationType);
   if (soap_out_PointerTons1__investigationType(
           soap, tag ? tag : "ns1:investigationType", id, a, type))
@@ -42674,7 +42742,7 @@ soap_get_PointerTons1__investigationType(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__investigationType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42691,7 +42759,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__investigation(struct soap *soap, const char *tag, int id,
                                      ns1__investigation *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__investigation);
   if (id < 0)
     return soap->error;
@@ -42701,28 +42769,28 @@ soap_out_PointerTons1__investigation(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__investigation **SOAP_FMAC4
 soap_in_PointerTons1__investigation(struct soap *soap, const char *tag,
                                     ns1__investigation **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__investigation **)soap_malloc(soap,
                                                  sizeof(ns1__investigation *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__investigation *)soap_instantiate_ns1__investigation(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__investigation **p = (ns1__investigation **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__investigation,
         sizeof(ns1__investigation), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42731,7 +42799,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__investigation(struct soap *soap,
                                      ns1__investigation *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__investigation);
   if (soap_out_PointerTons1__investigation(
           soap, tag ? tag : "ns1:investigation", id, a, type))
@@ -42744,7 +42812,7 @@ soap_get_PointerTons1__investigation(struct soap *soap, ns1__investigation **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__investigation(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42760,7 +42828,7 @@ soap_serialize_PointerTons1__instrument(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__instrument(struct soap *soap, const char *tag, int id,
                                   ns1__instrument *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__instrument);
   if (id < 0)
     return soap->error;
@@ -42770,27 +42838,27 @@ soap_out_PointerTons1__instrument(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__instrument **SOAP_FMAC4
 soap_in_PointerTons1__instrument(struct soap *soap, const char *tag,
                                  ns1__instrument **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__instrument **)soap_malloc(soap, sizeof(ns1__instrument *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__instrument *)soap_instantiate_ns1__instrument(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__instrument **p = (ns1__instrument **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__instrument,
         sizeof(ns1__instrument), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42798,7 +42866,7 @@ soap_in_PointerTons1__instrument(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__instrument(struct soap *soap, ns1__instrument *const *a,
                                   const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__instrument);
   if (soap_out_PointerTons1__instrument(soap, tag ? tag : "ns1:instrument", id,
                                         a, type))
@@ -42811,7 +42879,7 @@ soap_get_PointerTons1__instrument(struct soap *soap, ns1__instrument **p,
                                   const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__instrument(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42826,7 +42894,7 @@ soap_serialize_PointerTons1__user(struct soap *soap, ns1__user *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__user(struct soap *soap, const char *tag, int id,
                             ns1__user *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__user);
   if (id < 0)
     return soap->error;
@@ -42836,27 +42904,27 @@ soap_out_PointerTons1__user(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__user **SOAP_FMAC4
 soap_in_PointerTons1__user(struct soap *soap, const char *tag, ns1__user **a,
                            const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__user **)soap_malloc(soap, sizeof(ns1__user *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
-    if (!(*a = (ns1__user *)soap_instantiate_ns1__user(soap, -1, soap->type,
-                                                       soap->arrayType, NULL)))
-      return NULL;
+    if (!(*a = (ns1__user *)soap_instantiate_ns1__user(
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__user **p = (ns1__user **)soap_id_lookup(soap, soap->href, (void **)a,
                                                  SOAP_TYPE_ICat4_ns1__user,
                                                  sizeof(ns1__user), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42864,7 +42932,7 @@ soap_in_PointerTons1__user(struct soap *soap, const char *tag, ns1__user **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__user(struct soap *soap, ns1__user *const *a,
                             const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__user);
   if (soap_out_PointerTons1__user(soap, tag ? tag : "ns1:user", id, a, type))
     return soap->error;
@@ -42876,7 +42944,7 @@ soap_get_PointerTons1__user(struct soap *soap, ns1__user **p, const char *tag,
                             const char *type) {
   if ((p = soap_in_PointerTons1__user(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42893,7 +42961,7 @@ soap_out_PointerTons1__instrumentScientist(struct soap *soap, const char *tag,
                                            int id,
                                            ns1__instrumentScientist *const *a,
                                            const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__instrumentScientist);
   if (id < 0)
     return soap->error;
@@ -42904,29 +42972,29 @@ SOAP_FMAC3 ns1__instrumentScientist **SOAP_FMAC4
 soap_in_PointerTons1__instrumentScientist(struct soap *soap, const char *tag,
                                           ns1__instrumentScientist **a,
                                           const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__instrumentScientist **)soap_malloc(
               soap, sizeof(ns1__instrumentScientist *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__instrumentScientist *)
-              soap_instantiate_ns1__instrumentScientist(soap, -1, soap->type,
-                                                        soap->arrayType, NULL)))
-      return NULL;
+              soap_instantiate_ns1__instrumentScientist(
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__instrumentScientist **p = (ns1__instrumentScientist **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__instrumentScientist,
         sizeof(ns1__instrumentScientist), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -42935,7 +43003,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__instrumentScientist(struct soap *soap,
                                            ns1__instrumentScientist *const *a,
                                            const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__instrumentScientist);
   if (soap_out_PointerTons1__instrumentScientist(
           soap, tag ? tag : "ns1:instrumentScientist", id, a, type))
@@ -42949,7 +43017,7 @@ soap_get_PointerTons1__instrumentScientist(struct soap *soap,
                                            const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__instrumentScientist(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -42966,7 +43034,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__facilityCycle(struct soap *soap, const char *tag, int id,
                                      ns1__facilityCycle *const *a,
                                      const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__facilityCycle);
   if (id < 0)
     return soap->error;
@@ -42976,28 +43044,28 @@ soap_out_PointerTons1__facilityCycle(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__facilityCycle **SOAP_FMAC4
 soap_in_PointerTons1__facilityCycle(struct soap *soap, const char *tag,
                                     ns1__facilityCycle **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__facilityCycle **)soap_malloc(soap,
                                                  sizeof(ns1__facilityCycle *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__facilityCycle *)soap_instantiate_ns1__facilityCycle(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__facilityCycle **p = (ns1__facilityCycle **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__facilityCycle,
         sizeof(ns1__facilityCycle), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -43006,7 +43074,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__facilityCycle(struct soap *soap,
                                      ns1__facilityCycle *const *a,
                                      const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__facilityCycle);
   if (soap_out_PointerTons1__facilityCycle(
           soap, tag ? tag : "ns1:facilityCycle", id, a, type))
@@ -43019,7 +43087,7 @@ soap_get_PointerTons1__facilityCycle(struct soap *soap, ns1__facilityCycle **p,
                                      const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__facilityCycle(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43035,7 +43103,7 @@ soap_serialize_PointerTons1__facility(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__facility(struct soap *soap, const char *tag, int id,
                                 ns1__facility *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__facility);
   if (id < 0)
     return soap->error;
@@ -43045,27 +43113,27 @@ soap_out_PointerTons1__facility(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__facility **SOAP_FMAC4
 soap_in_PointerTons1__facility(struct soap *soap, const char *tag,
                                ns1__facility **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__facility **)soap_malloc(soap, sizeof(ns1__facility *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__facility *)soap_instantiate_ns1__facility(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__facility **p = (ns1__facility **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__facility,
         sizeof(ns1__facility), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -43073,7 +43141,7 @@ soap_in_PointerTons1__facility(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__facility(struct soap *soap, ns1__facility *const *a,
                                 const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__facility);
   if (soap_out_PointerTons1__facility(soap, tag ? tag : "ns1:facility", id, a,
                                       type))
@@ -43086,7 +43154,7 @@ soap_get_PointerTons1__facility(struct soap *soap, ns1__facility **p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__facility(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43103,7 +43171,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__datasetType(struct soap *soap, const char *tag, int id,
                                    ns1__datasetType *const *a,
                                    const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__datasetType);
   if (id < 0)
     return soap->error;
@@ -43113,28 +43181,28 @@ soap_out_PointerTons1__datasetType(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__datasetType **SOAP_FMAC4
 soap_in_PointerTons1__datasetType(struct soap *soap, const char *tag,
                                   ns1__datasetType **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__datasetType **)soap_malloc(soap,
                                                sizeof(ns1__datasetType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__datasetType *)soap_instantiate_ns1__datasetType(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__datasetType **p = (ns1__datasetType **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__datasetType,
         sizeof(ns1__datasetType), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -43143,7 +43211,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__datasetType(struct soap *soap,
                                    ns1__datasetType *const *a, const char *tag,
                                    const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__datasetType);
   if (soap_out_PointerTons1__datasetType(soap, tag ? tag : "ns1:datasetType",
                                          id, a, type))
@@ -43156,7 +43224,7 @@ soap_get_PointerTons1__datasetType(struct soap *soap, ns1__datasetType **p,
                                    const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__datasetType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43173,7 +43241,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__datasetParameter(struct soap *soap, const char *tag,
                                         int id, ns1__datasetParameter *const *a,
                                         const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__datasetParameter);
   if (id < 0)
     return soap->error;
@@ -43184,28 +43252,28 @@ SOAP_FMAC3 ns1__datasetParameter **SOAP_FMAC4
 soap_in_PointerTons1__datasetParameter(struct soap *soap, const char *tag,
                                        ns1__datasetParameter **a,
                                        const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__datasetParameter **)soap_malloc(
               soap, sizeof(ns1__datasetParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__datasetParameter *)soap_instantiate_ns1__datasetParameter(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__datasetParameter **p = (ns1__datasetParameter **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__datasetParameter,
         sizeof(ns1__datasetParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -43214,7 +43282,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__datasetParameter(struct soap *soap,
                                         ns1__datasetParameter *const *a,
                                         const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__datasetParameter);
   if (soap_out_PointerTons1__datasetParameter(
           soap, tag ? tag : "ns1:datasetParameter", id, a, type))
@@ -43228,7 +43296,7 @@ soap_get_PointerTons1__datasetParameter(struct soap *soap,
                                         const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__datasetParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43244,7 +43312,7 @@ soap_serialize_PointerTons1__dataset(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__dataset(struct soap *soap, const char *tag, int id,
                                ns1__dataset *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__dataset);
   if (id < 0)
     return soap->error;
@@ -43254,27 +43322,27 @@ soap_out_PointerTons1__dataset(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__dataset **SOAP_FMAC4
 soap_in_PointerTons1__dataset(struct soap *soap, const char *tag,
                               ns1__dataset **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__dataset **)soap_malloc(soap, sizeof(ns1__dataset *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__dataset *)soap_instantiate_ns1__dataset(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__dataset **p = (ns1__dataset **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__dataset,
         sizeof(ns1__dataset), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -43282,7 +43350,7 @@ soap_in_PointerTons1__dataset(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__dataset(struct soap *soap, ns1__dataset *const *a,
                                const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__dataset);
   if (soap_out_PointerTons1__dataset(soap, tag ? tag : "ns1:dataset", id, a,
                                      type))
@@ -43295,7 +43363,7 @@ soap_get_PointerTons1__dataset(struct soap *soap, ns1__dataset **p,
                                const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__dataset(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43312,7 +43380,7 @@ soap_out_PointerTons1__datafileParameter(struct soap *soap, const char *tag,
                                          int id,
                                          ns1__datafileParameter *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__datafileParameter);
   if (id < 0)
     return soap->error;
@@ -43323,29 +43391,29 @@ SOAP_FMAC3 ns1__datafileParameter **SOAP_FMAC4
 soap_in_PointerTons1__datafileParameter(struct soap *soap, const char *tag,
                                         ns1__datafileParameter **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__datafileParameter **)soap_malloc(
               soap, sizeof(ns1__datafileParameter *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a =
               (ns1__datafileParameter *)soap_instantiate_ns1__datafileParameter(
-                  soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+                  soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__datafileParameter **p = (ns1__datafileParameter **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__datafileParameter,
         sizeof(ns1__datafileParameter), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -43354,7 +43422,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__datafileParameter(struct soap *soap,
                                          ns1__datafileParameter *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__datafileParameter);
   if (soap_out_PointerTons1__datafileParameter(
           soap, tag ? tag : "ns1:datafileParameter", id, a, type))
@@ -43368,7 +43436,7 @@ soap_get_PointerTons1__datafileParameter(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__datafileParameter(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43385,7 +43453,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__datafileFormat(struct soap *soap, const char *tag,
                                       int id, ns1__datafileFormat *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__datafileFormat);
   if (id < 0)
     return soap->error;
@@ -43396,28 +43464,28 @@ SOAP_FMAC3 ns1__datafileFormat **SOAP_FMAC4
 soap_in_PointerTons1__datafileFormat(struct soap *soap, const char *tag,
                                      ns1__datafileFormat **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__datafileFormat **)soap_malloc(
               soap, sizeof(ns1__datafileFormat *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__datafileFormat *)soap_instantiate_ns1__datafileFormat(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__datafileFormat **p = (ns1__datafileFormat **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__datafileFormat,
         sizeof(ns1__datafileFormat), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -43426,7 +43494,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__datafileFormat(struct soap *soap,
                                       ns1__datafileFormat *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__datafileFormat);
   if (soap_out_PointerTons1__datafileFormat(
           soap, tag ? tag : "ns1:datafileFormat", id, a, type))
@@ -43440,7 +43508,7 @@ soap_get_PointerTons1__datafileFormat(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__datafileFormat(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43456,7 +43524,7 @@ soap_serialize_PointerTons1__datafile(struct soap *soap,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__datafile(struct soap *soap, const char *tag, int id,
                                 ns1__datafile *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__datafile);
   if (id < 0)
     return soap->error;
@@ -43466,27 +43534,27 @@ soap_out_PointerTons1__datafile(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 ns1__datafile **SOAP_FMAC4
 soap_in_PointerTons1__datafile(struct soap *soap, const char *tag,
                                ns1__datafile **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__datafile **)soap_malloc(soap, sizeof(ns1__datafile *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__datafile *)soap_instantiate_ns1__datafile(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__datafile **p = (ns1__datafile **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__datafile,
         sizeof(ns1__datafile), 0);
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -43494,7 +43562,7 @@ soap_in_PointerTons1__datafile(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__datafile(struct soap *soap, ns1__datafile *const *a,
                                 const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__datafile);
   if (soap_out_PointerTons1__datafile(soap, tag ? tag : "ns1:datafile", id, a,
                                       type))
@@ -43507,7 +43575,7 @@ soap_get_PointerTons1__datafile(struct soap *soap, ns1__datafile **p,
                                 const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__datafile(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43536,18 +43604,18 @@ SOAP_FMAC3 std::vector<_ns1__login_credentials_entry> **SOAP_FMAC4
 soap_in_PointerTostd__vectorTemplateOf_ns1__login_credentials_entry(
     struct soap *soap, const char *tag,
     std::vector<_ns1__login_credentials_entry> **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   soap_revert(soap);
   if (!a) {
     if (!(a = (std::vector<_ns1__login_credentials_entry> **)soap_malloc(
               soap, sizeof(std::vector<_ns1__login_credentials_entry> *))))
-      return NULL;
-    *a = NULL;
+      return nullptr;
+    *a = nullptr;
   }
   if (!(*a = soap_in_std__vectorTemplateOf_ns1__login_credentials_entry(
             soap, tag, *a, type)))
-    return NULL;
+    return nullptr;
   return a;
 }
 
@@ -43556,7 +43624,7 @@ soap_put_PointerTostd__vectorTemplateOf_ns1__login_credentials_entry(
     struct soap *soap, std::vector<_ns1__login_credentials_entry> *const *a,
     const char *tag, const char *type) {
   int id = soap_embed(
-      soap, (void *)a, NULL, 0, tag,
+      soap, (void *)a, nullptr, 0, tag,
       SOAP_TYPE_ICat4_PointerTostd__vectorTemplateOf_ns1__login_credentials_entry);
   if (soap_out_PointerTostd__vectorTemplateOf_ns1__login_credentials_entry(
           soap, tag ? tag : "", id, a, type))
@@ -43571,7 +43639,7 @@ soap_get_PointerTostd__vectorTemplateOf_ns1__login_credentials_entry(
   if ((p = soap_in_PointerTostd__vectorTemplateOf_ns1__login_credentials_entry(
            soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43585,8 +43653,8 @@ soap_serialize_PointerToLONG64(struct soap *soap, LONG64 *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerToLONG64(struct soap *soap, const char *tag, int id,
                          LONG64 *const *a, const char *type) {
-  id =
-      soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ICat4_LONG64);
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
+                       SOAP_TYPE_ICat4_LONG64);
   if (id < 0)
     return soap->error;
   return soap_out_LONG64(soap, tag, id, *a, type);
@@ -43595,21 +43663,21 @@ soap_out_PointerToLONG64(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 LONG64 **SOAP_FMAC4
 soap_in_PointerToLONG64(struct soap *soap, const char *tag, LONG64 **a,
                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (LONG64 **)soap_malloc(soap, sizeof(LONG64 *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_LONG64(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (LONG64 **)soap_id_lookup(soap, soap->href, (void **)a,
                                   SOAP_TYPE_ICat4_LONG64, sizeof(LONG64), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -43617,7 +43685,7 @@ soap_in_PointerToLONG64(struct soap *soap, const char *tag, LONG64 **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerToLONG64(struct soap *soap, LONG64 *const *a, const char *tag,
                          const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerToLONG64);
   if (soap_out_PointerToLONG64(soap, tag ? tag : "long", id, a, type))
     return soap->error;
@@ -43629,7 +43697,7 @@ soap_get_PointerToLONG64(struct soap *soap, LONG64 **p, const char *tag,
                          const char *type) {
   if ((p = soap_in_PointerToLONG64(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43643,7 +43711,8 @@ soap_serialize_PointerTotime(struct soap *soap, time_t *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTotime(struct soap *soap, const char *tag, int id,
                        time_t *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ICat4_time);
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
+                       SOAP_TYPE_ICat4_time);
   if (id < 0)
     return soap->error;
   return soap_out_time(soap, tag, id, *a, type);
@@ -43652,21 +43721,21 @@ soap_out_PointerTotime(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 time_t **SOAP_FMAC4
 soap_in_PointerTotime(struct soap *soap, const char *tag, time_t **a,
                       const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (time_t **)soap_malloc(soap, sizeof(time_t *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_time(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (time_t **)soap_id_lookup(soap, soap->href, (void **)a,
                                   SOAP_TYPE_ICat4_time, sizeof(time_t), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -43674,8 +43743,8 @@ soap_in_PointerTotime(struct soap *soap, const char *tag, time_t **a,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTotime(struct soap *soap, time_t *const *a, const char *tag,
                        const char *type) {
-  int id =
-      soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat4_PointerTotime);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
+                      SOAP_TYPE_ICat4_PointerTotime);
   if (soap_out_PointerTotime(soap, tag ? tag : "dateTime", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -43686,7 +43755,7 @@ soap_get_PointerTotime(struct soap *soap, time_t **p, const char *tag,
                        const char *type) {
   if ((p = soap_in_PointerTotime(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -43703,7 +43772,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTons1__entityBaseBean(struct soap *soap, const char *tag,
                                       int id, ns1__entityBaseBean *const *a,
                                       const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__entityBaseBean);
   if (id < 0)
     return soap->error;
@@ -43714,21 +43783,21 @@ SOAP_FMAC3 ns1__entityBaseBean **SOAP_FMAC4
 soap_in_PointerTons1__entityBaseBean(struct soap *soap, const char *tag,
                                      ns1__entityBaseBean **a,
                                      const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (ns1__entityBaseBean **)soap_malloc(
               soap, sizeof(ns1__entityBaseBean *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = (ns1__entityBaseBean *)soap_instantiate_ns1__entityBaseBean(
-              soap, -1, soap->type, soap->arrayType, NULL)))
-      return NULL;
+              soap, -1, soap->type, soap->arrayType, nullptr)))
+      return nullptr;
     (*a)->soap_default(soap);
-    if (!(*a)->soap_in(soap, tag, NULL))
-      return NULL;
+    if (!(*a)->soap_in(soap, tag, nullptr))
+      return nullptr;
   } else {
     ns1__entityBaseBean **p = (ns1__entityBaseBean **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__entityBaseBean,
@@ -43976,7 +44045,7 @@ soap_in_PointerTons1__entityBaseBean(struct soap *soap, const char *tag,
     }
     a = p;
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -43985,7 +44054,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__entityBaseBean(struct soap *soap,
                                       ns1__entityBaseBean *const *a,
                                       const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__entityBaseBean);
   if (soap_out_PointerTons1__entityBaseBean(
           soap, tag ? tag : "ns1:entityBaseBean", id, a, type))
@@ -43999,7 +44068,7 @@ soap_get_PointerTons1__entityBaseBean(struct soap *soap,
                                       const char *type) {
   if ((p = soap_in_PointerTons1__entityBaseBean(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -44015,7 +44084,7 @@ soap_out_PointerTons1__icatExceptionType(struct soap *soap, const char *tag,
                                          int id,
                                          enum ns1__icatExceptionType *const *a,
                                          const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_ns1__icatExceptionType);
   if (id < 0)
     return soap->error;
@@ -44026,23 +44095,23 @@ SOAP_FMAC3 enum ns1__icatExceptionType **SOAP_FMAC4
 soap_in_PointerTons1__icatExceptionType(struct soap *soap, const char *tag,
                                         enum ns1__icatExceptionType **a,
                                         const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (enum ns1__icatExceptionType **)soap_malloc(
               soap, sizeof(enum ns1__icatExceptionType *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_ns1__icatExceptionType(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (enum ns1__icatExceptionType **)soap_id_lookup(
         soap, soap->href, (void **)a, SOAP_TYPE_ICat4_ns1__icatExceptionType,
         sizeof(enum ns1__icatExceptionType), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -44051,7 +44120,7 @@ SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTons1__icatExceptionType(struct soap *soap,
                                          enum ns1__icatExceptionType *const *a,
                                          const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTons1__icatExceptionType);
   if (soap_out_PointerTons1__icatExceptionType(
           soap, tag ? tag : "ns1:icatExceptionType", id, a, type))
@@ -44065,7 +44134,7 @@ soap_get_PointerTons1__icatExceptionType(struct soap *soap,
                                          const char *tag, const char *type) {
   if ((p = soap_in_PointerTons1__icatExceptionType(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -44080,7 +44149,7 @@ soap_serialize_PointerTostd__string(struct soap *soap, std::string *const *a) {
 SOAP_FMAC3 int SOAP_FMAC4
 soap_out_PointerTostd__string(struct soap *soap, const char *tag, int id,
                               std::string *const *a, const char *type) {
-  id = soap_element_id(soap, tag, id, *a, NULL, 0, type,
+  id = soap_element_id(soap, tag, id, *a, nullptr, 0, type,
                        SOAP_TYPE_ICat4_std__string);
   if (id < 0)
     return soap->error;
@@ -44090,22 +44159,22 @@ soap_out_PointerTostd__string(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 std::string **SOAP_FMAC4
 soap_in_PointerTostd__string(struct soap *soap, const char *tag,
                              std::string **a, const char *type) {
-  if (soap_element_begin_in(soap, tag, 1, NULL))
-    return NULL;
+  if (soap_element_begin_in(soap, tag, 1, nullptr))
+    return nullptr;
   if (!a)
     if (!(a = (std::string **)soap_malloc(soap, sizeof(std::string *))))
-      return NULL;
-  *a = NULL;
+      return nullptr;
+  *a = nullptr;
   if (!soap->null && *soap->href != '#') {
     soap_revert(soap);
     if (!(*a = soap_in_std__string(soap, tag, *a, type)))
-      return NULL;
+      return nullptr;
   } else {
     a = (std::string **)soap_id_lookup(soap, soap->href, (void **)a,
                                        SOAP_TYPE_ICat4_std__string,
                                        sizeof(std::string), 0);
     if (soap->body && soap_element_end_in(soap, tag))
-      return NULL;
+      return nullptr;
   }
   return a;
 }
@@ -44113,7 +44182,7 @@ soap_in_PointerTostd__string(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4
 soap_put_PointerTostd__string(struct soap *soap, std::string *const *a,
                               const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag,
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag,
                       SOAP_TYPE_ICat4_PointerTostd__string);
   if (soap_out_PointerTostd__string(soap, tag ? tag : "string", id, a, type))
     return soap->error;
@@ -44125,7 +44194,7 @@ soap_get_PointerTostd__string(struct soap *soap, std::string **p,
                               const char *tag, const char *type) {
   if ((p = soap_in_PointerTostd__string(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -44151,7 +44220,7 @@ soap_in__QName(struct soap *soap, const char *tag, char **a, const char *type) {
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put__QName(struct soap *soap, char *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat4__QName);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat4__QName);
   if (soap_out__QName(soap, tag ? tag : "byte", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -44162,7 +44231,7 @@ SOAP_FMAC3 char **SOAP_FMAC4 soap_get__QName(struct soap *soap, char **p,
                                              const char *type) {
   if ((p = soap_in__QName(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -44171,7 +44240,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_default_string(struct soap *soap, char **a) {
 #ifdef SOAP_DEFAULT_string
   *a = SOAP_DEFAULT_string;
 #else
-  *a = (char *)0;
+  *a = (char *)nullptr;
 #endif
 }
 
@@ -44197,7 +44266,7 @@ soap_in_string(struct soap *soap, const char *tag, char **a, const char *type) {
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put_string(struct soap *soap, char *const *a,
                                           const char *tag, const char *type) {
-  int id = soap_embed(soap, (void *)a, NULL, 0, tag, SOAP_TYPE_ICat4_string);
+  int id = soap_embed(soap, (void *)a, nullptr, 0, tag, SOAP_TYPE_ICat4_string);
   if (soap_out_string(soap, tag ? tag : "byte", id, a, type))
     return soap->error;
   return soap_putindependent(soap);
@@ -44208,7 +44277,7 @@ SOAP_FMAC3 char **SOAP_FMAC4 soap_get_string(struct soap *soap, char **p,
                                              const char *type) {
   if ((p = soap_in_string(soap, tag, p, type)))
     if (soap_getindependent(soap))
-      return NULL;
+      return nullptr;
   return p;
 }
 
@@ -44249,11 +44318,11 @@ soap_in_std__vectorTemplateOfPointerTons1__sampleParameter(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__sampleParameter *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -44261,7 +44330,7 @@ soap_in_std__vectorTemplateOfPointerTons1__sampleParameter(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__sampleParameter,
               sizeof(ns1__sampleParameter), 1))
         break;
-      if (!soap_in_PointerTons1__sampleParameter(soap, tag, NULL,
+      if (!soap_in_PointerTons1__sampleParameter(soap, tag, nullptr,
                                                  "ns1:sampleParameter"))
         break;
     } else if (!soap_in_PointerTons1__sampleParameter(soap, tag, &n,
@@ -44270,7 +44339,7 @@ soap_in_std__vectorTemplateOfPointerTons1__sampleParameter(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__sampleParameter(soap,
                                                                           -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -44280,7 +44349,7 @@ soap_in_std__vectorTemplateOfPointerTons1__sampleParameter(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__sampleParameter *> *SOAP_FMAC2
@@ -44294,11 +44363,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__sampleParameter(
                                     "sampleParameter(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__sampleParameter, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__sampleParameter *>);
     if (size)
@@ -44370,11 +44439,11 @@ soap_in_std__vectorTemplateOfPointerTons1__permissibleStringValue(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__permissibleStringValue *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -44383,7 +44452,7 @@ soap_in_std__vectorTemplateOfPointerTons1__permissibleStringValue(
               sizeof(ns1__permissibleStringValue), 1))
         break;
       if (!soap_in_PointerTons1__permissibleStringValue(
-              soap, tag, NULL, "ns1:permissibleStringValue"))
+              soap, tag, nullptr, "ns1:permissibleStringValue"))
         break;
     } else if (!soap_in_PointerTons1__permissibleStringValue(
                    soap, tag, &n, "ns1:permissibleStringValue"))
@@ -44391,7 +44460,7 @@ soap_in_std__vectorTemplateOfPointerTons1__permissibleStringValue(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__permissibleStringValue(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -44401,7 +44470,7 @@ soap_in_std__vectorTemplateOfPointerTons1__permissibleStringValue(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__permissibleStringValue *> *SOAP_FMAC2
@@ -44415,11 +44484,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__permissibleStringValue(
                                     "permissibleStringValue(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__permissibleStringValue,
       n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__permissibleStringValue *>);
     if (size)
@@ -44490,11 +44559,11 @@ soap_in_std__vectorTemplateOfPointerTons1__rule(struct soap *soap,
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__rule *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -44502,12 +44571,12 @@ soap_in_std__vectorTemplateOfPointerTons1__rule(struct soap *soap,
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__rule,
               sizeof(ns1__rule), 1))
         break;
-      if (!soap_in_PointerTons1__rule(soap, tag, NULL, "ns1:rule"))
+      if (!soap_in_PointerTons1__rule(soap, tag, nullptr, "ns1:rule"))
         break;
     } else if (!soap_in_PointerTons1__rule(soap, tag, &n, "ns1:rule"))
       break;
     if (!a && !(a = soap_new_std__vectorTemplateOfPointerTons1__rule(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -44517,7 +44586,7 @@ soap_in_std__vectorTemplateOfPointerTons1__rule(struct soap *soap,
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__rule *> *SOAP_FMAC2
@@ -44533,10 +44602,10 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__rule(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__rule, n,
+      soap, nullptr, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__rule, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__rule *>);
     if (size)
@@ -44603,11 +44672,11 @@ soap_in_std__vectorTemplateOfPointerTons1__userGroup(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__userGroup *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -44615,13 +44684,13 @@ soap_in_std__vectorTemplateOfPointerTons1__userGroup(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__userGroup,
               sizeof(ns1__userGroup), 1))
         break;
-      if (!soap_in_PointerTons1__userGroup(soap, tag, NULL, "ns1:userGroup"))
+      if (!soap_in_PointerTons1__userGroup(soap, tag, nullptr, "ns1:userGroup"))
         break;
     } else if (!soap_in_PointerTons1__userGroup(soap, tag, &n, "ns1:userGroup"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__userGroup(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -44631,7 +44700,7 @@ soap_in_std__vectorTemplateOfPointerTons1__userGroup(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__userGroup *> *SOAP_FMAC2
@@ -44644,11 +44713,12 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__userGroup(
                                     "vectorTemplateOfPointerTons1__userGroup(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__userGroup,
-      n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__userGroup, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__userGroup *>);
     if (size)
@@ -44718,11 +44788,11 @@ soap_in_std__vectorTemplateOfPointerTons1__study(struct soap *soap,
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__study *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -44730,13 +44800,13 @@ soap_in_std__vectorTemplateOfPointerTons1__study(struct soap *soap,
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__study,
               sizeof(ns1__study), 1))
         break;
-      if (!soap_in_PointerTons1__study(soap, tag, NULL, "ns1:study"))
+      if (!soap_in_PointerTons1__study(soap, tag, nullptr, "ns1:study"))
         break;
     } else if (!soap_in_PointerTons1__study(soap, tag, &n, "ns1:study"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__study(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -44746,7 +44816,7 @@ soap_in_std__vectorTemplateOfPointerTons1__study(struct soap *soap,
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__study *> *SOAP_FMAC2
@@ -44762,10 +44832,10 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__study(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__study, n,
-      ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__study,
+      n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__study *>);
     if (size)
@@ -44833,11 +44903,11 @@ soap_in_std__vectorTemplateOfPointerTons1__instrumentScientist(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__instrumentScientist *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -44845,7 +44915,7 @@ soap_in_std__vectorTemplateOfPointerTons1__instrumentScientist(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__instrumentScientist,
               sizeof(ns1__instrumentScientist), 1))
         break;
-      if (!soap_in_PointerTons1__instrumentScientist(soap, tag, NULL,
+      if (!soap_in_PointerTons1__instrumentScientist(soap, tag, nullptr,
                                                      "ns1:instrumentScientist"))
         break;
     } else if (!soap_in_PointerTons1__instrumentScientist(
@@ -44854,7 +44924,7 @@ soap_in_std__vectorTemplateOfPointerTons1__instrumentScientist(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__instrumentScientist(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -44864,7 +44934,7 @@ soap_in_std__vectorTemplateOfPointerTons1__instrumentScientist(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__instrumentScientist *> *SOAP_FMAC2
@@ -44878,11 +44948,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__instrumentScientist(
                                     "instrumentScientist(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__instrumentScientist, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__instrumentScientist *>);
     if (size)
@@ -44954,11 +45024,11 @@ soap_in_std__vectorTemplateOfPointerTons1__sampleType(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__sampleType *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -44966,14 +45036,15 @@ soap_in_std__vectorTemplateOfPointerTons1__sampleType(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__sampleType,
               sizeof(ns1__sampleType), 1))
         break;
-      if (!soap_in_PointerTons1__sampleType(soap, tag, NULL, "ns1:sampleType"))
+      if (!soap_in_PointerTons1__sampleType(soap, tag, nullptr,
+                                            "ns1:sampleType"))
         break;
     } else if (!soap_in_PointerTons1__sampleType(soap, tag, &n,
                                                  "ns1:sampleType"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__sampleType(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -44983,7 +45054,7 @@ soap_in_std__vectorTemplateOfPointerTons1__sampleType(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__sampleType *> *SOAP_FMAC2
@@ -44996,11 +45067,12 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__sampleType(
                                     "vectorTemplateOfPointerTons1__sampleType(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__sampleType,
-      n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__sampleType,
+                n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__sampleType *>);
     if (size)
@@ -45070,11 +45142,11 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterType(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__parameterType *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -45082,7 +45154,7 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterType(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__parameterType,
               sizeof(ns1__parameterType), 1))
         break;
-      if (!soap_in_PointerTons1__parameterType(soap, tag, NULL,
+      if (!soap_in_PointerTons1__parameterType(soap, tag, nullptr,
                                                "ns1:parameterType"))
         break;
     } else if (!soap_in_PointerTons1__parameterType(soap, tag, &n,
@@ -45091,7 +45163,7 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterType(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__parameterType(soap,
                                                                         -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -45101,7 +45173,7 @@ soap_in_std__vectorTemplateOfPointerTons1__parameterType(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__parameterType *> *SOAP_FMAC2
@@ -45115,11 +45187,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__parameterType(
                                     "parameterType(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__parameterType, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__parameterType *>);
     if (size)
@@ -45191,11 +45263,11 @@ soap_in_std__vectorTemplateOfPointerTons1__investigation(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__investigation *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -45203,7 +45275,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigation(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__investigation,
               sizeof(ns1__investigation), 1))
         break;
-      if (!soap_in_PointerTons1__investigation(soap, tag, NULL,
+      if (!soap_in_PointerTons1__investigation(soap, tag, nullptr,
                                                "ns1:investigation"))
         break;
     } else if (!soap_in_PointerTons1__investigation(soap, tag, &n,
@@ -45212,7 +45284,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigation(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__investigation(soap,
                                                                         -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -45222,7 +45294,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigation(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__investigation *> *SOAP_FMAC2
@@ -45236,11 +45308,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__investigation(
                                     "investigation(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__investigation, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__investigation *>);
     if (size)
@@ -45312,11 +45384,11 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationType(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__investigationType *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -45324,7 +45396,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationType(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__investigationType,
               sizeof(ns1__investigationType), 1))
         break;
-      if (!soap_in_PointerTons1__investigationType(soap, tag, NULL,
+      if (!soap_in_PointerTons1__investigationType(soap, tag, nullptr,
                                                    "ns1:investigationType"))
         break;
     } else if (!soap_in_PointerTons1__investigationType(
@@ -45333,7 +45405,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationType(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__investigationType(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -45343,7 +45415,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationType(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__investigationType *> *SOAP_FMAC2
@@ -45357,11 +45429,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__investigationType(
                                     "investigationType(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__investigationType, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__investigationType *>);
     if (size)
@@ -45431,11 +45503,11 @@ soap_in_std__vectorTemplateOfPointerTons1__instrument(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__instrument *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -45443,14 +45515,15 @@ soap_in_std__vectorTemplateOfPointerTons1__instrument(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__instrument,
               sizeof(ns1__instrument), 1))
         break;
-      if (!soap_in_PointerTons1__instrument(soap, tag, NULL, "ns1:instrument"))
+      if (!soap_in_PointerTons1__instrument(soap, tag, nullptr,
+                                            "ns1:instrument"))
         break;
     } else if (!soap_in_PointerTons1__instrument(soap, tag, &n,
                                                  "ns1:instrument"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__instrument(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -45460,7 +45533,7 @@ soap_in_std__vectorTemplateOfPointerTons1__instrument(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__instrument *> *SOAP_FMAC2
@@ -45473,11 +45546,12 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__instrument(
                                     "vectorTemplateOfPointerTons1__instrument(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__instrument,
-      n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__instrument,
+                n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__instrument *>);
     if (size)
@@ -45547,11 +45621,11 @@ soap_in_std__vectorTemplateOfPointerTons1__facilityCycle(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__facilityCycle *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -45559,7 +45633,7 @@ soap_in_std__vectorTemplateOfPointerTons1__facilityCycle(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__facilityCycle,
               sizeof(ns1__facilityCycle), 1))
         break;
-      if (!soap_in_PointerTons1__facilityCycle(soap, tag, NULL,
+      if (!soap_in_PointerTons1__facilityCycle(soap, tag, nullptr,
                                                "ns1:facilityCycle"))
         break;
     } else if (!soap_in_PointerTons1__facilityCycle(soap, tag, &n,
@@ -45568,7 +45642,7 @@ soap_in_std__vectorTemplateOfPointerTons1__facilityCycle(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__facilityCycle(soap,
                                                                         -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -45578,7 +45652,7 @@ soap_in_std__vectorTemplateOfPointerTons1__facilityCycle(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__facilityCycle *> *SOAP_FMAC2
@@ -45592,11 +45666,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__facilityCycle(
                                     "facilityCycle(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__facilityCycle, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__facilityCycle *>);
     if (size)
@@ -45668,11 +45742,11 @@ soap_in_std__vectorTemplateOfPointerTons1__datasetType(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__datasetType *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -45680,7 +45754,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datasetType(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__datasetType,
               sizeof(ns1__datasetType), 1))
         break;
-      if (!soap_in_PointerTons1__datasetType(soap, tag, NULL,
+      if (!soap_in_PointerTons1__datasetType(soap, tag, nullptr,
                                              "ns1:datasetType"))
         break;
     } else if (!soap_in_PointerTons1__datasetType(soap, tag, &n,
@@ -45689,7 +45763,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datasetType(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__datasetType(soap,
                                                                       -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -45699,7 +45773,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datasetType(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__datasetType *> *SOAP_FMAC2
@@ -45713,11 +45787,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__datasetType(
                                     "%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__datasetType,
                 n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__datasetType *>);
     if (size)
@@ -45788,11 +45862,11 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileFormat(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__datafileFormat *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -45800,7 +45874,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileFormat(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__datafileFormat,
               sizeof(ns1__datafileFormat), 1))
         break;
-      if (!soap_in_PointerTons1__datafileFormat(soap, tag, NULL,
+      if (!soap_in_PointerTons1__datafileFormat(soap, tag, nullptr,
                                                 "ns1:datafileFormat"))
         break;
     } else if (!soap_in_PointerTons1__datafileFormat(soap, tag, &n,
@@ -45809,7 +45883,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileFormat(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__datafileFormat(soap,
                                                                          -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -45819,7 +45893,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileFormat(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__datafileFormat *> *SOAP_FMAC2
@@ -45833,11 +45907,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__datafileFormat(
                                     "datafileFormat(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__datafileFormat, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__datafileFormat *>);
     if (size)
@@ -45909,11 +45983,11 @@ soap_in_std__vectorTemplateOfPointerTons1__application(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__application *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -45921,7 +45995,7 @@ soap_in_std__vectorTemplateOfPointerTons1__application(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__application,
               sizeof(ns1__application), 1))
         break;
-      if (!soap_in_PointerTons1__application(soap, tag, NULL,
+      if (!soap_in_PointerTons1__application(soap, tag, nullptr,
                                              "ns1:application"))
         break;
     } else if (!soap_in_PointerTons1__application(soap, tag, &n,
@@ -45930,7 +46004,7 @@ soap_in_std__vectorTemplateOfPointerTons1__application(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__application(soap,
                                                                       -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -45940,7 +46014,7 @@ soap_in_std__vectorTemplateOfPointerTons1__application(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__application *> *SOAP_FMAC2
@@ -45954,11 +46028,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__application(
                                     "%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__application,
                 n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__application *>);
     if (size)
@@ -46029,11 +46103,11 @@ soap_in_std__vectorTemplateOfPointerTons1__studyInvestigation(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__studyInvestigation *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -46041,7 +46115,7 @@ soap_in_std__vectorTemplateOfPointerTons1__studyInvestigation(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__studyInvestigation,
               sizeof(ns1__studyInvestigation), 1))
         break;
-      if (!soap_in_PointerTons1__studyInvestigation(soap, tag, NULL,
+      if (!soap_in_PointerTons1__studyInvestigation(soap, tag, nullptr,
                                                     "ns1:studyInvestigation"))
         break;
     } else if (!soap_in_PointerTons1__studyInvestigation(
@@ -46050,7 +46124,7 @@ soap_in_std__vectorTemplateOfPointerTons1__studyInvestigation(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__studyInvestigation(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -46060,7 +46134,7 @@ soap_in_std__vectorTemplateOfPointerTons1__studyInvestigation(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__studyInvestigation *> *SOAP_FMAC2
@@ -46074,11 +46148,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__studyInvestigation(
                                     "studyInvestigation(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__studyInvestigation, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__studyInvestigation *>);
     if (size)
@@ -46148,11 +46222,11 @@ soap_in_std__vectorTemplateOfPointerTons1__shift(struct soap *soap,
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__shift *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -46160,13 +46234,13 @@ soap_in_std__vectorTemplateOfPointerTons1__shift(struct soap *soap,
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__shift,
               sizeof(ns1__shift), 1))
         break;
-      if (!soap_in_PointerTons1__shift(soap, tag, NULL, "ns1:shift"))
+      if (!soap_in_PointerTons1__shift(soap, tag, nullptr, "ns1:shift"))
         break;
     } else if (!soap_in_PointerTons1__shift(soap, tag, &n, "ns1:shift"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__shift(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -46176,7 +46250,7 @@ soap_in_std__vectorTemplateOfPointerTons1__shift(struct soap *soap,
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__shift *> *SOAP_FMAC2
@@ -46192,10 +46266,10 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__shift(struct soap *soap,
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__shift, n,
-      ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__shift,
+      n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__shift *>);
     if (size)
@@ -46263,11 +46337,11 @@ soap_in_std__vectorTemplateOfPointerTons1__sample(struct soap *soap,
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__sample *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -46275,13 +46349,13 @@ soap_in_std__vectorTemplateOfPointerTons1__sample(struct soap *soap,
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__sample,
               sizeof(ns1__sample), 1))
         break;
-      if (!soap_in_PointerTons1__sample(soap, tag, NULL, "ns1:sample"))
+      if (!soap_in_PointerTons1__sample(soap, tag, nullptr, "ns1:sample"))
         break;
     } else if (!soap_in_PointerTons1__sample(soap, tag, &n, "ns1:sample"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__sample(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -46291,7 +46365,7 @@ soap_in_std__vectorTemplateOfPointerTons1__sample(struct soap *soap,
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__sample *> *SOAP_FMAC2
@@ -46305,10 +46379,10 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__sample(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__sample, n,
-      ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__sample,
+      n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__sample *>);
     if (size)
@@ -46376,11 +46450,11 @@ soap_in_std__vectorTemplateOfPointerTons1__publication(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__publication *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -46388,7 +46462,7 @@ soap_in_std__vectorTemplateOfPointerTons1__publication(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__publication,
               sizeof(ns1__publication), 1))
         break;
-      if (!soap_in_PointerTons1__publication(soap, tag, NULL,
+      if (!soap_in_PointerTons1__publication(soap, tag, nullptr,
                                              "ns1:publication"))
         break;
     } else if (!soap_in_PointerTons1__publication(soap, tag, &n,
@@ -46397,7 +46471,7 @@ soap_in_std__vectorTemplateOfPointerTons1__publication(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__publication(soap,
                                                                       -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -46407,7 +46481,7 @@ soap_in_std__vectorTemplateOfPointerTons1__publication(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__publication *> *SOAP_FMAC2
@@ -46421,11 +46495,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__publication(
                                     "%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__publication,
                 n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__publication *>);
     if (size)
@@ -46498,11 +46572,11 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationParameter(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__investigationParameter *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -46511,7 +46585,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationParameter(
               sizeof(ns1__investigationParameter), 1))
         break;
       if (!soap_in_PointerTons1__investigationParameter(
-              soap, tag, NULL, "ns1:investigationParameter"))
+              soap, tag, nullptr, "ns1:investigationParameter"))
         break;
     } else if (!soap_in_PointerTons1__investigationParameter(
                    soap, tag, &n, "ns1:investigationParameter"))
@@ -46519,7 +46593,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationParameter(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__investigationParameter(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -46529,7 +46603,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationParameter(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__investigationParameter *> *SOAP_FMAC2
@@ -46543,11 +46617,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__investigationParameter(
                                     "investigationParameter(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__investigationParameter,
       n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__investigationParameter *>);
     if (size)
@@ -46618,11 +46692,11 @@ soap_in_std__vectorTemplateOfPointerTons1__keyword(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__keyword *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -46630,13 +46704,13 @@ soap_in_std__vectorTemplateOfPointerTons1__keyword(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__keyword,
               sizeof(ns1__keyword), 1))
         break;
-      if (!soap_in_PointerTons1__keyword(soap, tag, NULL, "ns1:keyword"))
+      if (!soap_in_PointerTons1__keyword(soap, tag, nullptr, "ns1:keyword"))
         break;
     } else if (!soap_in_PointerTons1__keyword(soap, tag, &n, "ns1:keyword"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__keyword(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -46646,7 +46720,7 @@ soap_in_std__vectorTemplateOfPointerTons1__keyword(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__keyword *> *SOAP_FMAC2
@@ -46660,10 +46734,10 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__keyword(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__keyword, n,
-      ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__keyword,
+      n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__keyword *>);
     if (size)
@@ -46732,11 +46806,11 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationUser(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__investigationUser *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -46744,7 +46818,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationUser(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__investigationUser,
               sizeof(ns1__investigationUser), 1))
         break;
-      if (!soap_in_PointerTons1__investigationUser(soap, tag, NULL,
+      if (!soap_in_PointerTons1__investigationUser(soap, tag, nullptr,
                                                    "ns1:investigationUser"))
         break;
     } else if (!soap_in_PointerTons1__investigationUser(
@@ -46753,7 +46827,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationUser(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__investigationUser(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -46763,7 +46837,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationUser(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__investigationUser *> *SOAP_FMAC2
@@ -46777,11 +46851,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__investigationUser(
                                     "investigationUser(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__investigationUser, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__investigationUser *>);
     if (size)
@@ -46854,11 +46928,11 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationInstrument(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__investigationInstrument *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -46867,7 +46941,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationInstrument(
               sizeof(ns1__investigationInstrument), 1))
         break;
       if (!soap_in_PointerTons1__investigationInstrument(
-              soap, tag, NULL, "ns1:investigationInstrument"))
+              soap, tag, nullptr, "ns1:investigationInstrument"))
         break;
     } else if (!soap_in_PointerTons1__investigationInstrument(
                    soap, tag, &n, "ns1:investigationInstrument"))
@@ -46875,7 +46949,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationInstrument(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__investigationInstrument(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -46885,7 +46959,7 @@ soap_in_std__vectorTemplateOfPointerTons1__investigationInstrument(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__investigationInstrument *> *SOAP_FMAC2
@@ -46899,11 +46973,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__investigationInstrument(
                                     "investigationInstrument(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__investigationInstrument,
       n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__investigationInstrument *>);
     if (size)
@@ -46974,11 +47048,11 @@ soap_in_std__vectorTemplateOfPointerTons1__dataset(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__dataset *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -46986,13 +47060,13 @@ soap_in_std__vectorTemplateOfPointerTons1__dataset(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__dataset,
               sizeof(ns1__dataset), 1))
         break;
-      if (!soap_in_PointerTons1__dataset(soap, tag, NULL, "ns1:dataset"))
+      if (!soap_in_PointerTons1__dataset(soap, tag, nullptr, "ns1:dataset"))
         break;
     } else if (!soap_in_PointerTons1__dataset(soap, tag, &n, "ns1:dataset"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__dataset(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -47002,7 +47076,7 @@ soap_in_std__vectorTemplateOfPointerTons1__dataset(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__dataset *> *SOAP_FMAC2
@@ -47016,10 +47090,10 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__dataset(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__dataset, n,
-      ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__dataset,
+      n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__dataset *>);
     if (size)
@@ -47088,11 +47162,11 @@ soap_in_std__vectorTemplateOfPointerTons1__datasetParameter(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__datasetParameter *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -47100,7 +47174,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datasetParameter(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__datasetParameter,
               sizeof(ns1__datasetParameter), 1))
         break;
-      if (!soap_in_PointerTons1__datasetParameter(soap, tag, NULL,
+      if (!soap_in_PointerTons1__datasetParameter(soap, tag, nullptr,
                                                   "ns1:datasetParameter"))
         break;
     } else if (!soap_in_PointerTons1__datasetParameter(soap, tag, &n,
@@ -47109,7 +47183,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datasetParameter(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__datasetParameter(soap,
                                                                            -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -47119,7 +47193,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datasetParameter(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__datasetParameter *> *SOAP_FMAC2
@@ -47133,11 +47207,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__datasetParameter(
                                     "datasetParameter(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__datasetParameter, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__datasetParameter *>);
     if (size)
@@ -47206,11 +47280,11 @@ soap_in_std__vectorTemplateOfPointerTons1__datafile(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__datafile *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -47218,13 +47292,13 @@ soap_in_std__vectorTemplateOfPointerTons1__datafile(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__datafile,
               sizeof(ns1__datafile), 1))
         break;
-      if (!soap_in_PointerTons1__datafile(soap, tag, NULL, "ns1:datafile"))
+      if (!soap_in_PointerTons1__datafile(soap, tag, nullptr, "ns1:datafile"))
         break;
     } else if (!soap_in_PointerTons1__datafile(soap, tag, &n, "ns1:datafile"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__datafile(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -47234,7 +47308,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datafile(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__datafile *> *SOAP_FMAC2
@@ -47247,11 +47321,12 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__datafile(
                                     "vectorTemplateOfPointerTons1__datafile(%d,"
                                     " %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__datafile,
-      n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__datafile, n,
+                ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__datafile *>);
     if (size)
@@ -47323,11 +47398,11 @@ soap_in_std__vectorTemplateOfPointerTons1__dataCollectionParameter(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__dataCollectionParameter *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -47336,7 +47411,7 @@ soap_in_std__vectorTemplateOfPointerTons1__dataCollectionParameter(
               sizeof(ns1__dataCollectionParameter), 1))
         break;
       if (!soap_in_PointerTons1__dataCollectionParameter(
-              soap, tag, NULL, "ns1:dataCollectionParameter"))
+              soap, tag, nullptr, "ns1:dataCollectionParameter"))
         break;
     } else if (!soap_in_PointerTons1__dataCollectionParameter(
                    soap, tag, &n, "ns1:dataCollectionParameter"))
@@ -47344,7 +47419,7 @@ soap_in_std__vectorTemplateOfPointerTons1__dataCollectionParameter(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__dataCollectionParameter(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -47354,7 +47429,7 @@ soap_in_std__vectorTemplateOfPointerTons1__dataCollectionParameter(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__dataCollectionParameter *> *SOAP_FMAC2
@@ -47368,11 +47443,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__dataCollectionParameter(
                                     "dataCollectionParameter(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__dataCollectionParameter,
       n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__dataCollectionParameter *>);
     if (size)
@@ -47443,11 +47518,11 @@ soap_in_std__vectorTemplateOfPointerTons1__job(struct soap *soap,
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__job *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -47455,12 +47530,12 @@ soap_in_std__vectorTemplateOfPointerTons1__job(struct soap *soap,
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__job,
               sizeof(ns1__job), 1))
         break;
-      if (!soap_in_PointerTons1__job(soap, tag, NULL, "ns1:job"))
+      if (!soap_in_PointerTons1__job(soap, tag, nullptr, "ns1:job"))
         break;
     } else if (!soap_in_PointerTons1__job(soap, tag, &n, "ns1:job"))
       break;
     if (!a && !(a = soap_new_std__vectorTemplateOfPointerTons1__job(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -47470,7 +47545,7 @@ soap_in_std__vectorTemplateOfPointerTons1__job(struct soap *soap,
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__job *> *SOAP_FMAC2
@@ -47485,10 +47560,10 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__job(struct soap *soap,
                               "vectorTemplateOfPointerTons1__job(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__job, n,
+      soap, nullptr, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__job, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__job *>);
     if (size)
@@ -47556,11 +47631,11 @@ soap_in_std__vectorTemplateOfPointerTons1__dataCollectionDataset(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__dataCollectionDataset *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -47569,7 +47644,7 @@ soap_in_std__vectorTemplateOfPointerTons1__dataCollectionDataset(
               sizeof(ns1__dataCollectionDataset), 1))
         break;
       if (!soap_in_PointerTons1__dataCollectionDataset(
-              soap, tag, NULL, "ns1:dataCollectionDataset"))
+              soap, tag, nullptr, "ns1:dataCollectionDataset"))
         break;
     } else if (!soap_in_PointerTons1__dataCollectionDataset(
                    soap, tag, &n, "ns1:dataCollectionDataset"))
@@ -47577,7 +47652,7 @@ soap_in_std__vectorTemplateOfPointerTons1__dataCollectionDataset(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__dataCollectionDataset(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -47587,7 +47662,7 @@ soap_in_std__vectorTemplateOfPointerTons1__dataCollectionDataset(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__dataCollectionDataset *> *SOAP_FMAC2
@@ -47601,11 +47676,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__dataCollectionDataset(
                                     "dataCollectionDataset(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__dataCollectionDataset,
       n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__dataCollectionDataset *>);
     if (size)
@@ -47677,11 +47752,11 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileParameter(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__datafileParameter *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -47689,7 +47764,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileParameter(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__datafileParameter,
               sizeof(ns1__datafileParameter), 1))
         break;
-      if (!soap_in_PointerTons1__datafileParameter(soap, tag, NULL,
+      if (!soap_in_PointerTons1__datafileParameter(soap, tag, nullptr,
                                                    "ns1:datafileParameter"))
         break;
     } else if (!soap_in_PointerTons1__datafileParameter(
@@ -47698,7 +47773,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileParameter(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__datafileParameter(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -47708,7 +47783,7 @@ soap_in_std__vectorTemplateOfPointerTons1__datafileParameter(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__datafileParameter *> *SOAP_FMAC2
@@ -47722,11 +47797,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__datafileParameter(
                                     "datafileParameter(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__datafileParameter, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__datafileParameter *>);
     if (size)
@@ -47796,11 +47871,11 @@ soap_in_std__vectorTemplateOfPointerTons1__relatedDatafile(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__relatedDatafile *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -47808,7 +47883,7 @@ soap_in_std__vectorTemplateOfPointerTons1__relatedDatafile(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__relatedDatafile,
               sizeof(ns1__relatedDatafile), 1))
         break;
-      if (!soap_in_PointerTons1__relatedDatafile(soap, tag, NULL,
+      if (!soap_in_PointerTons1__relatedDatafile(soap, tag, nullptr,
                                                  "ns1:relatedDatafile"))
         break;
     } else if (!soap_in_PointerTons1__relatedDatafile(soap, tag, &n,
@@ -47817,7 +47892,7 @@ soap_in_std__vectorTemplateOfPointerTons1__relatedDatafile(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__relatedDatafile(soap,
                                                                           -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -47827,7 +47902,7 @@ soap_in_std__vectorTemplateOfPointerTons1__relatedDatafile(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__relatedDatafile *> *SOAP_FMAC2
@@ -47841,11 +47916,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__relatedDatafile(
                                     "relatedDatafile(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__relatedDatafile, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__relatedDatafile *>);
     if (size)
@@ -47917,11 +47992,11 @@ soap_in_std__vectorTemplateOfPointerTons1__dataCollectionDatafile(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__dataCollectionDatafile *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -47930,7 +48005,7 @@ soap_in_std__vectorTemplateOfPointerTons1__dataCollectionDatafile(
               sizeof(ns1__dataCollectionDatafile), 1))
         break;
       if (!soap_in_PointerTons1__dataCollectionDatafile(
-              soap, tag, NULL, "ns1:dataCollectionDatafile"))
+              soap, tag, nullptr, "ns1:dataCollectionDatafile"))
         break;
     } else if (!soap_in_PointerTons1__dataCollectionDatafile(
                    soap, tag, &n, "ns1:dataCollectionDatafile"))
@@ -47938,7 +48013,7 @@ soap_in_std__vectorTemplateOfPointerTons1__dataCollectionDatafile(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__dataCollectionDatafile(
               soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -47948,7 +48023,7 @@ soap_in_std__vectorTemplateOfPointerTons1__dataCollectionDatafile(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__dataCollectionDatafile *> *SOAP_FMAC2
@@ -47962,11 +48037,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__dataCollectionDatafile(
                                     "dataCollectionDatafile(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__dataCollectionDatafile,
       n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__dataCollectionDatafile *>);
     if (size)
@@ -48037,11 +48112,11 @@ soap_in_std__vectorTemplateOfPointerToxsd__anyType(
   for (soap_flag = 0;; soap_flag = 1) {
     xsd__anyType *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -48049,13 +48124,13 @@ soap_in_std__vectorTemplateOfPointerToxsd__anyType(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerToxsd__anyType,
               sizeof(xsd__anyType), 1))
         break;
-      if (!soap_in_PointerToxsd__anyType(soap, tag, NULL, "xsd:anyType"))
+      if (!soap_in_PointerToxsd__anyType(soap, tag, nullptr, "xsd:anyType"))
         break;
     } else if (!soap_in_PointerToxsd__anyType(soap, tag, &n, "xsd:anyType"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerToxsd__anyType(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -48065,7 +48140,7 @@ soap_in_std__vectorTemplateOfPointerToxsd__anyType(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<xsd__anyType *> *SOAP_FMAC2
@@ -48079,10 +48154,10 @@ soap_instantiate_std__vectorTemplateOfPointerToxsd__anyType(
                                     "%s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerToxsd__anyType, n,
-      ICat4_fdelete);
+      soap, nullptr, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerToxsd__anyType,
+      n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<xsd__anyType *>);
     if (size)
@@ -48151,11 +48226,11 @@ soap_in_std__vectorTemplateOfPointerTons1__entityField(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__entityField *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -48163,7 +48238,7 @@ soap_in_std__vectorTemplateOfPointerTons1__entityField(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__entityField,
               sizeof(ns1__entityField), 1))
         break;
-      if (!soap_in_PointerTons1__entityField(soap, tag, NULL,
+      if (!soap_in_PointerTons1__entityField(soap, tag, nullptr,
                                              "ns1:entityField"))
         break;
     } else if (!soap_in_PointerTons1__entityField(soap, tag, &n,
@@ -48172,7 +48247,7 @@ soap_in_std__vectorTemplateOfPointerTons1__entityField(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__entityField(soap,
                                                                       -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -48182,7 +48257,7 @@ soap_in_std__vectorTemplateOfPointerTons1__entityField(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__entityField *> *SOAP_FMAC2
@@ -48196,11 +48271,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__entityField(
                                     "%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL,
+      soap_link(soap, nullptr,
                 SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__entityField,
                 n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__entityField *>);
     if (size)
@@ -48271,11 +48346,11 @@ soap_in_std__vectorTemplateOfPointerTons1__constraint(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__constraint *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -48283,14 +48358,15 @@ soap_in_std__vectorTemplateOfPointerTons1__constraint(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__constraint,
               sizeof(ns1__constraint), 1))
         break;
-      if (!soap_in_PointerTons1__constraint(soap, tag, NULL, "ns1:constraint"))
+      if (!soap_in_PointerTons1__constraint(soap, tag, nullptr,
+                                            "ns1:constraint"))
         break;
     } else if (!soap_in_PointerTons1__constraint(soap, tag, &n,
                                                  "ns1:constraint"))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__constraint(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -48300,7 +48376,7 @@ soap_in_std__vectorTemplateOfPointerTons1__constraint(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__constraint *> *SOAP_FMAC2
@@ -48313,11 +48389,12 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__constraint(
                                     "vectorTemplateOfPointerTons1__constraint(%"
                                     "d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
-  struct soap_clist *cp = soap_link(
-      soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__constraint,
-      n, ICat4_fdelete);
+  struct soap_clist *cp =
+      soap_link(soap, nullptr,
+                SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__constraint,
+                n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__constraint *>);
     if (size)
@@ -48389,7 +48466,7 @@ soap_in_std__vectorTemplateOf_ns1__login_credentials_entry(
   for (soap_flag = 0;; soap_flag = 1) {
     _ns1__login_credentials_entry n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
@@ -48401,14 +48478,14 @@ soap_in_std__vectorTemplateOf_ns1__login_credentials_entry(
               SOAP_TYPE_ICat4_std__vectorTemplateOf_ns1__login_credentials_entry,
               sizeof(_ns1__login_credentials_entry), 0))
         break;
-      if (!soap_in__ns1__login_credentials_entry(soap, tag, NULL, ""))
+      if (!soap_in__ns1__login_credentials_entry(soap, tag, nullptr, ""))
         break;
     } else if (!soap_in__ns1__login_credentials_entry(soap, tag, &n, ""))
       break;
     if (!a &&
         !(a = soap_new_std__vectorTemplateOf_ns1__login_credentials_entry(soap,
                                                                           -1)))
-      return NULL;
+      return nullptr;
     soap_update_pointers(soap, (char *)&n, (char *)&n + sizeof(n),
                          (char *)&(*a->insert(a->end(), n)), (char *)&n);
     if (!tag || *tag == '-')
@@ -48419,7 +48496,7 @@ soap_in_std__vectorTemplateOf_ns1__login_credentials_entry(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<_ns1__login_credentials_entry> *SOAP_FMAC2
@@ -48433,11 +48510,11 @@ soap_instantiate_std__vectorTemplateOf_ns1__login_credentials_entry(
                               "login_credentials_entry(%d, %s, %s)\n",
                       n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOf_ns1__login_credentials_entry, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<_ns1__login_credentials_entry>);
     if (size)
@@ -48509,7 +48586,7 @@ soap_in_std__vectorTemplateOfstd__string(struct soap *soap, const char *tag,
   for (soap_flag = 0;; soap_flag = 1) {
     std::string n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
@@ -48521,12 +48598,12 @@ soap_in_std__vectorTemplateOfstd__string(struct soap *soap, const char *tag,
               SOAP_TYPE_ICat4_std__vectorTemplateOfstd__string,
               sizeof(std::string), 0))
         break;
-      if (!soap_in_std__string(soap, tag, NULL, "xsd:string"))
+      if (!soap_in_std__string(soap, tag, nullptr, "xsd:string"))
         break;
     } else if (!soap_in_std__string(soap, tag, &n, "xsd:string"))
       break;
     if (!a && !(a = soap_new_std__vectorTemplateOfstd__string(soap, -1)))
-      return NULL;
+      return nullptr;
     soap_update_pointers(soap, (char *)&n, (char *)&n + sizeof(n),
                          (char *)&(*a->insert(a->end(), n)), (char *)&n);
     if (!tag || *tag == '-')
@@ -48537,7 +48614,7 @@ soap_in_std__vectorTemplateOfstd__string(struct soap *soap, const char *tag,
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<std::string> *SOAP_FMAC2
@@ -48553,10 +48630,10 @@ soap_instantiate_std__vectorTemplateOfstd__string(struct soap *soap, int n,
              "soap_instantiate_std__vectorTemplateOfstd__string(%d, %s, %s)\n",
              n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfstd__string, n,
-                ICat4_fdelete);
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_std__vectorTemplateOfstd__string,
+                n, ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<std::string>);
     if (size)
@@ -48619,7 +48696,7 @@ soap_in_std__vectorTemplateOfLONG64(struct soap *soap, const char *tag,
   for (soap_flag = 0;; soap_flag = 1) {
     LONG64 n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
@@ -48630,12 +48707,12 @@ soap_in_std__vectorTemplateOfLONG64(struct soap *soap, const char *tag,
               SOAP_TYPE_ICat4_LONG64,
               SOAP_TYPE_ICat4_std__vectorTemplateOfLONG64, sizeof(LONG64), 0))
         break;
-      if (!soap_in_LONG64(soap, tag, NULL, "xsd:long"))
+      if (!soap_in_LONG64(soap, tag, nullptr, "xsd:long"))
         break;
     } else if (!soap_in_LONG64(soap, tag, &n, "xsd:long"))
       break;
     if (!a && !(a = soap_new_std__vectorTemplateOfLONG64(soap, -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -48645,7 +48722,7 @@ soap_in_std__vectorTemplateOfLONG64(struct soap *soap, const char *tag,
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<LONG64> *SOAP_FMAC2
@@ -48660,10 +48737,10 @@ soap_instantiate_std__vectorTemplateOfLONG64(struct soap *soap, int n,
                    "soap_instantiate_std__vectorTemplateOfLONG64(%d, %s, %s)\n",
                    n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp =
-      soap_link(soap, NULL, SOAP_TYPE_ICat4_std__vectorTemplateOfLONG64, n,
+      soap_link(soap, nullptr, SOAP_TYPE_ICat4_std__vectorTemplateOfLONG64, n,
                 ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<LONG64>);
     if (size)
@@ -48730,11 +48807,11 @@ soap_in_std__vectorTemplateOfPointerTons1__entityBaseBean(
   for (soap_flag = 0;; soap_flag = 1) {
     ns1__entityBaseBean *n;
     if (tag && *tag != '-') {
-      if (soap_element_begin_in(soap, tag, 1, NULL))
+      if (soap_element_begin_in(soap, tag, 1, nullptr))
         break;
       soap_revert(soap);
     }
-    n = NULL;
+    n = nullptr;
     if (tag && *tag != '-' && (*soap->id || *soap->href)) {
       if (!soap_container_id_forward(
               soap, *soap->id ? soap->id : soap->href, a, (size_t)a->size(),
@@ -48742,7 +48819,7 @@ soap_in_std__vectorTemplateOfPointerTons1__entityBaseBean(
               SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__entityBaseBean,
               sizeof(ns1__entityBaseBean), 1))
         break;
-      if (!soap_in_PointerTons1__entityBaseBean(soap, tag, NULL,
+      if (!soap_in_PointerTons1__entityBaseBean(soap, tag, nullptr,
                                                 "ns1:entityBaseBean"))
         break;
     } else if (!soap_in_PointerTons1__entityBaseBean(soap, tag, &n,
@@ -48751,7 +48828,7 @@ soap_in_std__vectorTemplateOfPointerTons1__entityBaseBean(
     if (!a &&
         !(a = soap_new_std__vectorTemplateOfPointerTons1__entityBaseBean(soap,
                                                                          -1)))
-      return NULL;
+      return nullptr;
     a->push_back(n);
     if (!tag || *tag == '-')
       return a;
@@ -48761,7 +48838,7 @@ soap_in_std__vectorTemplateOfPointerTons1__entityBaseBean(
     soap->error = SOAP_OK;
     return a;
   }
-  return NULL;
+  return nullptr;
 }
 
 SOAP_FMAC1 std::vector<ns1__entityBaseBean *> *SOAP_FMAC2
@@ -48775,11 +48852,11 @@ soap_instantiate_std__vectorTemplateOfPointerTons1__entityBaseBean(
                                     "entityBaseBean(%d, %s, %s)\n",
                             n, type ? type : "", arrayType ? arrayType : ""));
   struct soap_clist *cp = soap_link(
-      soap, NULL,
+      soap, nullptr,
       SOAP_TYPE_ICat4_std__vectorTemplateOfPointerTons1__entityBaseBean, n,
       ICat4_fdelete);
   if (!cp)
-    return NULL;
+    return nullptr;
   if (n < 0) {
     cp->ptr = (void *)SOAP_NEW(std::vector<ns1__entityBaseBean *>);
     if (size)
diff --git a/Framework/ICat/src/ICat4/GSoapGenerated/ICat4ICATPortBindingProxy.cpp b/Framework/ICat/src/ICat4/GSoapGenerated/ICat4ICATPortBindingProxy.cpp
index a305d6fe6dc..df3fd38a650 100644
--- a/Framework/ICat/src/ICat4/GSoapGenerated/ICat4ICATPortBindingProxy.cpp
+++ b/Framework/ICat/src/ICat4/GSoapGenerated/ICat4ICATPortBindingProxy.cpp
@@ -41,18 +41,18 @@ void ICATPortBindingProxy::ICATPortBindingProxy_init(soap_mode imode,
                                                      soap_mode omode) {
   soap_imode(this, imode);
   soap_omode(this, omode);
-  soap_endpoint = NULL;
+  soap_endpoint = nullptr;
   static const struct Namespace namespaces[] = {
       {"SOAP-ENV", "http://schemas.xmlsoap.org/soap/envelope/",
-       "http://www.w3.org/*/soap-envelope", NULL},
+       "http://www.w3.org/*/soap-envelope", nullptr},
       {"SOAP-ENC", "http://schemas.xmlsoap.org/soap/encoding/",
-       "http://www.w3.org/*/soap-encoding", NULL},
+       "http://www.w3.org/*/soap-encoding", nullptr},
       {"xsi", "http://www.w3.org/2001/XMLSchema-instance",
-       "http://www.w3.org/*/XMLSchema-instance", NULL},
+       "http://www.w3.org/*/XMLSchema-instance", nullptr},
       {"xsd", "http://www.w3.org/2001/XMLSchema",
-       "http://www.w3.org/*/XMLSchema", NULL},
-      {"ns1", "http://icatproject.org", NULL, NULL},
-      {NULL, NULL, NULL, NULL}};
+       "http://www.w3.org/*/XMLSchema", nullptr},
+      {"ns1", "http://icatproject.org", nullptr, nullptr},
+      {nullptr, nullptr, nullptr, nullptr}};
   soap_set_namespaces(this, namespaces);
 }
 
@@ -68,7 +68,7 @@ void ICATPortBindingProxy::reset() {
   ICATPortBindingProxy_init(SOAP_IO_DEFAULT, SOAP_IO_DEFAULT);
 }
 
-void ICATPortBindingProxy::soap_noheader() { this->header = NULL; }
+void ICATPortBindingProxy::soap_noheader() { this->header = nullptr; }
 
 const SOAP_ENV__Header *ICATPortBindingProxy::soap_header() {
   return this->header;
@@ -115,11 +115,11 @@ int ICATPortBindingProxy::login(const char *endpoint, const char *soap_action,
   struct __ns1__login soap_tmp___ns1__login;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/loginRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__login.ns1__login_ = ns1__login_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -130,16 +130,17 @@ int ICATPortBindingProxy::login(const char *endpoint, const char *soap_action,
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__login(soap, &soap_tmp___ns1__login, "-ns1:login",
-                              NULL) ||
+                              nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__login(soap, &soap_tmp___ns1__login, "-ns1:login", NULL) ||
+      soap_put___ns1__login(soap, &soap_tmp___ns1__login, "-ns1:login",
+                            nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -166,11 +167,11 @@ int ICATPortBindingProxy::getUserName(
   struct __ns1__getUserName soap_tmp___ns1__getUserName;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/getUserNameRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getUserName.ns1__getUserName_ = ns1__getUserName_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -181,17 +182,17 @@ int ICATPortBindingProxy::getUserName(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__getUserName(soap, &soap_tmp___ns1__getUserName,
-                                    "-ns1:getUserName", NULL) ||
+                                    "-ns1:getUserName", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getUserName(soap, &soap_tmp___ns1__getUserName,
-                                  "-ns1:getUserName", NULL) ||
+                                  "-ns1:getUserName", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -218,11 +219,11 @@ int ICATPortBindingProxy::get(const char *endpoint, const char *soap_action,
   struct __ns1__get soap_tmp___ns1__get;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/getRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__get.ns1__get_ = ns1__get_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -232,16 +233,16 @@ int ICATPortBindingProxy::get(const char *endpoint, const char *soap_action,
   if (soap->mode & SOAP_IO_LENGTH) {
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
-        soap_put___ns1__get(soap, &soap_tmp___ns1__get, "-ns1:get", NULL) ||
+        soap_put___ns1__get(soap, &soap_tmp___ns1__get, "-ns1:get", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__get(soap, &soap_tmp___ns1__get, "-ns1:get", NULL) ||
+      soap_put___ns1__get(soap, &soap_tmp___ns1__get, "-ns1:get", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -268,11 +269,11 @@ int ICATPortBindingProxy::getProperties(
   struct __ns1__getProperties soap_tmp___ns1__getProperties;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/getPropertiesRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getProperties.ns1__getProperties_ = ns1__getProperties_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -283,17 +284,17 @@ int ICATPortBindingProxy::getProperties(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__getProperties(soap, &soap_tmp___ns1__getProperties,
-                                      "-ns1:getProperties", NULL) ||
+                                      "-ns1:getProperties", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getProperties(soap, &soap_tmp___ns1__getProperties,
-                                    "-ns1:getProperties", NULL) ||
+                                    "-ns1:getProperties", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -321,11 +322,11 @@ int ICATPortBindingProxy::delete_(const char *endpoint, const char *soap_action,
   struct __ns1__deleteResponse *soap_tmp___ns1__deleteResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/deleteRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__delete.ns1__delete_ = ns1__delete_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -336,17 +337,17 @@ int ICATPortBindingProxy::delete_(const char *endpoint, const char *soap_action,
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__delete(soap, &soap_tmp___ns1__delete, "-ns1:delete",
-                               NULL) ||
+                               nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__delete(soap, &soap_tmp___ns1__delete, "-ns1:delete",
-                             NULL) ||
+                             nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -357,7 +358,7 @@ int ICATPortBindingProxy::delete_(const char *endpoint, const char *soap_action,
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__deleteResponse = soap_get___ns1__deleteResponse(
-      soap, NULL, "-ns1:deleteResponse", "ns1:deleteResponse");
+      soap, nullptr, "-ns1:deleteResponse", "ns1:deleteResponse");
   if (!soap_tmp___ns1__deleteResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -377,11 +378,11 @@ int ICATPortBindingProxy::search(const char *endpoint, const char *soap_action,
   struct __ns1__search soap_tmp___ns1__search;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/searchRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__search.ns1__search_ = ns1__search_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -392,17 +393,17 @@ int ICATPortBindingProxy::search(const char *endpoint, const char *soap_action,
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__search(soap, &soap_tmp___ns1__search, "-ns1:search",
-                               NULL) ||
+                               nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__search(soap, &soap_tmp___ns1__search, "-ns1:search",
-                             NULL) ||
+                             nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -429,11 +430,11 @@ int ICATPortBindingProxy::create(const char *endpoint, const char *soap_action,
   struct __ns1__create soap_tmp___ns1__create;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/createRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__create.ns1__create_ = ns1__create_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -444,17 +445,17 @@ int ICATPortBindingProxy::create(const char *endpoint, const char *soap_action,
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__create(soap, &soap_tmp___ns1__create, "-ns1:create",
-                               NULL) ||
+                               nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__create(soap, &soap_tmp___ns1__create, "-ns1:create",
-                             NULL) ||
+                             nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -482,11 +483,11 @@ int ICATPortBindingProxy::update(const char *endpoint, const char *soap_action,
   struct __ns1__updateResponse *soap_tmp___ns1__updateResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/updateRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__update.ns1__update_ = ns1__update_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -497,17 +498,17 @@ int ICATPortBindingProxy::update(const char *endpoint, const char *soap_action,
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__update(soap, &soap_tmp___ns1__update, "-ns1:update",
-                               NULL) ||
+                               nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__update(soap, &soap_tmp___ns1__update, "-ns1:update",
-                             NULL) ||
+                             nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -518,7 +519,7 @@ int ICATPortBindingProxy::update(const char *endpoint, const char *soap_action,
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__updateResponse = soap_get___ns1__updateResponse(
-      soap, NULL, "-ns1:updateResponse", "ns1:updateResponse");
+      soap, nullptr, "-ns1:updateResponse", "ns1:updateResponse");
   if (!soap_tmp___ns1__updateResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -539,11 +540,11 @@ int ICATPortBindingProxy::getApiVersion(
   struct __ns1__getApiVersion soap_tmp___ns1__getApiVersion;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/getApiVersionRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getApiVersion.ns1__getApiVersion_ = ns1__getApiVersion_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -554,17 +555,17 @@ int ICATPortBindingProxy::getApiVersion(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__getApiVersion(soap, &soap_tmp___ns1__getApiVersion,
-                                      "-ns1:getApiVersion", NULL) ||
+                                      "-ns1:getApiVersion", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getApiVersion(soap, &soap_tmp___ns1__getApiVersion,
-                                    "-ns1:getApiVersion", NULL) ||
+                                    "-ns1:getApiVersion", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -592,11 +593,11 @@ int ICATPortBindingProxy::getEntityNames(
   struct __ns1__getEntityNames soap_tmp___ns1__getEntityNames;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/getEntityNamesRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getEntityNames.ns1__getEntityNames_ = ns1__getEntityNames_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -607,17 +608,17 @@ int ICATPortBindingProxy::getEntityNames(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__getEntityNames(soap, &soap_tmp___ns1__getEntityNames,
-                                       "-ns1:getEntityNames", NULL) ||
+                                       "-ns1:getEntityNames", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getEntityNames(soap, &soap_tmp___ns1__getEntityNames,
-                                     "-ns1:getEntityNames", NULL) ||
+                                     "-ns1:getEntityNames", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -645,11 +646,11 @@ int ICATPortBindingProxy::refresh(const char *endpoint, const char *soap_action,
   struct __ns1__refreshResponse *soap_tmp___ns1__refreshResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/refreshRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__refresh.ns1__refresh_ = ns1__refresh_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -660,17 +661,17 @@ int ICATPortBindingProxy::refresh(const char *endpoint, const char *soap_action,
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__refresh(soap, &soap_tmp___ns1__refresh, "-ns1:refresh",
-                                NULL) ||
+                                nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__refresh(soap, &soap_tmp___ns1__refresh, "-ns1:refresh",
-                              NULL) ||
+                              nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -681,7 +682,7 @@ int ICATPortBindingProxy::refresh(const char *endpoint, const char *soap_action,
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__refreshResponse = soap_get___ns1__refreshResponse(
-      soap, NULL, "-ns1:refreshResponse", "ns1:refreshResponse");
+      soap, nullptr, "-ns1:refreshResponse", "ns1:refreshResponse");
   if (!soap_tmp___ns1__refreshResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -702,11 +703,11 @@ int ICATPortBindingProxy::dummy(const char *endpoint, const char *soap_action,
   struct __ns1__dummyResponse *soap_tmp___ns1__dummyResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/dummyRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__dummy.ns1__dummy_ = ns1__dummy_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -717,16 +718,17 @@ int ICATPortBindingProxy::dummy(const char *endpoint, const char *soap_action,
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__dummy(soap, &soap_tmp___ns1__dummy, "-ns1:dummy",
-                              NULL) ||
+                              nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__dummy(soap, &soap_tmp___ns1__dummy, "-ns1:dummy", NULL) ||
+      soap_put___ns1__dummy(soap, &soap_tmp___ns1__dummy, "-ns1:dummy",
+                            nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -737,7 +739,7 @@ int ICATPortBindingProxy::dummy(const char *endpoint, const char *soap_action,
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__dummyResponse = soap_get___ns1__dummyResponse(
-      soap, NULL, "-ns1:dummyResponse", "ns1:dummyResponse");
+      soap, nullptr, "-ns1:dummyResponse", "ns1:dummyResponse");
   if (!soap_tmp___ns1__dummyResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -756,11 +758,11 @@ int ICATPortBindingProxy::logout(const char *endpoint, const char *soap_action,
   struct __ns1__logoutResponse *soap_tmp___ns1__logoutResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/logoutRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__logout.ns1__logout_ = ns1__logout_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -771,17 +773,17 @@ int ICATPortBindingProxy::logout(const char *endpoint, const char *soap_action,
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__logout(soap, &soap_tmp___ns1__logout, "-ns1:logout",
-                               NULL) ||
+                               nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__logout(soap, &soap_tmp___ns1__logout, "-ns1:logout",
-                             NULL) ||
+                             nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -792,7 +794,7 @@ int ICATPortBindingProxy::logout(const char *endpoint, const char *soap_action,
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__logoutResponse = soap_get___ns1__logoutResponse(
-      soap, NULL, "-ns1:logoutResponse", "ns1:logoutResponse");
+      soap, nullptr, "-ns1:logoutResponse", "ns1:logoutResponse");
   if (!soap_tmp___ns1__logoutResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -813,11 +815,11 @@ int ICATPortBindingProxy::getRemainingMinutes(
   struct __ns1__getRemainingMinutes soap_tmp___ns1__getRemainingMinutes;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/getRemainingMinutesRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getRemainingMinutes.ns1__getRemainingMinutes_ =
       ns1__getRemainingMinutes_;
   soap_begin(soap);
@@ -831,18 +833,18 @@ int ICATPortBindingProxy::getRemainingMinutes(
         soap_body_begin_out(soap) ||
         soap_put___ns1__getRemainingMinutes(
             soap, &soap_tmp___ns1__getRemainingMinutes,
-            "-ns1:getRemainingMinutes", NULL) ||
+            "-ns1:getRemainingMinutes", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__getRemainingMinutes(soap,
-                                          &soap_tmp___ns1__getRemainingMinutes,
-                                          "-ns1:getRemainingMinutes", NULL) ||
+      soap_put___ns1__getRemainingMinutes(
+          soap, &soap_tmp___ns1__getRemainingMinutes,
+          "-ns1:getRemainingMinutes", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -871,11 +873,11 @@ int ICATPortBindingProxy::searchText(
   struct __ns1__searchText soap_tmp___ns1__searchText;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/searchTextRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__searchText.ns1__searchText_ = ns1__searchText_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -886,17 +888,17 @@ int ICATPortBindingProxy::searchText(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__searchText(soap, &soap_tmp___ns1__searchText,
-                                   "-ns1:searchText", NULL) ||
+                                   "-ns1:searchText", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__searchText(soap, &soap_tmp___ns1__searchText,
-                                 "-ns1:searchText", NULL) ||
+                                 "-ns1:searchText", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -924,11 +926,11 @@ int ICATPortBindingProxy::isAccessAllowed(
   struct __ns1__isAccessAllowed soap_tmp___ns1__isAccessAllowed;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/isAccessAllowedRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__isAccessAllowed.ns1__isAccessAllowed_ = ns1__isAccessAllowed_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -939,17 +941,17 @@ int ICATPortBindingProxy::isAccessAllowed(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__isAccessAllowed(soap, &soap_tmp___ns1__isAccessAllowed,
-                                        "-ns1:isAccessAllowed", NULL) ||
+                                        "-ns1:isAccessAllowed", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__isAccessAllowed(soap, &soap_tmp___ns1__isAccessAllowed,
-                                      "-ns1:isAccessAllowed", NULL) ||
+                                      "-ns1:isAccessAllowed", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -978,11 +980,11 @@ int ICATPortBindingProxy::lucenePopulate(
   struct __ns1__lucenePopulateResponse *soap_tmp___ns1__lucenePopulateResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/lucenePopulateRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__lucenePopulate.ns1__lucenePopulate_ = ns1__lucenePopulate_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -993,17 +995,17 @@ int ICATPortBindingProxy::lucenePopulate(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__lucenePopulate(soap, &soap_tmp___ns1__lucenePopulate,
-                                       "-ns1:lucenePopulate", NULL) ||
+                                       "-ns1:lucenePopulate", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__lucenePopulate(soap, &soap_tmp___ns1__lucenePopulate,
-                                     "-ns1:lucenePopulate", NULL) ||
+                                     "-ns1:lucenePopulate", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1014,7 +1016,7 @@ int ICATPortBindingProxy::lucenePopulate(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__lucenePopulateResponse =
-      soap_get___ns1__lucenePopulateResponse(soap, NULL,
+      soap_get___ns1__lucenePopulateResponse(soap, nullptr,
                                              "-ns1:lucenePopulateResponse",
                                              "ns1:lucenePopulateResponse");
   if (!soap_tmp___ns1__lucenePopulateResponse || soap->error)
@@ -1038,11 +1040,11 @@ int ICATPortBindingProxy::luceneClear(
   struct __ns1__luceneClearResponse *soap_tmp___ns1__luceneClearResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/luceneClearRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__luceneClear.ns1__luceneClear_ = ns1__luceneClear_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -1053,17 +1055,17 @@ int ICATPortBindingProxy::luceneClear(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__luceneClear(soap, &soap_tmp___ns1__luceneClear,
-                                    "-ns1:luceneClear", NULL) ||
+                                    "-ns1:luceneClear", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__luceneClear(soap, &soap_tmp___ns1__luceneClear,
-                                  "-ns1:luceneClear", NULL) ||
+                                  "-ns1:luceneClear", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1074,7 +1076,7 @@ int ICATPortBindingProxy::luceneClear(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__luceneClearResponse = soap_get___ns1__luceneClearResponse(
-      soap, NULL, "-ns1:luceneClearResponse", "ns1:luceneClearResponse");
+      soap, nullptr, "-ns1:luceneClearResponse", "ns1:luceneClearResponse");
   if (!soap_tmp___ns1__luceneClearResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -1096,11 +1098,11 @@ int ICATPortBindingProxy::luceneCommit(
   struct __ns1__luceneCommitResponse *soap_tmp___ns1__luceneCommitResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/luceneCommitRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__luceneCommit.ns1__luceneCommit_ = ns1__luceneCommit_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -1111,17 +1113,17 @@ int ICATPortBindingProxy::luceneCommit(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__luceneCommit(soap, &soap_tmp___ns1__luceneCommit,
-                                     "-ns1:luceneCommit", NULL) ||
+                                     "-ns1:luceneCommit", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__luceneCommit(soap, &soap_tmp___ns1__luceneCommit,
-                                   "-ns1:luceneCommit", NULL) ||
+                                   "-ns1:luceneCommit", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1132,7 +1134,7 @@ int ICATPortBindingProxy::luceneCommit(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__luceneCommitResponse = soap_get___ns1__luceneCommitResponse(
-      soap, NULL, "-ns1:luceneCommitResponse", "ns1:luceneCommitResponse");
+      soap, nullptr, "-ns1:luceneCommitResponse", "ns1:luceneCommitResponse");
   if (!soap_tmp___ns1__luceneCommitResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -1153,11 +1155,11 @@ int ICATPortBindingProxy::luceneSearch(
   struct __ns1__luceneSearch soap_tmp___ns1__luceneSearch;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/luceneSearchRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__luceneSearch.ns1__luceneSearch_ = ns1__luceneSearch_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -1168,17 +1170,17 @@ int ICATPortBindingProxy::luceneSearch(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__luceneSearch(soap, &soap_tmp___ns1__luceneSearch,
-                                     "-ns1:luceneSearch", NULL) ||
+                                     "-ns1:luceneSearch", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__luceneSearch(soap, &soap_tmp___ns1__luceneSearch,
-                                   "-ns1:luceneSearch", NULL) ||
+                                   "-ns1:luceneSearch", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1206,11 +1208,11 @@ int ICATPortBindingProxy::luceneGetPopulating(
   struct __ns1__luceneGetPopulating soap_tmp___ns1__luceneGetPopulating;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/luceneGetPopulatingRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__luceneGetPopulating.ns1__luceneGetPopulating_ =
       ns1__luceneGetPopulating_;
   soap_begin(soap);
@@ -1224,18 +1226,18 @@ int ICATPortBindingProxy::luceneGetPopulating(
         soap_body_begin_out(soap) ||
         soap_put___ns1__luceneGetPopulating(
             soap, &soap_tmp___ns1__luceneGetPopulating,
-            "-ns1:luceneGetPopulating", NULL) ||
+            "-ns1:luceneGetPopulating", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
-      soap_put___ns1__luceneGetPopulating(soap,
-                                          &soap_tmp___ns1__luceneGetPopulating,
-                                          "-ns1:luceneGetPopulating", NULL) ||
+      soap_put___ns1__luceneGetPopulating(
+          soap, &soap_tmp___ns1__luceneGetPopulating,
+          "-ns1:luceneGetPopulating", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1264,11 +1266,11 @@ int ICATPortBindingProxy::createMany(
   struct __ns1__createMany soap_tmp___ns1__createMany;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/createManyRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__createMany.ns1__createMany_ = ns1__createMany_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -1279,17 +1281,17 @@ int ICATPortBindingProxy::createMany(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__createMany(soap, &soap_tmp___ns1__createMany,
-                                   "-ns1:createMany", NULL) ||
+                                   "-ns1:createMany", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__createMany(soap, &soap_tmp___ns1__createMany,
-                                 "-ns1:createMany", NULL) ||
+                                 "-ns1:createMany", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1318,11 +1320,11 @@ int ICATPortBindingProxy::deleteMany(
   struct __ns1__deleteManyResponse *soap_tmp___ns1__deleteManyResponse;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/deleteManyRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__deleteMany.ns1__deleteMany_ = ns1__deleteMany_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -1333,17 +1335,17 @@ int ICATPortBindingProxy::deleteMany(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__deleteMany(soap, &soap_tmp___ns1__deleteMany,
-                                   "-ns1:deleteMany", NULL) ||
+                                   "-ns1:deleteMany", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__deleteMany(soap, &soap_tmp___ns1__deleteMany,
-                                 "-ns1:deleteMany", NULL) ||
+                                 "-ns1:deleteMany", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
@@ -1354,7 +1356,7 @@ int ICATPortBindingProxy::deleteMany(
       soap_recv_header(soap) || soap_body_begin_in(soap))
     return soap_closesock(soap);
   soap_tmp___ns1__deleteManyResponse = soap_get___ns1__deleteManyResponse(
-      soap, NULL, "-ns1:deleteManyResponse", "ns1:deleteManyResponse");
+      soap, nullptr, "-ns1:deleteManyResponse", "ns1:deleteManyResponse");
   if (!soap_tmp___ns1__deleteManyResponse || soap->error)
     return soap_recv_fault(soap, 0);
   if (soap_body_end_in(soap) || soap_envelope_end_in(soap) ||
@@ -1375,11 +1377,11 @@ int ICATPortBindingProxy::getEntityInfo(
   struct __ns1__getEntityInfo soap_tmp___ns1__getEntityInfo;
   if (endpoint)
     soap_endpoint = endpoint;
-  if (soap_endpoint == NULL)
+  if (soap_endpoint == nullptr)
     soap_endpoint = "https://icatisis.esc.rl.ac.uk:443/ICATService/ICAT";
-  if (soap_action == NULL)
+  if (soap_action == nullptr)
     soap_action = "http://icatproject.org/ICAT/getEntityInfoRequest";
-  soap->encodingStyle = NULL;
+  soap->encodingStyle = nullptr;
   soap_tmp___ns1__getEntityInfo.ns1__getEntityInfo_ = ns1__getEntityInfo_;
   soap_begin(soap);
   soap_serializeheader(soap);
@@ -1390,17 +1392,17 @@ int ICATPortBindingProxy::getEntityInfo(
     if (soap_envelope_begin_out(soap) || soap_putheader(soap) ||
         soap_body_begin_out(soap) ||
         soap_put___ns1__getEntityInfo(soap, &soap_tmp___ns1__getEntityInfo,
-                                      "-ns1:getEntityInfo", NULL) ||
+                                      "-ns1:getEntityInfo", nullptr) ||
         soap_body_end_out(soap) || soap_envelope_end_out(soap))
       return soap->error;
   }
   if (soap_end_count(soap))
     return soap->error;
-  if (soap_connect(soap, soap_url(soap, soap_endpoint, NULL), soap_action) ||
+  if (soap_connect(soap, soap_url(soap, soap_endpoint, nullptr), soap_action) ||
       soap_envelope_begin_out(soap) || soap_putheader(soap) ||
       soap_body_begin_out(soap) ||
       soap_put___ns1__getEntityInfo(soap, &soap_tmp___ns1__getEntityInfo,
-                                    "-ns1:getEntityInfo", NULL) ||
+                                    "-ns1:getEntityInfo", nullptr) ||
       soap_body_end_out(soap) || soap_envelope_end_out(soap) ||
       soap_end_send(soap))
     return soap_closesock(soap);
diff --git a/Framework/MDAlgorithms/test/LoadDNSSCDTest.h b/Framework/MDAlgorithms/test/LoadDNSSCDTest.h
index 1e2d0b2c31f..bc2d214ffa1 100644
--- a/Framework/MDAlgorithms/test/LoadDNSSCDTest.h
+++ b/Framework/MDAlgorithms/test/LoadDNSSCDTest.h
@@ -204,7 +204,7 @@ public:
             outWSName));
     TS_ASSERT(iws);
 
-    std::vector<API::IMDNode *> boxes(0, NULL);
+    std::vector<API::IMDNode *> boxes(0, nullptr);
     iws->getBoxes(boxes, 10000, false);
     TSM_ASSERT_EQUALS("Number of boxes", boxes.size(), 1);
     API::IMDNode *box = boxes[0];
@@ -332,7 +332,7 @@ public:
             normWSName));
     TS_ASSERT(nws);
 
-    std::vector<API::IMDNode *> boxes(0, NULL);
+    std::vector<API::IMDNode *> boxes(0, nullptr);
     nws->getBoxes(boxes, 10000, false);
     TSM_ASSERT_EQUALS("Number of boxes", boxes.size(), 1);
     API::IMDNode *box = boxes[0];
@@ -418,7 +418,7 @@ public:
             normWSName));
     TS_ASSERT(nws);
 
-    std::vector<API::IMDNode *> boxes(0, NULL);
+    std::vector<API::IMDNode *> boxes(0, nullptr);
     nws->getBoxes(boxes, 10000, false);
     TSM_ASSERT_EQUALS("Number of boxes", boxes.size(), 1);
     API::IMDNode *box = boxes[0];
@@ -601,7 +601,7 @@ public:
             outWSName));
     TS_ASSERT(iws);
 
-    std::vector<API::IMDNode *> boxes(0, NULL);
+    std::vector<API::IMDNode *> boxes(0, nullptr);
     iws->getBoxes(boxes, 10000, false);
     TSM_ASSERT_EQUALS("Number of boxes", boxes.size(), 1);
     API::IMDNode *box = boxes[0];
diff --git a/MantidPlot/src/ApplicationWindow.cpp b/MantidPlot/src/ApplicationWindow.cpp
index 8ad7f5a89f3..c79bbab315d 100644
--- a/MantidPlot/src/ApplicationWindow.cpp
+++ b/MantidPlot/src/ApplicationWindow.cpp
@@ -339,7 +339,7 @@ void ApplicationWindow::init(bool factorySettings, const QStringList &args) {
   setAttribute(Qt::WA_DeleteOnClose);
 
 #ifdef SHARED_MENUBAR
-  m_sharedMenuBar = new QMenuBar(NULL);
+  m_sharedMenuBar = new QMenuBar(nullptr);
   m_sharedMenuBar->setNativeMenuBar(true);
 #endif
   setWindowTitle(tr("MantidPlot - untitled")); // Mantid
@@ -893,7 +893,7 @@ void ApplicationWindow::initGlobalConstants() {
 
 QMenuBar *ApplicationWindow::myMenuBar() {
 #ifdef SHARED_MENUBAR
-  return m_sharedMenuBar == NULL ? menuBar() : m_sharedMenuBar;
+  return m_sharedMenuBar == nullptr ? menuBar() : m_sharedMenuBar;
 #else
   return menuBar();
 #endif
diff --git a/MantidPlot/src/Process.cpp b/MantidPlot/src/Process.cpp
index 7488afe00e9..9013ded8a30 100644
--- a/MantidPlot/src/Process.cpp
+++ b/MantidPlot/src/Process.cpp
@@ -133,7 +133,7 @@ bool isAnotherInstanceRunning() {
   void *memory{nullptr};
   while (attempts-- > 0) {
     size_t size = 0;
-    if (sysctl((int *)sysctlQuery, 3, NULL, &size, NULL, 0) == -1) {
+    if (sysctl((int *)sysctlQuery, 3, nullptr, &size, nullptr, 0) == -1) {
       throw std::runtime_error("Unable to retrieve process list");
     }
     const size_t size2 =
@@ -150,7 +150,7 @@ bool isAnotherInstanceRunning() {
     if (memory == nullptr)
       throw std::runtime_error(
           "Unable to allocate memory to retrieve process list");
-    if (sysctl((int *)sysctlQuery, 3, memory, &size, NULL, 0) == -1) {
+    if (sysctl((int *)sysctlQuery, 3, memory, &size, nullptr, 0) == -1) {
       free(memory);
       throw std::runtime_error("Unable to retrieve process list");
     } else {
diff --git a/qt/widgets/common/src/DropEventHelper.cpp b/qt/widgets/common/src/DropEventHelper.cpp
index 5316ee5228f..eaeed059f2b 100644
--- a/qt/widgets/common/src/DropEventHelper.cpp
+++ b/qt/widgets/common/src/DropEventHelper.cpp
@@ -34,7 +34,7 @@ QUrl fixupURL(const QUrl &url) {
         kCFAllocatorDefault, relCFStringRef, kCFURLPOSIXPathStyle,
         false // isDirectory
         );
-    CFErrorRef error = 0;
+    CFErrorRef error = nullptr;
     CFURLRef absCFURL =
         CFURLCreateFilePathURL(kCFAllocatorDefault, relCFURL, &error);
     if (!error) {
diff --git a/qt/widgets/common/src/InterfaceManager.cpp b/qt/widgets/common/src/InterfaceManager.cpp
index 97b7c6133b4..a6f9849e7f8 100644
--- a/qt/widgets/common/src/InterfaceManager.cpp
+++ b/qt/widgets/common/src/InterfaceManager.cpp
@@ -83,7 +83,7 @@ AlgorithmDialog *InterfaceManager::createDialog(
   // Work around to ensure that floating windows remain on top of the main
   // application window, but below other applications on Mac
   // Note: Qt::Tool cannot have both a max and min button on OSX
-  flags = 0;
+  flags = nullptr;
   flags |= Qt::Tool;
   flags |= Qt::CustomizeWindowHint;
   flags |= Qt::WindowMinimizeButtonHint;
diff --git a/qt/widgets/instrumentview/src/InstrumentWidgetPickTab.cpp b/qt/widgets/instrumentview/src/InstrumentWidgetPickTab.cpp
index 5b38aa26b77..0f7f292b21a 100644
--- a/qt/widgets/instrumentview/src/InstrumentWidgetPickTab.cpp
+++ b/qt/widgets/instrumentview/src/InstrumentWidgetPickTab.cpp
@@ -1535,7 +1535,7 @@ void DetectorPlotController::savePlotToWorkspace() {
         actor.sumDetectors(dets, x, y);
         unitX = parentWorkspace->getAxis(0)->unit()->unitID();
       } else {
-        QMessageBox::warning(NULL, "MantidPlot - Warning",
+        QMessageBox::warning(nullptr, "MantidPlot - Warning",
                              "Cannot save the stored curves.\nOnly the current "
                              "curve will be saved.");
       }
@@ -1561,7 +1561,7 @@ void DetectorPlotController::savePlotToWorkspace() {
     }
     if (!x.empty()) {
       if (nbins > 0 && x.size() != nbins) {
-        QMessageBox::critical(NULL, "MantidPlot - Error",
+        QMessageBox::critical(nullptr, "MantidPlot - Error",
                               "Curves have different sizes.");
         return;
       } else {
diff --git a/qt/widgets/instrumentview/src/RotationSurface.cpp b/qt/widgets/instrumentview/src/RotationSurface.cpp
index a9288fabceb..0a7a1f31088 100644
--- a/qt/widgets/instrumentview/src/RotationSurface.cpp
+++ b/qt/widgets/instrumentview/src/RotationSurface.cpp
@@ -211,7 +211,7 @@ void RotationSurface::findAndCorrectUGap() {
   double bin_width = fabs(m_u_max - m_u_min) / (nbins - 1);
   if (bin_width == 0.0) {
     QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
-    QMessageBox::warning(NULL, tr("MantidPLot - Instrument view error"),
+    QMessageBox::warning(nullptr, tr("MantidPLot - Instrument view error"),
                          tr("Failed to build unwrapped surface"));
     QApplication::restoreOverrideCursor();
     m_u_min = 0.0;
-- 
GitLab