lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed unnecessary sf:: prefixes

Browse source
This commit is contained in:
Jan Haller 2015-05-20 17:26:26 +02:00
parent 1b1d92d6bb
commit 6cec972338
11 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/SFML/Audio/SoundRecorder.cpp
View file

@ -135,7 +135,7 @@ std::vector<std::string> SoundRecorder::getAvailableDevices()
{
std::vector<std::string> deviceNameList;
const ALchar *deviceList = alcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER);
const ALchar* deviceList = alcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER);
if (deviceList)
{
while (*deviceList)
@ -210,7 +210,7 @@ bool SoundRecorder::isAvailable()
////////////////////////////////////////////////////////////
void SoundRecorder::setProcessingInterval(sf::Time interval)
void SoundRecorder::setProcessingInterval(Time interval)
{
m_processingInterval = interval;
}

4
src/SFML/Graphics/Shader.cpp
View file

@ -385,7 +385,7 @@ void Shader::setParameter(const std::string& name, const Color& color)
////////////////////////////////////////////////////////////
void Shader::setParameter(const std::string& name, const sf::Transform& transform)
void Shader::setParameter(const std::string& name, const Transform& transform)
{
if (m_shaderProgram)
{
@ -768,7 +768,7 @@ void Shader::setParameter(const std::string& name, const Color& color)
////////////////////////////////////////////////////////////
void Shader::setParameter(const std::string& name, const sf::Transform& transform)
void Shader::setParameter(const std::string& name, const Transform& transform)
{
}

2
src/SFML/Graphics/Shape.cpp
View file

@ -66,7 +66,7 @@ void Shape::setTexture(const Texture* texture, bool resetRect)
if (texture)
{
// Recompute the texture area if requested, or if there was no texture & rect before
if (resetRect || (!m_texture && (m_textureRect == sf::IntRect())))
if (resetRect || (!m_texture && (m_textureRect == IntRect())))
setTextureRect(IntRect(0, 0, texture->getSize().x, texture->getSize().y));
}

2
src/SFML/Network/TcpSocket.cpp
View file

@ -179,7 +179,7 @@ Socket::Status TcpSocket::connect(const IpAddress& remoteAddress, unsigned short
{
// At this point the connection may have been either accepted or refused.
// To know whether it's a success or a failure, we must check the address of the connected peer
if (getRemoteAddress() != sf::IpAddress::None)
if (getRemoteAddress() != IpAddress::None)
{
// Connection accepted
status = Done;

6
src/SFML/System/FileInputStream.cpp
View file

@ -60,7 +60,7 @@ bool FileInputStream::open(const std::string& filename)
#ifdef ANDROID
if (m_file)
delete m_file;
m_file = new sf::priv::ResourceStream(filename);
m_file = new priv::ResourceStream(filename);
return m_file->tell() != -1;
#else
if (m_file)
@ -128,9 +128,9 @@ Int64 FileInputStream::getSize()
#else
if (m_file)
{
sf::Int64 position = tell();
Int64 position = tell();
std::fseek(m_file, 0, SEEK_END);
sf::Int64 size = tell();
Int64 size = tell();
seek(position);
return size;
}