Replaced NULL with nullptr.

This commit is contained in:
binary1248 2017-04-03 19:13:33 +02:00
parent e1d3eff587
commit b3b094fc91
81 changed files with 512 additions and 512 deletions

View file

@ -158,7 +158,7 @@ public:
////////////////////////////////////////////////////////////
/// \brief Get the audio buffer attached to the sound
///
/// \return Sound buffer attached to the sound (can be NULL)
/// \return Sound buffer attached to the sound (can be nullptr)
///
////////////////////////////////////////////////////////////
const SoundBuffer* getBuffer() const;

View file

@ -651,7 +651,7 @@ public:
/// // draw OpenGL stuff that use s1...
/// sf::Shader::bind(&s2);
/// // draw OpenGL stuff that use s2...
/// sf::Shader::bind(NULL);
/// sf::Shader::bind(nullptr);
/// // draw OpenGL stuff that use no shader...
/// \endcode
///
@ -696,7 +696,7 @@ private:
////////////////////////////////////////////////////////////
/// \brief Compile the shader(s) and create the program
///
/// If one of the arguments is NULL, the corresponding shader
/// If one of the arguments is nullptr, the corresponding shader
/// is not created.
///
/// \param vertexShaderCode Source code of the vertex shader
@ -867,7 +867,7 @@ private:
/// \code
/// sf::Shader::bind(&shader);
/// ... render OpenGL geometry ...
/// sf::Shader::bind(NULL);
/// sf::Shader::bind(nullptr);
/// \endcode
///
/// \see sf::Glsl

View file

@ -60,7 +60,7 @@ public:
/// a pointer to the one that you passed to this function.
/// If the source texture is destroyed and the shape tries to
/// use it, the behavior is undefined.
/// \a texture can be NULL to disable texturing.
/// \a texture can be nullptr to disable texturing.
/// If \a resetRect is true, the TextureRect property of
/// the shape is automatically adjusted to the size of the new
/// texture. If it is false, the texture rect is left unchanged.
@ -134,7 +134,7 @@ public:
////////////////////////////////////////////////////////////
/// \brief Get the source texture of the shape
///
/// If the shape has no source texture, a NULL pointer is returned.
/// If the shape has no source texture, a nullptr pointer is returned.
/// The returned pointer is const, which means that you can't
/// modify the texture when you retrieve it with this function.
///

View file

@ -130,7 +130,7 @@ public:
////////////////////////////////////////////////////////////
/// \brief Get the source texture of the sprite
///
/// If the sprite has no source texture, a NULL pointer is returned.
/// If the sprite has no source texture, a nullptr pointer is returned.
/// The returned pointer is const, which means that you can't
/// modify the texture when you retrieve it with this function.
///

View file

@ -239,7 +239,7 @@ public:
////////////////////////////////////////////////////////////
/// \brief Get the text's font
///
/// If the text has no font attached, a NULL pointer is returned.
/// If the text has no font attached, a nullptr pointer is returned.
/// The returned pointer is const, which means that you
/// cannot modify the font when you get it from this function.
///

View file

@ -551,7 +551,7 @@ public:
/// // draw OpenGL stuff that use t1...
/// sf::Texture::bind(&t2);
/// // draw OpenGL stuff that use t2...
/// sf::Texture::bind(NULL);
/// sf::Texture::bind(nullptr);
/// // draw OpenGL stuff that use no texture...
/// \endcode
///
@ -723,7 +723,7 @@ private:
/// \code
/// sf::Texture::bind(&texture);
/// ... render OpenGL geometry ...
/// sf::Texture::bind(NULL);
/// sf::Texture::bind(nullptr);
/// \endcode
///
/// \see sf::Sprite, sf::Image, sf::RenderTexture

View file

@ -92,7 +92,7 @@ public:
/// Warning: the returned pointer may become invalid after
/// you append data to the packet, therefore it should never
/// be stored.
/// The return pointer is NULL if the packet is empty.
/// The return pointer is nullptr if the packet is empty.
///
/// \return Pointer to the data
///

View file

@ -69,7 +69,7 @@ SFML_SYSTEM_API std::ostream& err();
/// std::streambuf* previous = sf::err().rdbuf(file.rdbuf());
///
/// // Redirect to nothing
/// sf::err().rdbuf(NULL);
/// sf::err().rdbuf(nullptr);
///
/// // Restore the original output
/// sf::err().rdbuf(previous);

View file

@ -113,7 +113,7 @@ public:
////////////////////////////////////////////////////////////
/// \brief Get the currently active context
///
/// \return The currently active context or NULL if none is active
/// \return The currently active context or nullptr if none is active
///
////////////////////////////////////////////////////////////
static const Context* getActiveContext();