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

Fixed various minor warnings

Browse source
This commit is contained in:
Laurent Gomila 2012-03-17 17:00:19 +01:00
parent 78e7dcea38
commit ee7cd94220
18 changed files with 96 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,7 @@ namespace sf
{
////////////////////////////////////////////////////////////
SoundStream::SoundStream() :
m_thread (&SoundStream::stream, this),
m_thread (&SoundStream::streamData, this),
m_isStreaming (false),
m_channelCount (0),
m_sampleRate (0),
@ -190,7 +190,7 @@ bool SoundStream::getLoop() const
////////////////////////////////////////////////////////////
void SoundStream::stream()
void SoundStream::streamData()
{
// Create the buffers
alCheck(alGenBuffers(BufferCount, m_buffers));

10
src/SFML/Graphics/Font.cpp
View file

@ -489,11 +489,11 @@ Glyph Font::loadGlyph(Uint32 codePoint, unsigned int characterSize, bool bold) c
}
// Write the pixels to the texture
unsigned int x = glyph.textureRect.left + padding;
unsigned int y = glyph.textureRect.top + padding;
unsigned int width = glyph.textureRect.width - 2 * padding;
unsigned int height = glyph.textureRect.height - 2 * padding;
page.texture.update(&m_pixelBuffer[0], width, height, x, y);
unsigned int x = glyph.textureRect.left + padding;
unsigned int y = glyph.textureRect.top + padding;
unsigned int w = glyph.textureRect.width - 2 * padding;
unsigned int h = glyph.textureRect.height - 2 * padding;
page.texture.update(&m_pixelBuffer[0], w, h, x, y);
}
// Delete the FT glyph

28
src/SFML/Graphics/RenderStates.cpp
View file

@ -46,9 +46,9 @@ shader (NULL)
////////////////////////////////////////////////////////////
RenderStates::RenderStates(const Transform& transform) :
RenderStates::RenderStates(const Transform& theTransform) :
blendMode(BlendAlpha),
transform(transform),
transform(theTransform),
texture (NULL),
shader (NULL)
{
@ -56,8 +56,8 @@ shader (NULL)
////////////////////////////////////////////////////////////
RenderStates::RenderStates(BlendMode blendMode) :
blendMode(blendMode),
RenderStates::RenderStates(BlendMode theBlendMode) :
blendMode(theBlendMode),
transform(),
texture (NULL),
shader (NULL)
@ -66,32 +66,32 @@ shader (NULL)
////////////////////////////////////////////////////////////
RenderStates::RenderStates(const Texture* texture) :
RenderStates::RenderStates(const Texture* theTexture) :
blendMode(BlendAlpha),
transform(),
texture (texture),
texture (theTexture),
shader (NULL)
{
}
////////////////////////////////////////////////////////////
RenderStates::RenderStates(const Shader* shader) :
RenderStates::RenderStates(const Shader* theShader) :
blendMode(BlendAlpha),
transform(),
texture (NULL),
shader (shader)
shader (theShader)
{
}
////////////////////////////////////////////////////////////
RenderStates::RenderStates(BlendMode blendMode, const Transform& transform,
const Texture* texture, const Shader* shader) :
blendMode(blendMode),
transform(transform),
texture (texture),
shader (shader)
RenderStates::RenderStates(BlendMode theBlendMode, const Transform& theTransform,
const Texture* theTexture, const Shader* theShader) :
blendMode(theBlendMode),
transform(theTransform),
texture (theTexture),
shader (theShader)
{
}

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

@ -95,8 +95,8 @@ Texture::~Texture()
{
ensureGlContext();
GLuint Texture = static_cast<GLuint>(m_texture);
glCheck(glDeleteTextures(1, &Texture));
GLuint texture = static_cast<GLuint>(m_texture);
glCheck(glDeleteTextures(1, &texture));
}
}

24
src/SFML/Graphics/Vertex.cpp
View file

@ -40,8 +40,8 @@ texCoords(0, 0)
////////////////////////////////////////////////////////////
Vertex::Vertex(const Vector2f& position) :
position (position),
Vertex::Vertex(const Vector2f& thePosition) :
position (thePosition),
color (255, 255, 255),
texCoords(0, 0)
{
@ -49,28 +49,28 @@ texCoords(0, 0)
////////////////////////////////////////////////////////////
Vertex::Vertex(const Vector2f& position, const Color& color) :
position (position),
color (color),
Vertex::Vertex(const Vector2f& thePosition, const Color& theColor) :
position (thePosition),
color (theColor),
texCoords(0, 0)
{
}
////////////////////////////////////////////////////////////
Vertex::Vertex(const Vector2f& position, const Vector2f& texCoords) :
position (position),
Vertex::Vertex(const Vector2f& thePosition, const Vector2f& theTexCoords) :
position (thePosition),
color (255, 255, 255),
texCoords(texCoords)
texCoords(theTexCoords)
{
}
////////////////////////////////////////////////////////////
Vertex::Vertex(const Vector2f& position, const Color& color, const Vector2f& texCoords) :
position (position),
color (color),
texCoords(texCoords)
Vertex::Vertex(const Vector2f& thePosition, const Color& theColor, const Vector2f& theTexCoords) :
position (thePosition),
color (theColor),
texCoords(theTexCoords)
{
}

2
src/SFML/Window/Linux/InputImpl.cpp
View file

@ -272,4 +272,4 @@ void InputImpl::setMousePosition(const Vector2i& position, const Window& relativ
} // namespace priv
} // namespace sf
} // namespace sf

2
src/SFML/Window/Linux/InputImpl.hpp
View file

@ -120,4 +120,4 @@ public :
} // namespace sf
#endif // SFML_INPUTIMPLX11_HPP
#endif // SFML_INPUTIMPLX11_HPP

8
src/SFML/Window/VideoMode.cpp
View file

@ -44,10 +44,10 @@ bitsPerPixel(0)
////////////////////////////////////////////////////////////
VideoMode::VideoMode(unsigned int width, unsigned int height, unsigned int bitsPerPixel) :
width (width),
height (height),
bitsPerPixel(bitsPerPixel)
VideoMode::VideoMode(unsigned int modeWidth, unsigned int modeHeight, unsigned int modeBitsPerPixel) :
width (modeWidth),
height (modeHeight),
bitsPerPixel(modeBitsPerPixel)
{
}

2
src/SFML/Window/Win32/InputImpl.cpp
View file

@ -42,6 +42,7 @@ bool InputImpl::isKeyPressed(Keyboard::Key key)
int vkey = 0;
switch (key)
{
default: vkey = 0; break;
case Keyboard::A: vkey = 'A'; break;
case Keyboard::B: vkey = 'B'; break;
case Keyboard::C: vkey = 'C'; break;
@ -155,6 +156,7 @@ bool InputImpl::isMouseButtonPressed(Mouse::Button button)
int vkey = 0;
switch (button)
{
default: vkey = 0; break;
case Mouse::Left: vkey = VK_LBUTTON; break;
case Mouse::Right: vkey = VK_RBUTTON; break;
case Mouse::Middle: vkey = VK_MBUTTON; break;