Index: src/libictranslate/cfg.cpp
===================================================================
diff -u -N -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r8068e0c351055554340ac9755d1bc846893bf2b8
--- src/libictranslate/cfg.cpp	(.../cfg.cpp)	(revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae)
+++ src/libictranslate/cfg.cpp	(.../cfg.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
@@ -128,7 +128,7 @@
 config::config(config_base_types eCfgType) :
 	m_lock(),
 	m_hProps((void*)new std::vector<property>),
-	m_pszCurrentPath(NULL)
+	m_pszCurrentPath(nullptr)
 {
 	switch(eCfgType)
 	{
@@ -337,8 +337,8 @@
 	m_lock.Lock();
 
 	// get the value for the property name
-	void* hFind=NULL;
-	if( (hFind=m_pCfgBase->find(pszName)) != NULL )
+	void* hFind=nullptr;
+	if( (hFind=m_pCfgBase->find(pszName)) != nullptr )
 	{
 		PROPINFO pi;
 		while(m_pCfgBase->find_next(hFind, pi))
@@ -382,8 +382,8 @@
 	m_lock.Lock();
 
 	// get the value for the property name
-	void* hFind=NULL;
-	if( (hFind=m_pCfgBase->find(pszName)) != NULL )
+	void* hFind=nullptr;
+	if( (hFind=m_pCfgBase->find(pszName)) != nullptr )
 	{
 		PROPINFO pi;
 		while(m_pCfgBase->find_next(hFind, pi))
@@ -424,8 +424,8 @@
 	m_lock.Lock();
 
 	// get the value for the property name
-	void* hFind=NULL;
-	if( (hFind=m_pCfgBase->find(pszName)) != NULL )
+	void* hFind=nullptr;
+	if( (hFind=m_pCfgBase->find(pszName)) != nullptr )
 	{
 		PROPINFO pi;
 		while(m_pCfgBase->find_next(hFind, pi))
@@ -466,8 +466,8 @@
 	m_lock.Lock();
 
 	// get the value for the property name
-	void* hFind=NULL;
-	if( (hFind=m_pCfgBase->find(pszName)) != NULL )
+	void* hFind=nullptr;
+	if( (hFind=m_pCfgBase->find(pszName)) != nullptr )
 	{
 		PROPINFO pi;
 		while(m_pCfgBase->find_next(hFind, pi))
@@ -608,7 +608,7 @@
 const wchar_t* config::get_string(unsigned int uiProp, wchar_t* pszBuffer, size_t stBufferSize, size_t stIndex)
 {
 	if(!pszBuffer || stBufferSize < 1)
-		return NULL;
+		return nullptr;
 
 	m_lock.Lock();
 	if(uiProp >= m_pvProps->size())
@@ -787,8 +787,8 @@
 			(*it).clear_array();
 
 		// and fill with value(s)
-		void* hFind=NULL;
-		if( (hFind=m_pCfgBase->find((*it).get_name())) != NULL)
+		void* hFind=nullptr;
+		if( (hFind=m_pCfgBase->find((*it).get_name())) != nullptr)
 		{
 			PROPINFO pi;
 			while(m_pCfgBase->find_next(hFind, pi))