Index: src/libictranslate/config_property.cpp
===================================================================
diff -u -N -r4fe995b304ea342b50293f92d3c1992b43b820f7 -r8068e0c351055554340ac9755d1bc846893bf2b8
--- src/libictranslate/config_property.cpp	(.../config_property.cpp)	(revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
+++ src/libictranslate/config_property.cpp	(.../config_property.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
@@ -33,7 +33,7 @@
  */
 property::property() :
 	m_uiPropType(type_unknown | flag_none),
-	m_pszName(NULL)
+	m_pszName(nullptr)
 {
 	memset(&m_val, 0, sizeof(_VALUE));
 	memset(&m_range, 0, sizeof(_RANGE));
@@ -45,7 +45,7 @@
  */
 property::property(const wchar_t* pszName, unsigned int uiType) :
 	m_uiPropType(uiType),
-	m_pszName(NULL)
+	m_pszName(nullptr)
 {
 	memset(&m_val, 0, sizeof(_VALUE));
 	memset(&m_range, 0, sizeof(_RANGE));
@@ -89,7 +89,7 @@
 {
 	// delete the property name
 	delete [] m_pszName;
-	m_pszName=NULL;
+	m_pszName=nullptr;
 
 	clear_value();
 
@@ -324,7 +324,7 @@
 /** Retrieves the value as a string.
  *
  * \param[out] pszString - pointer to a string that will receive the value (could
- *						   be NULL when retrieving string value type)
+ *						   be nullptr when retrieving string value type)
  * \param[in] stMaxSize - size of the buffer (could be 0 for string value retrieval)
  * \param[in] stIndex - an index at which to get the value (only meaningful
  *                      for array property type).
@@ -764,7 +764,7 @@
 
 /** Completely clears the value part internal members.
  *  Unallocates all the memory associated with values and sets
- *  those members to NULL.
+ *  those members to nullptr.
  */
 void property::clear_value()
 {
@@ -788,15 +788,15 @@
 			assert(false);		// unhandled property type
 		}
 
-		m_val.hArray=NULL;
+		m_val.hArray=nullptr;
 	}
 	else
 	{
 		switch(m_uiPropType & mask_type)
 		{
 		case type_string:
 			delete [] m_val.pszVal;
-			m_val.pszVal=NULL;
+			m_val.pszVal=nullptr;
 			break;
 		case type_signed_num:
 			m_val.llVal=0LL;
@@ -888,7 +888,7 @@
 		return psz;
 	}
 	else
-		return NULL;
+		return nullptr;
 }
 
 /** Converts a string to a boolean value.