Orion Poplawski d0d035e
diff -up ParaView-v5.0.0-RC3-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx.jsoncpp ParaView-v5.0.0-RC3-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
Orion Poplawski d0d035e
--- ParaView-v5.0.0-RC3-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx.jsoncpp	2015-12-22 18:14:02.000000000 -0700
Orion Poplawski d0d035e
+++ ParaView-v5.0.0-RC3-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx	2016-01-06 08:55:57.932760040 -0700
Orion Poplawski d0d035e
@@ -112,7 +112,7 @@ public:
Orion Poplawski d0d035e
   //----------------------------------------------------------------------------
Orion Poplawski d0d035e
   // Description: Get a Json::Value given a setting name. Returns the
Orion Poplawski d0d035e
   // highest-priority setting defined in the setting collections, and
Orion Poplawski d0d035e
-  // null if it isn't defined in any of the collections.
Orion Poplawski d0d035e
+  // nullRef if it isn't defined in any of the collections.
Orion Poplawski d0d035e
   //
Orion Poplawski d0d035e
   // String format is:
Orion Poplawski d0d035e
   // "." => root node
Orion Poplawski d0d035e
@@ -509,8 +509,8 @@ public:
Orion Poplawski d0d035e
       {
Orion Poplawski d0d035e
       if (jsonValue.isArray())
Orion Poplawski d0d035e
         {
Orion Poplawski d0d035e
-        // Reset to null so that we aren't setting a value on a Json::Value array
Orion Poplawski d0d035e
-        jsonValue = Json::Value::null;
Orion Poplawski d0d035e
+        // Reset to nullRef so that we aren't setting a value on a Json::Value array
Orion Poplawski d0d035e
+        jsonValue = Json::Value::nullRef;
Orion Poplawski d0d035e
         this->Modified();
Orion Poplawski d0d035e
         }
Orion Poplawski d0d035e
 
Orion Poplawski d0d035e
@@ -524,8 +524,8 @@ public:
Orion Poplawski d0d035e
       {
Orion Poplawski d0d035e
       if (!jsonValue.isArray() && !jsonValue.isNull())
Orion Poplawski d0d035e
         {
Orion Poplawski d0d035e
-        // Reset to null so that the jsonValue.resize() operation works
Orion Poplawski d0d035e
-        jsonValue = Json::Value::null;
Orion Poplawski d0d035e
+        // Reset to nullRef so that the jsonValue.resize() operation works
Orion Poplawski d0d035e
+        jsonValue = Json::Value::nullRef;
Orion Poplawski d0d035e
         this->Modified();
Orion Poplawski d0d035e
         }
Orion Poplawski d0d035e
 
Orion Poplawski d0d035e
@@ -553,8 +553,8 @@ public:
Orion Poplawski d0d035e
       {
Orion Poplawski d0d035e
       if (jsonValue.isArray())
Orion Poplawski d0d035e
         {
Orion Poplawski d0d035e
-        // Reset to null so that we aren't setting a value on a Json::Value array
Orion Poplawski d0d035e
-        jsonValue = Json::Value::null;
Orion Poplawski d0d035e
+        // Reset to nullRef so that we aren't setting a value on a Json::Value array
Orion Poplawski d0d035e
+        jsonValue = Json::Value::nullRef;
Orion Poplawski d0d035e
         this->Modified();
Orion Poplawski d0d035e
         }
Orion Poplawski d0d035e
 
Orion Poplawski d0d035e
@@ -568,8 +568,8 @@ public:
Orion Poplawski d0d035e
       {
Orion Poplawski d0d035e
       if (!jsonValue.isArray() && !jsonValue.isNull())
Orion Poplawski d0d035e
         {
Orion Poplawski d0d035e
-        // Reset to null so that the jsonValue.resize() operation works
Orion Poplawski d0d035e
-        jsonValue = Json::Value::null;
Orion Poplawski d0d035e
+        // Reset to nullRef so that the jsonValue.resize() operation works
Orion Poplawski d0d035e
+        jsonValue = Json::Value::nullRef;
Orion Poplawski d0d035e
         this->Modified();
Orion Poplawski d0d035e
         }
Orion Poplawski d0d035e
 
Orion Poplawski d0d035e
@@ -597,8 +597,8 @@ public:
Orion Poplawski d0d035e
       {
Orion Poplawski d0d035e
       if (jsonValue.isArray())
Orion Poplawski d0d035e
         {
Orion Poplawski d0d035e
-        // Reset to null so that we aren't setting a value on a Json::Value array
Orion Poplawski d0d035e
-        jsonValue = Json::Value::null;
Orion Poplawski d0d035e
+        // Reset to nullRef so that we aren't setting a value on a Json::Value array
Orion Poplawski d0d035e
+        jsonValue = Json::Value::nullRef;
Orion Poplawski d0d035e
         this->Modified();
Orion Poplawski d0d035e
         }
Orion Poplawski d0d035e
 
Orion Poplawski d0d035e
@@ -612,8 +612,8 @@ public:
Orion Poplawski d0d035e
       {
Orion Poplawski d0d035e
       if (!jsonValue.isArray() && !jsonValue.isNull())
Orion Poplawski d0d035e
         {
Orion Poplawski d0d035e
-        // Reset to null so that the jsonValue.resize() operation works
Orion Poplawski d0d035e
-        jsonValue = Json::Value::null;
Orion Poplawski d0d035e
+        // Reset to nullRef so that the jsonValue.resize() operation works
Orion Poplawski d0d035e
+        jsonValue = Json::Value::nullRef;
Orion Poplawski d0d035e
         this->Modified();
Orion Poplawski d0d035e
         }
Orion Poplawski d0d035e