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

Merge pull request #540 from tomgalvin594/convert_tabs

Browse Source 
Changed tabs to spaces in various files
This commit is contained in:
Jan Haller 2014-03-01 17:48:24 +01:00
commit a8ba35171a
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SFML/Graphics/Font.cpp
View File

@ -68,7 +68,7 @@ m_library (NULL),
m_face (NULL), m_face (NULL),
m_streamRec(NULL), m_streamRec(NULL),
m_refCount (NULL), m_refCount (NULL),
m_info () m_info ()
{ {
} }

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

@ -150,7 +150,7 @@ Socket::Status TcpSocket::connect(const IpAddress& remoteAddress, unsigned short
if (::connect(getHandle(), reinterpret_cast<sockaddr*>(&address), sizeof(address)) >= 0) if (::connect(getHandle(), reinterpret_cast<sockaddr*>(&address), sizeof(address)) >= 0)
{ {
// We got instantly connected! (it may no happen a lot...) // We got instantly connected! (it may no happen a lot...)
setBlocking(blocking); setBlocking(blocking);
return Done; return Done;
} }

2
src/SFML/System/Win32/ClockImpl.cpp
View File

@ -34,7 +34,7 @@ namespace
LARGE_INTEGER getFrequency() LARGE_INTEGER getFrequency()
{ {
LARGE_INTEGER frequency; LARGE_INTEGER frequency;
QueryPerformanceFrequency(&frequency); QueryPerformanceFrequency(&frequency);
return frequency; return frequency;
} }
} }

12
src/SFML/Window/FreeBSD/JoystickImpl.hpp
View File

@ -104,15 +104,15 @@ private :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
int m_file; ///< File descriptor of the joystick int m_file; ///< File descriptor of the joystick
report_desc_t m_desc; ///< USB report descriptor report_desc_t m_desc; ///< USB report descriptor
int m_id; ///< USB id int m_id; ///< USB id
void *m_buffer; ///< USB HID buffer void *m_buffer; ///< USB HID buffer
int m_length; ///< Buffer length int m_length; ///< Buffer length
JoystickState m_state; ///< Current state of the joystick JoystickState m_state; ///< Current state of the joystick
}; };
} // namespace priv } // namespace priv

2
src/SFML/Window/Unix/JoystickImpl.cpp
View File

@ -138,7 +138,7 @@ bool JoystickImpl::isConnected(unsigned int index)
char buffer[128]; char buffer[128];
(void)read(notifyFd, buffer, sizeof(buffer)); (void)read(notifyFd, buffer, sizeof(buffer));
} }
} }
// Then check if the joystick is connected // Then check if the joystick is connected
return plugged[index]; return plugged[index];

16
src/SFML/Window/Win32/WglContext.cpp
View File

@ -162,19 +162,19 @@ void WglContext::createContext(WglContext* shared, unsigned int bitsPerPixel, co
int intAttributes[] = int intAttributes[] =
{ {
WGL_DRAW_TO_WINDOW_ARB, GL_TRUE, WGL_DRAW_TO_WINDOW_ARB, GL_TRUE,
WGL_SUPPORT_OPENGL_ARB, GL_TRUE, WGL_SUPPORT_OPENGL_ARB, GL_TRUE,
WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB, WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB,
WGL_DOUBLE_BUFFER_ARB, GL_TRUE, WGL_DOUBLE_BUFFER_ARB, GL_TRUE,
WGL_SAMPLE_BUFFERS_ARB, (m_settings.antialiasingLevel ? GL_TRUE : GL_FALSE), WGL_SAMPLE_BUFFERS_ARB, (m_settings.antialiasingLevel ? GL_TRUE : GL_FALSE),
WGL_SAMPLES_ARB, static_cast<int>(m_settings.antialiasingLevel), WGL_SAMPLES_ARB, static_cast<int>(m_settings.antialiasingLevel),
0, 0 0, 0
}; };
// Let's check how many formats are supporting our requirements // Let's check how many formats are supporting our requirements
int formats[128]; int formats[128];
UINT nbFormats; UINT nbFormats;
float floatAttributes[] = {0, 0}; float floatAttributes[] = {0, 0};
bool isValid = wglChoosePixelFormatARB(m_deviceContext, intAttributes, floatAttributes, sizeof(formats) / sizeof(*formats), formats, &nbFormats) != 0; bool isValid = wglChoosePixelFormatARB(m_deviceContext, intAttributes, floatAttributes, sizeof(formats) / sizeof(*formats), formats, &nbFormats) != 0;
while ((!isValid || (nbFormats == 0)) && m_settings.antialiasingLevel > 0) while ((!isValid || (nbFormats == 0)) && m_settings.antialiasingLevel > 0)
{ {
// Decrease the antialiasing level until we find a valid one // Decrease the antialiasing level until we find a valid one