Integrate C++11 branch into 5_1-new

src/RageSurface_Load.cpp

@@ -13,7 +13,7 @@
 
 static RageSurface *TryOpenFile( RString sPath, bool bHeaderOnly, RString &error, RString format, bool &bKeepTrying )
 {
-	RageSurface *ret = NULL;
+	RageSurface *ret = nullptr;
 	RageSurfaceUtils::OpenResult result;
 	if( !format.CompareNoCase("png") )
 		result = RageSurface_Load_PNG( sPath, ret, bHeaderOnly, error );
@@ -27,12 +27,12 @@ static RageSurface *TryOpenFile( RString sPath, bool bHeaderOnly, RString &error
 	{
 		error = "Unsupported format";
 		bKeepTrying = true;
-		return NULL;
+		return nullptr;
 	}
 
 	if( result == RageSurfaceUtils::OPEN_OK )
 	{
-		ASSERT( ret != NULL );
+		ASSERT( ret != nullptr );
 		return ret;
 	}
 
@@ -71,7 +71,7 @@ static RageSurface *TryOpenFile( RString sPath, bool bHeaderOnly, RString &error
 		default: break;
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 RageSurface *RageSurfaceUtils::LoadFile( const RString &sPath, RString &error, bool bHeaderOnly )
@@ -81,7 +81,7 @@ RageSurface *RageSurfaceUtils::LoadFile( const RString &sPath, RString &error, b
 		if( !TestOpen.Open( sPath ) )
 		{
 			error = TestOpen.GetError();
-			return NULL;
+			return nullptr;
 		}
 	}
 
@@ -117,7 +117,7 @@ RageSurface *RageSurfaceUtils::LoadFile( const RString &sPath, RString &error, b
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 /*