Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/SFML/Audio/SoundRecorder.hpp
View File

@ -183,7 +183,7 @@ protected:
/// \param interval Processing interval
///
////////////////////////////////////////////////////////////
void setProcessingInterval(sf::Time interval);
void setProcessingInterval(Time interval);
////////////////////////////////////////////////////////////
/// \brief Start capturing audio data
@ -260,7 +260,7 @@ private:
Thread m_thread; ///< Thread running the background recording task
std::vector<Int16> m_samples; ///< Buffer to store captured samples
unsigned int m_sampleRate; ///< Sample rate
sf::Time m_processingInterval; ///< Time period between calls to onProcessSamples
Time m_processingInterval; ///< Time period between calls to onProcessSamples
bool m_isCapturing; ///< Capturing state
std::string m_deviceName; ///< Name of the audio capture device
};

2
include/SFML/Graphics/Font.hpp
View File

@ -278,7 +278,7 @@ private:
Page();
GlyphTable glyphs; ///< Table mapping code points to their corresponding glyph
sf::Texture texture; ///< Texture containing the pixels of the glyphs
Texture texture; ///< Texture containing the pixels of the glyphs
unsigned int nextRow; ///< Y position of the next new row in the texture
std::vector<Row> rows; ///< List containing the position of all the existing rows
};

2
include/SFML/Graphics/Shader.hpp
View File

@ -399,7 +399,7 @@ public:
/// \param transform Transform to assign
///
////////////////////////////////////////////////////////////
void setParameter(const std::string& name, const sf::Transform& transform);
void setParameter(const std::string& name, const Transform& transform);
////////////////////////////////////////////////////////////
/// \brief Change a texture parameter of the shader

2
include/SFML/Graphics/Texture.hpp
View File

@ -187,7 +187,7 @@ public:
/// \see loadFromFile, loadFromMemory, loadFromImage
///
////////////////////////////////////////////////////////////
bool loadFromStream(sf::InputStream& stream, const IntRect& area = IntRect());
bool loadFromStream(InputStream& stream, const IntRect& area = IntRect());
////////////////////////////////////////////////////////////
/// \brief Load the texture from an image

2
include/SFML/System/FileInputStream.hpp
View File

@ -123,7 +123,7 @@ private:
// Member data
////////////////////////////////////////////////////////////
#ifdef ANDROID
sf::priv::ResourceStream *m_file;
priv::ResourceStream* m_file;
#else
std::FILE* m_file; ///< stdio file stream
#endif

2
include/SFML/Window/Joystick.hpp
View File

@ -77,7 +77,7 @@ public:
{
Identification();
sf::String name; ///< Name of the joystick
String name; ///< Name of the joystick
unsigned int vendorId; ///< Manufacturer identifier
unsigned int productId; ///< Product identifier
};

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;
}