diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake index 266fee1c1..0f95e6e6a 100644 --- a/cmake/CompilerWarnings.cmake +++ b/cmake/CompilerWarnings.cmake @@ -70,17 +70,16 @@ function(set_file_warnings) ${NON_ANDROID_CLANG_AND_GCC_WARNINGS} ) + if(WARNINGS_AS_ERRORS) + set(CLANG_AND_GCC_WARNINGS ${CLANG_AND_GCC_WARNINGS} -Werror) + set(MSVC_WARNINGS ${MSVC_WARNINGS} /WX) + endif() set(CLANG_WARNINGS ${CLANG_AND_GCC_WARNINGS} -Wno-unknown-warning-option # do not warn on GCC-specific warning diagnostic pragmas ) - if(WARNINGS_AS_ERRORS) - set(CLANG_AND_GCC_WARNINGS ${CLANG_AND_GCC_WARNINGS} -Werror) - set(MSVC_WARNINGS ${MSVC_WARNINGS} /WX) - endif() - set(GCC_WARNINGS ${CLANG_AND_GCC_WARNINGS} ${NON_ANDROID_GCC_WARNINGS} diff --git a/examples/cocoa/CocoaAppDelegate.mm b/examples/cocoa/CocoaAppDelegate.mm index 91e09bf14..781ce6197 100644 --- a/examples/cocoa/CocoaAppDelegate.mm +++ b/examples/cocoa/CocoaAppDelegate.mm @@ -31,6 +31,14 @@ #define GREEN @"Green" #define RED @"Red" +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + // Our PIMPL struct SFMLmainWindow { @@ -117,7 +125,7 @@ struct SFMLmainWindow self.visible = YES; // Launch the timer to periodically display our stuff into the Cocoa view. - self.renderTimer = [NSTimer timerWithTimeInterval:1.f/60.f + self.renderTimer = [NSTimer timerWithTimeInterval:1.0/60.0 target:self selector:@selector(renderMainWindow:) userInfo:nil @@ -148,7 +156,7 @@ struct SFMLmainWindow self.sfmlView = nil; self.textField = nil; - delete (SFMLmainWindow*) self.mainWindow; + delete static_cast(self.mainWindow); self.mainWindow = 0; self.renderTimer = nil; diff --git a/examples/cocoa/NSString+stdstring.mm b/examples/cocoa/NSString+stdstring.mm index bb074fb39..f5dd55ca7 100644 --- a/examples/cocoa/NSString+stdstring.mm +++ b/examples/cocoa/NSString+stdstring.mm @@ -42,8 +42,8 @@ +(id)stringWithstdwstring:(const std::wstring&)string { - char* data = (char*)string.data(); - unsigned size = string.size() * sizeof(wchar_t); + const void* data = static_cast(string.data()); + unsigned size = static_cast(string.size() * sizeof(wchar_t)); NSString* str = [[[NSString alloc] initWithBytes:data length:size encoding:NSUTF32LittleEndianStringEncoding] autorelease]; @@ -67,7 +67,7 @@ // According to Wikipedia, Mac OS X is Little Endian on x86 and x86-64 // https://en.wikipedia.org/wiki/Endianness NSData* asData = [self dataUsingEncoding:NSUTF32LittleEndianStringEncoding]; - return std::wstring((wchar_t*)[asData bytes], [asData length] / sizeof(wchar_t)); + return std::wstring(static_cast([asData bytes]), [asData length] / sizeof(wchar_t)); } @end diff --git a/examples/shader/Shader.cpp b/examples/shader/Shader.cpp index 34ba60d32..828ad23f0 100644 --- a/examples/shader/Shader.cpp +++ b/examples/shader/Shader.cpp @@ -228,8 +228,8 @@ public: for (std::size_t i = 0; i < m_entities.size(); ++i) { sf::Vector2f position; - position.x = std::cos(0.25f * (time * static_cast(i + (m_entities.size() - i)))) * 300 + 350; - position.y = std::sin(0.25f * (time * static_cast((m_entities.size() - i) + i))) * 200 + 250; + position.x = std::cos(0.25f * (time * static_cast(i) + static_cast(m_entities.size() - i))) * 300 + 350; + position.y = std::sin(0.25f * (time * static_cast(m_entities.size() - i) + static_cast(i))) * 200 + 250; m_entities[i].setPosition(position); } diff --git a/include/SFML/Config.hpp b/include/SFML/Config.hpp index a58bd2ea7..e19ca50ca 100644 --- a/include/SFML/Config.hpp +++ b/include/SFML/Config.hpp @@ -194,8 +194,15 @@ namespace sf using Int64 = signed __int64; using Uint64 = unsigned __int64; #else + #if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wc++11-long-long" + #endif using Int64 = long long; using Uint64 = unsigned long long; + #if defined(__clang__) + #pragma clang diagnostic pop + #endif #endif } // namespace sf diff --git a/include/SFML/System/Utf.hpp b/include/SFML/System/Utf.hpp index 240642501..555f65273 100644 --- a/include/SFML/System/Utf.hpp +++ b/include/SFML/System/Utf.hpp @@ -29,6 +29,7 @@ // Headers //////////////////////////////////////////////////////////// #include +#include #include #include #include diff --git a/include/SFML/System/Utf.inl b/include/SFML/System/Utf.inl index 360cea9c9..000270c0b 100644 --- a/include/SFML/System/Utf.inl +++ b/include/SFML/System/Utf.inl @@ -39,7 +39,7 @@ template OutputIt priv::copy(InputIt first, InputIt last, OutputIt d_first) { while (first != last) - *d_first++ = *first++; + *d_first++ = static_cast(*first++); return d_first; } @@ -106,7 +106,7 @@ Out Utf<8>::encode(Uint32 input, Out output, Uint8 replacement) { // Invalid character if (replacement) - *output++ = replacement; + *output++ = static_cast(replacement); } else { diff --git a/src/SFML/Audio/ALCheck.cpp b/src/SFML/Audio/ALCheck.cpp index 125fdb4e2..1719c1b73 100644 --- a/src/SFML/Audio/ALCheck.cpp +++ b/src/SFML/Audio/ALCheck.cpp @@ -29,6 +29,13 @@ #include #include +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif namespace sf { diff --git a/src/SFML/Audio/ALCheck.hpp b/src/SFML/Audio/ALCheck.hpp index 9b1fb4201..a560b542f 100644 --- a/src/SFML/Audio/ALCheck.hpp +++ b/src/SFML/Audio/ALCheck.hpp @@ -30,6 +30,16 @@ //////////////////////////////////////////////////////////// #include +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + #include #include @@ -70,3 +80,11 @@ void alCheckError(const char* file, unsigned int line, const char* expression); #endif // SFML_ALCHECK_HPP + +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic pop + #elif defined(__GNUC__) + #pragma GCC diagnostic pop + #endif +#endif diff --git a/src/SFML/Audio/AudioDevice.cpp b/src/SFML/Audio/AudioDevice.cpp index 8c8ba19ea..6c6f994d8 100644 --- a/src/SFML/Audio/AudioDevice.cpp +++ b/src/SFML/Audio/AudioDevice.cpp @@ -31,6 +31,13 @@ #include #include +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif namespace { diff --git a/src/SFML/Audio/Music.cpp b/src/SFML/Audio/Music.cpp index 03be3b5ae..7dcf87990 100644 --- a/src/SFML/Audio/Music.cpp +++ b/src/SFML/Audio/Music.cpp @@ -32,6 +32,13 @@ #include #include +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif namespace sf { diff --git a/src/SFML/Audio/Sound.cpp b/src/SFML/Audio/Sound.cpp index f1e509ea3..ea5775bdc 100644 --- a/src/SFML/Audio/Sound.cpp +++ b/src/SFML/Audio/Sound.cpp @@ -29,6 +29,13 @@ #include #include +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif namespace sf { diff --git a/src/SFML/Audio/SoundBuffer.cpp b/src/SFML/Audio/SoundBuffer.cpp index 01458200d..6769bc45c 100644 --- a/src/SFML/Audio/SoundBuffer.cpp +++ b/src/SFML/Audio/SoundBuffer.cpp @@ -34,6 +34,13 @@ #include #include +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif namespace sf { diff --git a/src/SFML/Audio/SoundRecorder.cpp b/src/SFML/Audio/SoundRecorder.cpp index 8126d5685..8e1957991 100644 --- a/src/SFML/Audio/SoundRecorder.cpp +++ b/src/SFML/Audio/SoundRecorder.cpp @@ -37,6 +37,13 @@ #pragma warning(disable: 4355) // 'this' used in base member initializer list #endif +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif namespace { diff --git a/src/SFML/Audio/SoundSource.cpp b/src/SFML/Audio/SoundSource.cpp index 21a1d8ee2..06e594585 100644 --- a/src/SFML/Audio/SoundSource.cpp +++ b/src/SFML/Audio/SoundSource.cpp @@ -28,6 +28,13 @@ #include #include +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif namespace sf { diff --git a/src/SFML/Audio/SoundStream.cpp b/src/SFML/Audio/SoundStream.cpp index bc5482284..9f130df2d 100644 --- a/src/SFML/Audio/SoundStream.cpp +++ b/src/SFML/Audio/SoundStream.cpp @@ -37,6 +37,13 @@ #pragma warning(disable: 4355) // 'this' used in base member initializer list #endif +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif namespace sf { diff --git a/src/SFML/Graphics/RenderTarget.cpp b/src/SFML/Graphics/RenderTarget.cpp index 29af0bdd5..c7d1f3d51 100644 --- a/src/SFML/Graphics/RenderTarget.cpp +++ b/src/SFML/Graphics/RenderTarget.cpp @@ -498,7 +498,10 @@ void RenderTarget::resetGLStates() // Workaround for states not being properly reset on // macOS unless a context switch really takes place #if defined(SFML_SYSTEM_MACOS) - setActive(false); + if (!setActive(false)) + { + err() << "Failed to set render target inactive" << std::endl; + } #endif if (RenderTargetImpl::isActive(m_id) || setActive(true)) diff --git a/src/SFML/Graphics/Shader.cpp b/src/SFML/Graphics/Shader.cpp index d3bb8298e..c9a002ce1 100644 --- a/src/SFML/Graphics/Shader.cpp +++ b/src/SFML/Graphics/Shader.cpp @@ -976,196 +976,196 @@ Shader::~Shader() //////////////////////////////////////////////////////////// -bool Shader::loadFromFile(const std::string& filename, Type type) +bool Shader::loadFromFile(const std::string& /* filename */, Type /* type */) { return false; } //////////////////////////////////////////////////////////// -bool Shader::loadFromFile(const std::string& vertexShaderFilename, const std::string& fragmentShaderFilename) +bool Shader::loadFromFile(const std::string& /* vertexShaderFilename */, const std::string& /* fragmentShaderFilename */) { return false; } //////////////////////////////////////////////////////////// -bool Shader::loadFromFile(const std::string& vertexShaderFilename, const std::string& geometryShaderFilename, const std::string& fragmentShaderFilename) +bool Shader::loadFromFile(const std::string& /* vertexShaderFilename */, const std::string& /* geometryShaderFilename */, const std::string& /* fragmentShaderFilename */) { return false; } //////////////////////////////////////////////////////////// -bool Shader::loadFromMemory(const std::string& shader, Type type) +bool Shader::loadFromMemory(const std::string& /* shader */, Type /* type */) { return false; } //////////////////////////////////////////////////////////// -bool Shader::loadFromMemory(const std::string& vertexShader, const std::string& fragmentShader) +bool Shader::loadFromMemory(const std::string& /* vertexShader */, const std::string& /* fragmentShader */) { return false; } //////////////////////////////////////////////////////////// -bool Shader::loadFromMemory(const std::string& vertexShader, const std::string& geometryShader, const std::string& fragmentShader) +bool Shader::loadFromMemory(const std::string& /* vertexShader */, const std::string& /* geometryShader */, const std::string& /* fragmentShader */) { return false; } //////////////////////////////////////////////////////////// -bool Shader::loadFromStream(InputStream& stream, Type type) +bool Shader::loadFromStream(InputStream& /* stream */, Type /* type */) { return false; } //////////////////////////////////////////////////////////// -bool Shader::loadFromStream(InputStream& vertexShaderStream, InputStream& fragmentShaderStream) +bool Shader::loadFromStream(InputStream& /* vertexShaderStream */, InputStream& /* fragmentShaderStream */) { return false; } //////////////////////////////////////////////////////////// -bool Shader::loadFromStream(InputStream& vertexShaderStream, InputStream& geometryShaderStream, InputStream& fragmentShaderStream) +bool Shader::loadFromStream(InputStream& /* vertexShaderStream */, InputStream& /* geometryShaderStream */, InputStream& /* fragmentShaderStream */) { return false; } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, float x) +void Shader::setUniform(const std::string& /* name */, float) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, const Glsl::Vec2& v) +void Shader::setUniform(const std::string& /* name */, const Glsl::Vec2&) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, const Glsl::Vec3& v) +void Shader::setUniform(const std::string& /* name */, const Glsl::Vec3&) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, const Glsl::Vec4& v) +void Shader::setUniform(const std::string& /* name */, const Glsl::Vec4&) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, int x) +void Shader::setUniform(const std::string& /* name */, int) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, const Glsl::Ivec2& v) +void Shader::setUniform(const std::string& /* name */, const Glsl::Ivec2&) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, const Glsl::Ivec3& v) +void Shader::setUniform(const std::string& /* name */, const Glsl::Ivec3&) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, const Glsl::Ivec4& v) +void Shader::setUniform(const std::string& /* name */, const Glsl::Ivec4&) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, bool x) +void Shader::setUniform(const std::string& /* name */, bool) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, const Glsl::Bvec2& v) +void Shader::setUniform(const std::string& /* name */, const Glsl::Bvec2&) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, const Glsl::Bvec3& v) +void Shader::setUniform(const std::string& /* name */, const Glsl::Bvec3&) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, const Glsl::Bvec4& v) +void Shader::setUniform(const std::string& /* name */, const Glsl::Bvec4&) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, const Glsl::Mat3& matrix) +void Shader::setUniform(const std::string& /* name */, const Glsl::Mat3& /* matrix */) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, const Glsl::Mat4& matrix) +void Shader::setUniform(const std::string& /* name */, const Glsl::Mat4& /* matrix */) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, const Texture& texture) +void Shader::setUniform(const std::string& /* name */, const Texture& /* texture */) { } //////////////////////////////////////////////////////////// -void Shader::setUniform(const std::string& name, CurrentTextureType) +void Shader::setUniform(const std::string& /* name */, CurrentTextureType) { } //////////////////////////////////////////////////////////// -void Shader::setUniformArray(const std::string& name, const float* scalarArray, std::size_t length) +void Shader::setUniformArray(const std::string& /* name */, const float* /* scalarArray */, std::size_t /* length */) { } //////////////////////////////////////////////////////////// -void Shader::setUniformArray(const std::string& name, const Glsl::Vec2* vectorArray, std::size_t length) +void Shader::setUniformArray(const std::string& /* name */, const Glsl::Vec2* /* vectorArray */, std::size_t /* length */) { } //////////////////////////////////////////////////////////// -void Shader::setUniformArray(const std::string& name, const Glsl::Vec3* vectorArray, std::size_t length) +void Shader::setUniformArray(const std::string& /* name */, const Glsl::Vec3* /* vectorArray */, std::size_t /* length */) { } //////////////////////////////////////////////////////////// -void Shader::setUniformArray(const std::string& name, const Glsl::Vec4* vectorArray, std::size_t length) +void Shader::setUniformArray(const std::string& /* name */, const Glsl::Vec4* /* vectorArray */, std::size_t /* length */) { } //////////////////////////////////////////////////////////// -void Shader::setUniformArray(const std::string& name, const Glsl::Mat3* matrixArray, std::size_t length) +void Shader::setUniformArray(const std::string& /* name */, const Glsl::Mat3* /* matrixArray */, std::size_t /* length */) { } //////////////////////////////////////////////////////////// -void Shader::setUniformArray(const std::string& name, const Glsl::Mat4* matrixArray, std::size_t length) +void Shader::setUniformArray(const std::string& /* name */, const Glsl::Mat4* /* matrixArray */, std::size_t /* length */) { } @@ -1178,7 +1178,7 @@ unsigned int Shader::getNativeHandle() const //////////////////////////////////////////////////////////// -void Shader::bind(const Shader* shader) +void Shader::bind(const Shader* /* shader */) { } @@ -1198,7 +1198,7 @@ bool Shader::isGeometryAvailable() //////////////////////////////////////////////////////////// -bool Shader::compile(const char* vertexShaderCode, const char* geometryShaderCode, const char* fragmentShaderCode) +bool Shader::compile(const char* /* vertexShaderCode */, const char* /* geometryShaderCode */, const char* /* fragmentShaderCode */) { return false; } diff --git a/src/SFML/Graphics/VertexBuffer.cpp b/src/SFML/Graphics/VertexBuffer.cpp index 1a98fceda..cb2a24731 100644 --- a/src/SFML/Graphics/VertexBuffer.cpp +++ b/src/SFML/Graphics/VertexBuffer.cpp @@ -209,6 +209,7 @@ bool VertexBuffer::update(const VertexBuffer& vertexBuffer) { #ifdef SFML_OPENGL_ES + (void) vertexBuffer; return false; #else diff --git a/src/SFML/Main/SFMLActivity.cpp b/src/SFML/Main/SFMLActivity.cpp index 9cce1bd78..8e0fabf8f 100644 --- a/src/SFML/Main/SFMLActivity.cpp +++ b/src/SFML/Main/SFMLActivity.cpp @@ -68,7 +68,7 @@ const char *getLibraryName(JNIEnv* lJNIEnv, jobject& objectActivityInfo) } // Convert the application name to a C++ string and return it - const jsize applicationNameLength = lJNIEnv->GetStringUTFLength(valueString); + const size_t applicationNameLength = static_cast(lJNIEnv->GetStringUTFLength(valueString)); const char* applicationName = lJNIEnv->GetStringUTFChars(valueString, nullptr); if (applicationNameLength >= 256) @@ -77,7 +77,7 @@ const char *getLibraryName(JNIEnv* lJNIEnv, jobject& objectActivityInfo) exit(1); } - strncpy(name, applicationName, applicationNameLength); + strncpy(name, applicationName, static_cast(applicationNameLength)); name[applicationNameLength] = '\0'; lJNIEnv->ReleaseStringUTFChars(valueString, applicationName); @@ -141,7 +141,6 @@ void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_ // With libname being the library name such as "jpeg". // Retrieve JNI environment and JVM instance - JavaVM* lJavaVM = activity->vm; JNIEnv* lJNIEnv = activity->env; // Retrieve the NativeActivity diff --git a/src/SFML/Network/SocketSelector.cpp b/src/SFML/Network/SocketSelector.cpp index fa1786588..a4b9a1e23 100644 --- a/src/SFML/Network/SocketSelector.cpp +++ b/src/SFML/Network/SocketSelector.cpp @@ -158,7 +158,7 @@ bool SocketSelector::wait(Time timeout) // Setup the timeout timeval time; time.tv_sec = static_cast(timeout.asMicroseconds() / 1000000); - time.tv_usec = static_cast(timeout.asMicroseconds() % 1000000); + time.tv_usec = static_cast(timeout.asMicroseconds() % 1000000); // Initialize the set that will contain the sockets that are ready m_impl->socketsReady = m_impl->allSockets; diff --git a/src/SFML/Network/TcpSocket.cpp b/src/SFML/Network/TcpSocket.cpp index ba53fa5a8..bfb2cf9c5 100644 --- a/src/SFML/Network/TcpSocket.cpp +++ b/src/SFML/Network/TcpSocket.cpp @@ -175,7 +175,7 @@ Socket::Status TcpSocket::connect(const IpAddress& remoteAddress, unsigned short // Setup the timeout timeval time; time.tv_sec = static_cast(timeout.asMicroseconds() / 1000000); - time.tv_usec = static_cast(timeout.asMicroseconds() % 1000000); + time.tv_usec = static_cast(timeout.asMicroseconds() % 1000000); // Wait for something to write on our socket (which means that the connection request has returned) if (select(static_cast(getHandle() + 1), nullptr, &selector, nullptr, &time) > 0) diff --git a/src/SFML/System/Android/Activity.cpp b/src/SFML/System/Android/Activity.cpp index cd8c327a3..c978fede1 100644 --- a/src/SFML/System/Android/Activity.cpp +++ b/src/SFML/System/Android/Activity.cpp @@ -41,14 +41,14 @@ std::streambuf() std::streambuf::int_type LogcatStream::overflow (std::streambuf::int_type c) { - if (c == "\n"[0]) + if (c == '\n') { - m_message.push_back(c); + m_message.push_back(static_cast(c)); LOGE("%s", m_message.c_str()); m_message.clear(); } - m_message.push_back(c); + m_message.push_back(static_cast(c)); return traits_type::not_eof(c); } diff --git a/src/SFML/System/Android/ResourceStream.cpp b/src/SFML/System/Android/ResourceStream.cpp index 9cf81e825..6851e227d 100644 --- a/src/SFML/System/Android/ResourceStream.cpp +++ b/src/SFML/System/Android/ResourceStream.cpp @@ -61,7 +61,7 @@ Int64 ResourceStream::read(void *data, Int64 size) { if (m_file) { - return AAsset_read(m_file, data, size); + return AAsset_read(m_file, data, static_cast(size)); } else { @@ -75,7 +75,7 @@ Int64 ResourceStream::seek(Int64 position) { if (m_file) { - return AAsset_seek(m_file, position, SEEK_SET); + return AAsset_seek(m_file, static_cast(position), SEEK_SET); } else { diff --git a/src/SFML/Window/Android/ClipboardImpl.cpp b/src/SFML/Window/Android/ClipboardImpl.cpp index a82cba089..6fea875cc 100644 --- a/src/SFML/Window/Android/ClipboardImpl.cpp +++ b/src/SFML/Window/Android/ClipboardImpl.cpp @@ -43,7 +43,7 @@ String ClipboardImpl::getString() //////////////////////////////////////////////////////////// -void ClipboardImpl::setString(const String& text) +void ClipboardImpl::setString(const String& /* text */) { sf::err() << "Clipboard API not implemented for Android.\n"; } diff --git a/src/SFML/Window/Android/CursorImpl.cpp b/src/SFML/Window/Android/CursorImpl.cpp index 53d287e88..9d064a743 100644 --- a/src/SFML/Window/Android/CursorImpl.cpp +++ b/src/SFML/Window/Android/CursorImpl.cpp @@ -47,7 +47,7 @@ CursorImpl::~CursorImpl() //////////////////////////////////////////////////////////// -bool CursorImpl::loadFromPixels(const Uint8* pixels, Vector2u size, Vector2u hotspot) +bool CursorImpl::loadFromPixels(const Uint8* /* pixels */, Vector2u /* size */, Vector2u /* hotspot */) { // Not supported return false; @@ -55,7 +55,7 @@ bool CursorImpl::loadFromPixels(const Uint8* pixels, Vector2u size, Vector2u hot //////////////////////////////////////////////////////////// -bool CursorImpl::loadFromSystem(Cursor::Type type) +bool CursorImpl::loadFromSystem(Cursor::Type /* type */) { // Not supported return false; diff --git a/src/SFML/Window/Android/InputImpl.cpp b/src/SFML/Window/Android/InputImpl.cpp index 0c290668e..299f29497 100644 --- a/src/SFML/Window/Android/InputImpl.cpp +++ b/src/SFML/Window/Android/InputImpl.cpp @@ -37,7 +37,7 @@ namespace sf namespace priv { //////////////////////////////////////////////////////////// -bool InputImpl::isKeyPressed(Keyboard::Key key) +bool InputImpl::isKeyPressed(Keyboard::Key /* key */) { // Not applicable return false; @@ -52,7 +52,6 @@ void InputImpl::setVirtualKeyboardVisible(bool visible) std::scoped_lock lock(states.mutex); // Initializes JNI - jint lResult; jint lFlags = 0; JavaVM* lJavaVM = states.activity->vm; @@ -63,7 +62,7 @@ void InputImpl::setVirtualKeyboardVisible(bool visible) lJavaVMAttachArgs.name = "NativeThread"; lJavaVMAttachArgs.group = nullptr; - lResult=lJavaVM->AttachCurrentThread(&lJNIEnv, &lJavaVMAttachArgs); + jint lResult = lJavaVM->AttachCurrentThread(&lJNIEnv, &lJavaVMAttachArgs); if (lResult == JNI_ERR) err() << "Failed to initialize JNI, couldn't switch the keyboard visibility" << std::endl; @@ -105,7 +104,7 @@ void InputImpl::setVirtualKeyboardVisible(bool visible) // Runs lInputMethodManager.showSoftInput(...) jmethodID MethodShowSoftInput = lJNIEnv->GetMethodID(ClassInputMethodManager, "showSoftInput", "(Landroid/view/View;I)Z"); - jboolean lResult = lJNIEnv->CallBooleanMethod(lInputMethodManager, + lJNIEnv->CallBooleanMethod(lInputMethodManager, MethodShowSoftInput, lDecorView, lFlags); } else @@ -121,7 +120,7 @@ void InputImpl::setVirtualKeyboardVisible(bool visible) // lInputMethodManager.hideSoftInput(...) jmethodID MethodHideSoftInput = lJNIEnv->GetMethodID(ClassInputMethodManager, "hideSoftInputFromWindow", "(Landroid/os/IBinder;I)Z"); - jboolean lRes = lJNIEnv->CallBooleanMethod(lInputMethodManager, + lJNIEnv->CallBooleanMethod(lInputMethodManager, MethodHideSoftInput, lBinder, lFlags); lJNIEnv->DeleteLocalRef(lBinder); } @@ -158,21 +157,21 @@ Vector2i InputImpl::getMousePosition() //////////////////////////////////////////////////////////// -Vector2i InputImpl::getMousePosition(const WindowBase& relativeTo) +Vector2i InputImpl::getMousePosition(const WindowBase& /* relativeTo */) { return getMousePosition(); } //////////////////////////////////////////////////////////// -void InputImpl::setMousePosition(const Vector2i& position) +void InputImpl::setMousePosition(const Vector2i& /* position */) { // Injecting events is impossible on Android } //////////////////////////////////////////////////////////// -void InputImpl::setMousePosition(const Vector2i& position, const WindowBase& relativeTo) +void InputImpl::setMousePosition(const Vector2i& position, const WindowBase& /* relativeTo */) { setMousePosition(position); } @@ -186,7 +185,7 @@ bool InputImpl::isTouchDown(unsigned int finger) ActivityStates& states = getActivity(); std::scoped_lock lock(states.mutex); - return states.touchEvents.find(finger) != states.touchEvents.end(); + return states.touchEvents.find(static_cast(finger)) != states.touchEvents.end(); } @@ -198,12 +197,12 @@ Vector2i InputImpl::getTouchPosition(unsigned int finger) ActivityStates& states = getActivity(); std::scoped_lock lock(states.mutex); - return states.touchEvents.find(finger)->second; + return states.touchEvents.find(static_cast(finger))->second; } //////////////////////////////////////////////////////////// -Vector2i InputImpl::getTouchPosition(unsigned int finger, const WindowBase& relativeTo) +Vector2i InputImpl::getTouchPosition(unsigned int finger, const WindowBase& /* relativeTo */) { return getTouchPosition(finger); } diff --git a/src/SFML/Window/Android/JoystickImpl.cpp b/src/SFML/Window/Android/JoystickImpl.cpp index 58dfc829c..802e6f85b 100644 --- a/src/SFML/Window/Android/JoystickImpl.cpp +++ b/src/SFML/Window/Android/JoystickImpl.cpp @@ -48,7 +48,7 @@ void JoystickImpl::cleanup() //////////////////////////////////////////////////////////// -bool JoystickImpl::isConnected(unsigned int index) +bool JoystickImpl::isConnected(unsigned int /* index */) { // To implement return false; @@ -56,7 +56,7 @@ bool JoystickImpl::isConnected(unsigned int index) //////////////////////////////////////////////////////////// -bool JoystickImpl::open(unsigned int index) +bool JoystickImpl::open(unsigned int /* index */) { // To implement return false; diff --git a/src/SFML/Window/Android/JoystickImpl.hpp b/src/SFML/Window/Android/JoystickImpl.hpp index 2fb8cd30e..bad9932fa 100644 --- a/src/SFML/Window/Android/JoystickImpl.hpp +++ b/src/SFML/Window/Android/JoystickImpl.hpp @@ -105,7 +105,6 @@ private: //////////////////////////////////////////////////////////// // Member data //////////////////////////////////////////////////////////// - int m_index; ///< Index of the joystick Joystick::Identification m_identification; ///< Joystick identification }; diff --git a/src/SFML/Window/Android/SensorImpl.cpp b/src/SFML/Window/Android/SensorImpl.cpp index c1dd9ddf8..ec438049f 100644 --- a/src/SFML/Window/Android/SensorImpl.cpp +++ b/src/SFML/Window/Android/SensorImpl.cpp @@ -29,6 +29,12 @@ #include #include +#if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + // Define missing constants #define ASENSOR_TYPE_GRAVITY 0x00000009 #define ASENSOR_TYPE_LINEAR_ACCELERATION 0x0000000a @@ -54,7 +60,11 @@ void SensorImpl::initialize() looper = ALooper_forThread(); // Get the unique sensor manager - sensorManager = ASensorManager_getInstance(); + #if ANDROID_API >= 26 || __ANDROID_API__ >= 26 + sensorManager = ASensorManager_getInstanceForPackage(nullptr); + #else + sensorManager = ASensorManager_getInstance(); + #endif // Create the sensor events queue and attach it to the looper sensorEventQueue = ASensorManager_createEventQueue(sensorManager, looper, @@ -93,7 +103,7 @@ bool SensorImpl::open(Sensor::Type sensor) Time minimumDelay = microseconds(ASensor_getMinDelay(m_sensor)); // Set the event rate (not to consume too much battery) - ASensorEventQueue_setEventRate(sensorEventQueue, m_sensor, minimumDelay.asMicroseconds()); + ASensorEventQueue_setEventRate(sensorEventQueue, m_sensor, static_cast(minimumDelay.asMicroseconds())); // Save the index of the sensor m_index = static_cast(sensor); @@ -145,7 +155,7 @@ ASensor const* SensorImpl::getDefaultSensor(Sensor::Type sensor) //////////////////////////////////////////////////////////// -int SensorImpl::processSensorEvents(int fd, int events, void* data) +int SensorImpl::processSensorEvents(int /* fd */, int /* events */, void* /* sensorData */) { ASensorEvent event; diff --git a/src/SFML/Window/Android/VideoModeImpl.cpp b/src/SFML/Window/Android/VideoModeImpl.cpp index 4522f090f..7bd3bfbd9 100644 --- a/src/SFML/Window/Android/VideoModeImpl.cpp +++ b/src/SFML/Window/Android/VideoModeImpl.cpp @@ -55,7 +55,7 @@ VideoMode VideoModeImpl::getDesktopMode() priv::ActivityStates& states = priv::getActivity(); std::scoped_lock lock(states.mutex); - return VideoMode(states.screenSize.x, states.screenSize.y); + return VideoMode(static_cast(states.screenSize.x), static_cast(states.screenSize.y)); } } // namespace priv diff --git a/src/SFML/Window/Android/WindowImplAndroid.cpp b/src/SFML/Window/Android/WindowImplAndroid.cpp index 8a80135df..eb1edfbf4 100644 --- a/src/SFML/Window/Android/WindowImplAndroid.cpp +++ b/src/SFML/Window/Android/WindowImplAndroid.cpp @@ -49,7 +49,7 @@ namespace priv WindowImplAndroid* WindowImplAndroid::singleInstance = nullptr; //////////////////////////////////////////////////////////// -WindowImplAndroid::WindowImplAndroid(WindowHandle handle) +WindowImplAndroid::WindowImplAndroid(WindowHandle /* handle */) : m_size(0, 0) , m_windowBeingCreated(false) , m_windowBeingDestroyed(false) @@ -59,7 +59,7 @@ WindowImplAndroid::WindowImplAndroid(WindowHandle handle) //////////////////////////////////////////////////////////// -WindowImplAndroid::WindowImplAndroid(VideoMode mode, const String& title, unsigned long style, const ContextSettings& settings) +WindowImplAndroid::WindowImplAndroid(VideoMode mode, const String& /* title */, unsigned long style, const ContextSettings& /* settings */) : m_size(mode.width, mode.height) , m_windowBeingCreated(false) , m_windowBeingDestroyed(false) @@ -132,7 +132,7 @@ Vector2i WindowImplAndroid::getPosition() const //////////////////////////////////////////////////////////// -void WindowImplAndroid::setPosition(const Vector2i& position) +void WindowImplAndroid::setPosition(const Vector2i& /* position */) { // Not applicable } @@ -146,55 +146,55 @@ Vector2u WindowImplAndroid::getSize() const //////////////////////////////////////////////////////////// -void WindowImplAndroid::setSize(const Vector2u& size) +void WindowImplAndroid::setSize(const Vector2u& /* size */) { } //////////////////////////////////////////////////////////// -void WindowImplAndroid::setTitle(const String& title) +void WindowImplAndroid::setTitle(const String& /* title */) { // Not applicable } //////////////////////////////////////////////////////////// -void WindowImplAndroid::setIcon(unsigned int width, unsigned int height, const Uint8* pixels) +void WindowImplAndroid::setIcon(unsigned int /* width */, unsigned int /* height */, const Uint8* /* pixels */) { // Not applicable } //////////////////////////////////////////////////////////// -void WindowImplAndroid::setVisible(bool visible) +void WindowImplAndroid::setVisible(bool /* visible */) { // Not applicable } //////////////////////////////////////////////////////////// -void WindowImplAndroid::setMouseCursorVisible(bool visible) +void WindowImplAndroid::setMouseCursorVisible(bool /* visible */) { // Not applicable } //////////////////////////////////////////////////////////// -void WindowImplAndroid::setMouseCursorGrabbed(bool grabbed) +void WindowImplAndroid::setMouseCursorGrabbed(bool /* grabbed */) { // Not applicable } //////////////////////////////////////////////////////////// -void WindowImplAndroid::setMouseCursor(const CursorImpl& cursor) +void WindowImplAndroid::setMouseCursor(const CursorImpl& /* cursor */) { // Not applicable } //////////////////////////////////////////////////////////// -void WindowImplAndroid::setKeyRepeatEnabled(bool enabled) +void WindowImplAndroid::setKeyRepeatEnabled(bool /* enabled */) { // Not applicable } @@ -223,8 +223,8 @@ void WindowImplAndroid::forwardEvent(const Event& event) if (event.type == Event::GainedFocus) { - WindowImplAndroid::singleInstance->m_size.x = ANativeWindow_getWidth(states.window); - WindowImplAndroid::singleInstance->m_size.y = ANativeWindow_getHeight(states.window); + WindowImplAndroid::singleInstance->m_size.x = static_cast(ANativeWindow_getWidth(states.window)); + WindowImplAndroid::singleInstance->m_size.y = static_cast(ANativeWindow_getHeight(states.window)); WindowImplAndroid::singleInstance->m_windowBeingCreated = true; WindowImplAndroid::singleInstance->m_hasFocus = true; } @@ -240,7 +240,7 @@ void WindowImplAndroid::forwardEvent(const Event& event) //////////////////////////////////////////////////////////// -int WindowImplAndroid::processEvent(int fd, int events, void* data) +int WindowImplAndroid::processEvent(int /* fd */, int /* events */, void* /* data */) { ActivityStates& states = getActivity(); std::scoped_lock lock(states.mutex); @@ -318,7 +318,6 @@ int WindowImplAndroid::processScrollEvent(AInputEvent* _event, ActivityStates& s { // Prepare the Java virtual machine jint lResult; - jint lFlags = 0; JavaVM* lJavaVM = states.activity->vm; JNIEnv* lJNIEnv = states.activity->env; @@ -336,23 +335,33 @@ int WindowImplAndroid::processScrollEvent(AInputEvent* _event, ActivityStates& s } // Retrieve everything we need to create this MotionEvent in Java - jlong downTime = AMotionEvent_getDownTime(_event); - jlong eventTime = AMotionEvent_getEventTime(_event); - jint action = AMotionEvent_getAction(_event); - jfloat x = AMotionEvent_getX(_event, 0); - jfloat y = AMotionEvent_getY(_event, 0); - jfloat pressure = AMotionEvent_getPressure(_event, 0); - jfloat size = AMotionEvent_getSize(_event, 0); - jint metaState = AMotionEvent_getMetaState(_event); - jfloat xPrecision = AMotionEvent_getXPrecision(_event); - jfloat yPrecision = AMotionEvent_getYPrecision(_event); - jint deviceId = AInputEvent_getDeviceId(_event); - jint edgeFlags = AMotionEvent_getEdgeFlags(_event); + Int64 downTime = AMotionEvent_getDownTime(_event); + Int64 eventTime = AMotionEvent_getEventTime(_event); + Int32 action = AMotionEvent_getAction(_event); + float x = AMotionEvent_getX(_event, 0); + float y = AMotionEvent_getY(_event, 0); + float pressure = AMotionEvent_getPressure(_event, 0); + float size = AMotionEvent_getSize(_event, 0); + Int32 metaState = AMotionEvent_getMetaState(_event); + float xPrecision = AMotionEvent_getXPrecision(_event); + float yPrecision = AMotionEvent_getYPrecision(_event); + Int32 deviceId = AInputEvent_getDeviceId(_event); + Int32 edgeFlags = AMotionEvent_getEdgeFlags(_event); // Create the MotionEvent object in Java trough its static constructor obtain() jclass ClassMotionEvent = lJNIEnv->FindClass("android/view/MotionEvent"); jmethodID StaticMethodObtain = lJNIEnv->GetStaticMethodID(ClassMotionEvent, "obtain", "(JJIFFFFIFFII)Landroid/view/MotionEvent;"); - jobject ObjectMotionEvent = lJNIEnv->CallStaticObjectMethod(ClassMotionEvent, StaticMethodObtain, downTime, eventTime, action, x, y, pressure, size, metaState, xPrecision, yPrecision, deviceId, edgeFlags); + // Note: C standard compatibility, varargs + // automatically promote floats to doubles + // even though the function signature declares float + jobject ObjectMotionEvent = lJNIEnv->CallStaticObjectMethod( + ClassMotionEvent, StaticMethodObtain, downTime, + eventTime, action, static_cast(x), + static_cast(y), static_cast(pressure), + static_cast(size), metaState, + static_cast(xPrecision), static_cast(yPrecision), + deviceId, edgeFlags + ); // Call its getAxisValue() method to get the delta value of our wheel move event jmethodID MethodGetAxisValue = lJNIEnv->GetMethodID(ClassMotionEvent, "getAxisValue", "(I)F"); @@ -365,9 +374,9 @@ int WindowImplAndroid::processScrollEvent(AInputEvent* _event, ActivityStates& s Event event; event.type = Event::MouseWheelScrolled; event.mouseWheelScroll.wheel = Mouse::VerticalWheel; - event.mouseWheelScroll.delta = static_cast(delta); - event.mouseWheelScroll.x = AMotionEvent_getX(_event, 0); - event.mouseWheelScroll.y = AMotionEvent_getY(_event, 0); + event.mouseWheelScroll.delta = static_cast(delta); + event.mouseWheelScroll.x = static_cast(AMotionEvent_getX(_event, 0)); + event.mouseWheelScroll.y = static_cast(AMotionEvent_getY(_event, 0)); forwardEvent(event); @@ -379,9 +388,8 @@ int WindowImplAndroid::processScrollEvent(AInputEvent* _event, ActivityStates& s //////////////////////////////////////////////////////////// -int WindowImplAndroid::processKeyEvent(AInputEvent* _event, ActivityStates& states) +int WindowImplAndroid::processKeyEvent(AInputEvent* _event, ActivityStates& /* states */) { - int32_t device = AInputEvent_getSource(_event); int32_t action = AKeyEvent_getAction(_event); int32_t key = AKeyEvent_getKeyCode(_event); @@ -403,10 +411,10 @@ int WindowImplAndroid::processKeyEvent(AInputEvent* _event, ActivityStates& stat event.type = Event::KeyReleased; forwardEvent(event); - if (int unicode = getUnicode(_event)) + if (Uint32 unicode = static_cast(getUnicode(_event))) { event.type = Event::TextEntered; - event.text.unicode = unicode; + event.text.unicode = static_cast(unicode); forwardEvent(event); } return 1; @@ -426,10 +434,10 @@ int WindowImplAndroid::processKeyEvent(AInputEvent* _event, ActivityStates& stat // https://code.google.com/p/android/issues/detail?id=33998 return 0; } - else if (int unicode = getUnicode(_event)) // This is a repeated sequence + else if (Uint32 unicode = static_cast(getUnicode(_event))) // This is a repeated sequence { event.type = Event::TextEntered; - event.text.unicode = unicode; + event.text.unicode = static_cast(unicode); int32_t repeats = AKeyEvent_getRepeatCount(_event); for (int32_t i = 0; i < repeats; ++i) @@ -446,23 +454,22 @@ int WindowImplAndroid::processKeyEvent(AInputEvent* _event, ActivityStates& stat int WindowImplAndroid::processMotionEvent(AInputEvent* _event, ActivityStates& states) { int32_t device = AInputEvent_getSource(_event); - int32_t action = AMotionEvent_getAction(_event); Event event; if (device == AINPUT_SOURCE_MOUSE) event.type = Event::MouseMoved; - else if (device & AINPUT_SOURCE_TOUCHSCREEN) + else if (static_cast(device) & AINPUT_SOURCE_TOUCHSCREEN) event.type = Event::TouchMoved; - int pointerCount = AMotionEvent_getPointerCount(_event); + size_t pointerCount = AMotionEvent_getPointerCount(_event); - for (int p = 0; p < pointerCount; p++) + for (size_t p = 0; p < pointerCount; p++) { - int id = AMotionEvent_getPointerId(_event, p); + int32_t id = AMotionEvent_getPointerId(_event, p); - float x = AMotionEvent_getX(_event, p); - float y = AMotionEvent_getY(_event, p); + int x = static_cast(AMotionEvent_getX(_event, p)); + int y = static_cast(AMotionEvent_getY(_event, p)); if (device == AINPUT_SOURCE_MOUSE) { @@ -471,12 +478,12 @@ int WindowImplAndroid::processMotionEvent(AInputEvent* _event, ActivityStates& s states.mousePosition = Vector2i(event.mouseMove.x, event.mouseMove.y); } - else if (device & AINPUT_SOURCE_TOUCHSCREEN) + else if (static_cast(device) & AINPUT_SOURCE_TOUCHSCREEN) { if (states.touchEvents[id].x == x && states.touchEvents[id].y == y) continue; - event.touch.finger = id; + event.touch.finger = static_cast(id); event.touch.x = x; event.touch.y = y; @@ -495,11 +502,11 @@ int WindowImplAndroid::processPointerEvent(bool isDown, AInputEvent* _event, Act int32_t device = AInputEvent_getSource(_event); int32_t action = AMotionEvent_getAction(_event); - int index = (action & AMOTION_EVENT_ACTION_POINTER_INDEX_MASK) >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT; - int id = AMotionEvent_getPointerId(_event, index); + size_t index = (action & AMOTION_EVENT_ACTION_POINTER_INDEX_MASK) >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT; + int32_t id = AMotionEvent_getPointerId(_event, index); - float x = AMotionEvent_getX(_event, index); - float y = AMotionEvent_getY(_event, index); + int x = static_cast(AMotionEvent_getX(_event, index)); + int y = static_cast(AMotionEvent_getY(_event, index)); Event event; @@ -515,10 +522,10 @@ int WindowImplAndroid::processPointerEvent(bool isDown, AInputEvent* _event, Act if (id >= 0 && id < Mouse::ButtonCount) states.isButtonPressed[id] = true; } - else if (device & AINPUT_SOURCE_TOUCHSCREEN) + else if (static_cast(device) & AINPUT_SOURCE_TOUCHSCREEN) { event.type = Event::TouchBegan; - event.touch.finger = id; + event.touch.finger = static_cast(id); event.touch.x = x; event.touch.y = y; @@ -537,10 +544,10 @@ int WindowImplAndroid::processPointerEvent(bool isDown, AInputEvent* _event, Act if (id >= 0 && id < Mouse::ButtonCount) states.isButtonPressed[id] = false; } - else if (device & AINPUT_SOURCE_TOUCHSCREEN) + else if (static_cast(device) & AINPUT_SOURCE_TOUCHSCREEN) { event.type = Event::TouchEnded; - event.touch.finger = id; + event.touch.finger = static_cast(id); event.touch.x = x; event.touch.y = y; @@ -684,7 +691,6 @@ int WindowImplAndroid::getUnicode(AInputEvent* event) // Initializes JNI jint lResult; - jint lFlags = 0; JavaVM* lJavaVM = states.activity->vm; JNIEnv* lJNIEnv = states.activity->env; diff --git a/src/SFML/Window/EglContext.cpp b/src/SFML/Window/EglContext.cpp index 8e028e3a4..dc46e6f68 100644 --- a/src/SFML/Window/EglContext.cpp +++ b/src/SFML/Window/EglContext.cpp @@ -163,6 +163,8 @@ m_config (nullptr) // Create EGL surface (except on Android because the window is created // asynchronously, its activity manager will call it for us) createSurface(owner->getSystemHandle()); +#else + (void) owner; #endif } diff --git a/src/SFML/Window/FreeBSD/JoystickImpl.cpp b/src/SFML/Window/FreeBSD/JoystickImpl.cpp index fa1c880c5..4987f56db 100644 --- a/src/SFML/Window/FreeBSD/JoystickImpl.cpp +++ b/src/SFML/Window/FreeBSD/JoystickImpl.cpp @@ -123,7 +123,7 @@ namespace name += directoryEntry->d_name; if (isJoystick(name.c_str())) - plugged[joystickCount++] = name; + plugged[static_cast(joystickCount++)] = name; } directoryEntry = readdir(directory); @@ -149,8 +149,8 @@ namespace void hatValueToSfml(int value, sf::priv::JoystickState& state) { - state.axes[sf::Joystick::PovX] = hatValueMap[value].first; - state.axes[sf::Joystick::PovY] = hatValueMap[value].second; + state.axes[sf::Joystick::PovX] = static_cast(hatValueMap[value].first); + state.axes[sf::Joystick::PovY] = static_cast(hatValueMap[value].second); } } @@ -220,7 +220,7 @@ bool JoystickImpl::open(unsigned int index) // Then allocate a buffer for data retrieval m_length = hid_report_size(m_desc, hid_input, m_id); - m_buffer.resize(m_length); + m_buffer.resize(static_cast(m_length)); m_state.connected = true; @@ -292,7 +292,7 @@ Joystick::Identification JoystickImpl::getIdentification() const //////////////////////////////////////////////////////////// JoystickState JoystickImpl::JoystickImpl::update() { - while (read(m_file, m_buffer.data(), m_length) == m_length) + while (read(m_file, m_buffer.data(), static_cast(m_length)) == m_length) { hid_data_t data = hid_start_parse(m_desc, 1 << hid_input, m_id); @@ -328,7 +328,7 @@ JoystickState JoystickImpl::JoystickImpl::update() int maximum = item.logical_maximum; value = (value - minimum) * 200 / (maximum - minimum) - 100; - m_state.axes[axis] = value; + m_state.axes[axis] = static_cast(value); } } } diff --git a/src/SFML/Window/OSX/HIDInputManager.mm b/src/SFML/Window/OSX/HIDInputManager.mm index 1faa933e2..7731da5f7 100644 --- a/src/SFML/Window/OSX/HIDInputManager.mm +++ b/src/SFML/Window/OSX/HIDInputManager.mm @@ -60,7 +60,7 @@ long HIDInputManager::getLocationID(IOHIDDeviceRef device) if (!typeRef || (CFGetTypeID(typeRef) != CFNumberGetTypeID())) return 0; - CFNumberRef locRef = (CFNumberRef)typeRef; + CFNumberRef locRef = static_cast(typeRef); if (!CFNumberGetValue(locRef, kCFNumberLongType, &loc)) return 0; @@ -100,8 +100,7 @@ m_manager(0) { // Get the current keyboard layout TISInputSourceRef tis = TISCopyCurrentKeyboardLayoutInputSource(); - m_layoutData = (CFDataRef)TISGetInputSourceProperty(tis, - kTISPropertyUnicodeKeyLayoutData); + m_layoutData = static_cast(TISGetInputSourceProperty(tis, kTISPropertyUnicodeKeyLayoutData)); if (m_layoutData == 0) { @@ -112,7 +111,7 @@ m_manager(0) // Keep a reference for ourself CFRetain(m_layoutData); - m_layout = (UCKeyboardLayout *)CFDataGetBytePtr(m_layoutData); + m_layout = reinterpret_cast(const_cast(CFDataGetBytePtr(m_layoutData))); // The TIS is no more needed CFRelease(tis); @@ -160,12 +159,12 @@ void HIDInputManager::initializeKeyboard() CFIndex keyboardCount = CFSetGetCount(keyboards); // >= 1 (asserted by copyDevices) // Get an iterable array - CFTypeRef devicesArray[keyboardCount]; - CFSetGetValues(keyboards, devicesArray); + std::vector devicesArray(static_cast(keyboardCount)); + CFSetGetValues(keyboards, &devicesArray[0]); for (CFIndex i = 0; i < keyboardCount; ++i) { - IOHIDDeviceRef keyboard = (IOHIDDeviceRef)devicesArray[i]; + IOHIDDeviceRef keyboard = static_cast(const_cast(devicesArray[static_cast(i)])); loadKeyboard(keyboard); } @@ -202,7 +201,7 @@ void HIDInputManager::loadKeyboard(IOHIDDeviceRef keyboard) // Go through all connected elements. for (CFIndex i = 0; i < keysCount; ++i) { - IOHIDElementRef aKey = (IOHIDElementRef) CFArrayGetValueAtIndex(keys, i); + IOHIDElementRef aKey = static_cast(const_cast(CFArrayGetValueAtIndex(keys, i))); // Skip non-matching keys elements if (IOHIDElementGetUsagePage(aKey) != kHIDPage_KeyboardOrKeypad) @@ -233,7 +232,7 @@ void HIDInputManager::loadKey(IOHIDElementRef key) // Unicode string length is usually less or equal to 4 UniCharCount maxStringLength = 4; UniCharCount actualStringLength = 0; - UniChar unicodeString[maxStringLength]; + std::vector unicodeString(maxStringLength); OSStatus error; @@ -246,7 +245,7 @@ void HIDInputManager::loadKey(IOHIDElementRef key) &deadKeyState, // unused stuff maxStringLength, // our memory limit &actualStringLength, // length of what we get - unicodeString); // what we get + unicodeString.data()); // what we get if (error == noErr) { diff --git a/src/SFML/Window/OSX/HIDJoystickManager.cpp b/src/SFML/Window/OSX/HIDJoystickManager.cpp index f5505617b..a82e5533b 100644 --- a/src/SFML/Window/OSX/HIDJoystickManager.cpp +++ b/src/SFML/Window/OSX/HIDJoystickManager.cpp @@ -85,7 +85,7 @@ m_joystickCount(0) maskArray[0] = mask0; maskArray[1] = mask1; - CFArrayRef mask = CFArrayCreate(nullptr, (const void**)maskArray, 2, nullptr); + CFArrayRef mask = CFArrayCreate(nullptr, reinterpret_cast(maskArray), 2, nullptr); IOHIDManagerSetDeviceMatchingMultiple(m_manager, mask); CFRelease(mask); diff --git a/src/SFML/Window/OSX/InputImpl.mm b/src/SFML/Window/OSX/InputImpl.mm index 4dcebfae3..7ce74b7d2 100644 --- a/src/SFML/Window/OSX/InputImpl.mm +++ b/src/SFML/Window/OSX/InputImpl.mm @@ -58,7 +58,7 @@ namespace priv //////////////////////////////////////////////////////////// SFOpenGLView* getSFOpenGLViewFromSFMLWindow(const WindowBase& window) { - id nsHandle = (id)window.getSystemHandle(); + id nsHandle = static_cast(window.getSystemHandle()); // Get our SFOpenGLView from ... SFOpenGLView* view = nil; @@ -78,7 +78,7 @@ SFOpenGLView* getSFOpenGLViewFromSFMLWindow(const WindowBase& window) { if ([subview isKindOfClass:[SFOpenGLView class]]) { - view = (SFOpenGLView*)subview; + view = static_cast(subview); break; } } @@ -102,7 +102,7 @@ SFOpenGLView* getSFOpenGLViewFromSFMLWindow(const WindowBase& window) { if ([subview isKindOfClass:[SFOpenGLView class]]) { - view = (SFOpenGLView*)subview; + view = static_cast(subview); break; } } @@ -156,8 +156,8 @@ Vector2i InputImpl::getMousePosition() NSPoint pos = [NSEvent mouseLocation]; pos.y = sf::VideoMode::getDesktopMode().height - pos.y; - int scale = [[NSScreen mainScreen] backingScaleFactor]; - return Vector2i(pos.x, pos.y) * scale; + int scale = static_cast([[NSScreen mainScreen] backingScaleFactor]); + return Vector2i(static_cast(pos.x), static_cast(pos.y)) * scale; } @@ -174,8 +174,8 @@ Vector2i InputImpl::getMousePosition(const WindowBase& relativeTo) // Use -cursorPositionFromEvent: with nil. NSPoint pos = [view cursorPositionFromEvent:nil]; - int scale = [view displayScaleFactor]; - return Vector2i(pos.x, pos.y) * scale; + int scale = static_cast([view displayScaleFactor]); + return Vector2i(static_cast(pos.x), static_cast(pos.y)) * scale; } @@ -184,7 +184,7 @@ void InputImpl::setMousePosition(const Vector2i& position) { AutoreleasePool pool; // Here we don't need to reverse the coordinates. - int scale = [[NSScreen mainScreen] backingScaleFactor]; + int scale = static_cast([[NSScreen mainScreen] backingScaleFactor]); CGPoint pos = CGPointMake(position.x / scale, position.y / scale); // Place the cursor. @@ -209,10 +209,10 @@ void InputImpl::setMousePosition(const Vector2i& position, const WindowBase& rel return; // Let SFOpenGLView compute the position in global coordinate - int scale = [view displayScaleFactor]; + int scale = static_cast([view displayScaleFactor]); NSPoint p = NSMakePoint(position.x / scale, position.y / scale); p = [view computeGlobalPositionOfRelativePoint:p]; - setMousePosition(sf::Vector2i(p.x, p.y) * scale); + setMousePosition(sf::Vector2i(static_cast(p.x), static_cast(p.y)) * scale); } diff --git a/src/SFML/Window/OSX/JoystickImpl.cpp b/src/SFML/Window/OSX/JoystickImpl.cpp index 5a81782b8..56c5e8a1c 100644 --- a/src/SFML/Window/OSX/JoystickImpl.cpp +++ b/src/SFML/Window/OSX/JoystickImpl.cpp @@ -44,7 +44,7 @@ namespace std::string stringFromCFString(CFStringRef cfString) { CFIndex length = CFStringGetLength(cfString); - std::vector str(length); + std::vector str(static_cast(length)); CFIndex maxSize = CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8); CFStringGetCString(cfString, str.data(), maxSize, kCFStringEncodingUTF8); return str.data(); @@ -72,8 +72,8 @@ namespace if (typeRef && (CFGetTypeID(typeRef) == CFNumberGetTypeID())) { SInt32 value; - CFNumberGetValue((CFNumberRef)typeRef, kCFNumberSInt32Type, &value); - return value; + CFNumberGetValue(static_cast(typeRef), kCFNumberSInt32Type, &value); + return static_cast(value); } sf::err() << "Unable to read uint value for property '" << stringFromCFString(prop) << "' for joystick at index " << index << std::endl; @@ -143,15 +143,15 @@ bool JoystickImpl::isConnected(unsigned int index) CFIndex size = CFSetGetCount(devices); if (size > 0) { - CFTypeRef array[size]; // array of IOHIDDeviceRef - CFSetGetValues(devices, array); + std::vector array(static_cast(size)); // array of IOHIDDeviceRef + CFSetGetValues(devices, array.data()); // If there exists a device d s.t. there is no j s.t. // m_locationIDs[j] == d's location then we have a new device. for (CFIndex didx(0); !state && didx < size; ++didx) { - IOHIDDeviceRef d = (IOHIDDeviceRef)array[didx]; + IOHIDDeviceRef d = static_cast(const_cast(array[static_cast(didx)])); Location dloc = HIDInputManager::getLocationID(d); bool foundJ = false; @@ -194,14 +194,14 @@ bool JoystickImpl::open(unsigned int index) // Get a usable copy of the joysticks devices. CFIndex joysticksCount = CFSetGetCount(devices); - CFTypeRef devicesArray[joysticksCount]; - CFSetGetValues(devices, devicesArray); + std::vector devicesArray(static_cast(joysticksCount)); + CFSetGetValues(devices, devicesArray.data()); // Get the desired joystick. IOHIDDeviceRef self = 0; for (CFIndex i(0); self == 0 && i < joysticksCount; ++i) { - IOHIDDeviceRef d = (IOHIDDeviceRef)devicesArray[i]; + IOHIDDeviceRef d = static_cast(const_cast(devicesArray[static_cast(i)])); if (deviceLoc == HIDInputManager::getLocationID(d)) self = d; } @@ -229,7 +229,7 @@ bool JoystickImpl::open(unsigned int index) CFIndex elementsCount = CFArrayGetCount(elements); for (int i = 0; i < elementsCount; ++i) { - IOHIDElementRef element = (IOHIDElementRef) CFArrayGetValueAtIndex(elements, i); + IOHIDElementRef element = static_cast(const_cast(CFArrayGetValueAtIndex(elements, i))); switch (IOHIDElementGetUsagePage(element)) { case kHIDPage_GenericDesktop: @@ -359,7 +359,7 @@ JoystickCaps JoystickImpl::getCapabilities() const JoystickCaps caps; // Buttons: - caps.buttonCount = m_buttons.size(); + caps.buttonCount = static_cast(m_buttons.size()); // Axis: for (const auto& [axis, iohidElementRef] : m_axis) @@ -401,14 +401,14 @@ JoystickState JoystickImpl::update() // Get a usable copy of the joysticks devices. CFIndex joysticksCount = CFSetGetCount(devices); - CFTypeRef devicesArray[joysticksCount]; - CFSetGetValues(devices, devicesArray); + std::vector devicesArray(static_cast(joysticksCount)); + CFSetGetValues(devices, devicesArray.data()); // Search for it bool found = false; for (CFIndex i(0); !found && i < joysticksCount; ++i) { - IOHIDDeviceRef d = (IOHIDDeviceRef)devicesArray[i]; + IOHIDDeviceRef d = static_cast(const_cast(devicesArray[static_cast(i)])); if (selfLoc == HIDInputManager::getLocationID(d)) found = true; } @@ -459,12 +459,12 @@ JoystickState JoystickImpl::update() // This method might not be very accurate (the "0 position" can be // slightly shift with some device) but we don't care because most // of devices are so sensitive that this is not relevant. - double physicalMax = IOHIDElementGetPhysicalMax(iohidElementRef); - double physicalMin = IOHIDElementGetPhysicalMin(iohidElementRef); + double physicalMax = static_cast(IOHIDElementGetPhysicalMax(iohidElementRef)); + double physicalMin = static_cast(IOHIDElementGetPhysicalMin(iohidElementRef)); double scaledMin = -100; double scaledMax = 100; double physicalValue = IOHIDValueGetScaledValue(value, kIOHIDValueScaleTypePhysical); - float scaledValue = (((physicalValue - physicalMin) * (scaledMax - scaledMin)) / (physicalMax - physicalMin)) + scaledMin; + float scaledValue = static_cast((((physicalValue - physicalMin) * (scaledMax - scaledMin)) / (physicalMax - physicalMin)) + scaledMin); state.axes[axis] = scaledValue; } diff --git a/src/SFML/Window/OSX/NSImage+raw.mm b/src/SFML/Window/OSX/NSImage+raw.mm index 4656bc871..987368dab 100644 --- a/src/SFML/Window/OSX/NSImage+raw.mm +++ b/src/SFML/Window/OSX/NSImage+raw.mm @@ -35,8 +35,8 @@ // Create an empty image representation. NSBitmapImageRep* bitmap = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:0 // if 0: only allocate memory - pixelsWide:size.width - pixelsHigh:size.height + pixelsWide:(static_cast(size.width)) + pixelsHigh:(static_cast(size.height)) bitsPerSample:8 // The number of bits used to specify // one pixel in a single component of the data. samplesPerPixel:4 // 3 if no alpha, 4 with it diff --git a/src/SFML/Window/OSX/SFApplication.m b/src/SFML/Window/OSX/SFApplication.m index 8365c3a2d..986786225 100644 --- a/src/SFML/Window/OSX/SFApplication.m +++ b/src/SFML/Window/OSX/SFApplication.m @@ -28,6 +28,14 @@ //////////////////////////////////////////////////////////// #import +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + //////////////////////////////////////////////////////////// @implementation SFApplication diff --git a/src/SFML/Window/OSX/SFApplicationDelegate.m b/src/SFML/Window/OSX/SFApplicationDelegate.m index 86d74fdc5..9e57b7a04 100644 --- a/src/SFML/Window/OSX/SFApplicationDelegate.m +++ b/src/SFML/Window/OSX/SFApplicationDelegate.m @@ -28,6 +28,14 @@ //////////////////////////////////////////////////////////// #import +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + //////////////////////////////////////////////////////////// @implementation SFApplicationDelegate diff --git a/src/SFML/Window/OSX/SFContext.mm b/src/SFML/Window/OSX/SFContext.mm index 80b2aad23..2195b5913 100644 --- a/src/SFML/Window/OSX/SFContext.mm +++ b/src/SFML/Window/OSX/SFContext.mm @@ -33,6 +33,14 @@ #include #include +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + namespace sf { namespace priv @@ -184,14 +192,14 @@ void SFContext::createContext(SFContext* shared, if (bitsPerPixel > 24) { attrs.push_back(NSOpenGLPFAAlphaSize); - attrs.push_back((NSOpenGLPixelFormatAttribute)8); + attrs.push_back(static_cast(8)); } attrs.push_back(NSOpenGLPFADepthSize); - attrs.push_back((NSOpenGLPixelFormatAttribute)m_settings.depthBits); + attrs.push_back(static_cast(m_settings.depthBits)); attrs.push_back(NSOpenGLPFAStencilSize); - attrs.push_back((NSOpenGLPixelFormatAttribute)m_settings.stencilBits); + attrs.push_back(static_cast(m_settings.stencilBits)); if (m_settings.antialiasingLevel > 0) { @@ -211,11 +219,11 @@ void SFContext::createContext(SFContext* shared, // Only one buffer is currently available attrs.push_back(NSOpenGLPFASampleBuffers); - attrs.push_back((NSOpenGLPixelFormatAttribute)1); + attrs.push_back(static_cast(1)); // Antialiasing level attrs.push_back(NSOpenGLPFASamples); - attrs.push_back((NSOpenGLPixelFormatAttribute)m_settings.antialiasingLevel); + attrs.push_back(static_cast(m_settings.antialiasingLevel)); // No software renderer - only hardware renderer attrs.push_back(NSOpenGLPFAAccelerated); @@ -232,7 +240,7 @@ void SFContext::createContext(SFContext* shared, if (legacy) { - m_settings.attributeFlags &= ~ContextSettings::Core; + m_settings.attributeFlags &= ~static_cast(ContextSettings::Core); m_settings.majorVersion = 2; m_settings.minorVersion = 1; attrs.push_back(NSOpenGLPFAOpenGLProfile); @@ -254,10 +262,10 @@ void SFContext::createContext(SFContext* shared, if (m_settings.attributeFlags & ContextSettings::Debug) { sf::err() << "Warning. OpenGL debugging not supported on this platform." << std::endl; - m_settings.attributeFlags &= ~ContextSettings::Debug; + m_settings.attributeFlags &= ~static_cast(ContextSettings::Debug); } - attrs.push_back((NSOpenGLPixelFormatAttribute)0); // end of array + attrs.push_back(static_cast(0)); // end of array // All OS X pixel formats are sRGB capable m_settings.sRgbCapable = true; diff --git a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm index 5c73daeb0..17b37c4cd 100644 --- a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm +++ b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm @@ -30,6 +30,14 @@ #import +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + //////////////////////////////////////////////////////////// /// Here are define the mask value for the 'modifiers' diff --git a/src/SFML/Window/OSX/SFOpenGLView+keyboard.mm b/src/SFML/Window/OSX/SFOpenGLView+keyboard.mm index 193d12c7e..787dc1627 100644 --- a/src/SFML/Window/OSX/SFOpenGLView+keyboard.mm +++ b/src/SFML/Window/OSX/SFOpenGLView+keyboard.mm @@ -33,6 +33,14 @@ #import #import +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + //////////////////////////////////////////////////////////// /// In this file, we implement keyboard handling for SFOpenGLView /// diff --git a/src/SFML/Window/OSX/SFOpenGLView+mouse.mm b/src/SFML/Window/OSX/SFOpenGLView+mouse.mm index e505dfd61..35344ecdb 100644 --- a/src/SFML/Window/OSX/SFOpenGLView+mouse.mm +++ b/src/SFML/Window/OSX/SFOpenGLView+mouse.mm @@ -32,6 +32,14 @@ #import #import +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + //////////////////////////////////////////////////////////// /// In this file, we implement mouse handling for SFOpenGLView @@ -136,7 +144,7 @@ NSPoint loc = [self cursorPositionFromEvent:theEvent]; if (button != sf::Mouse::ButtonCount) - m_requester->mouseDownAt(button, loc.x, loc.y); + m_requester->mouseDownAt(button, static_cast(loc.x), static_cast(loc.y)); } } @@ -181,7 +189,7 @@ NSPoint loc = [self cursorPositionFromEvent:theEvent]; if (button != sf::Mouse::ButtonCount) - m_requester->mouseUpAt(button, loc.x, loc.y); + m_requester->mouseUpAt(button, static_cast(loc.x), static_cast(loc.y)); } } @@ -242,7 +250,7 @@ // when the mouse is dragged. That would be too easy!) [self updateMouseState]; if ((m_requester != 0) && m_mouseIsIn) - m_requester->mouseMovedAt(loc.x, loc.y); + m_requester->mouseMovedAt(static_cast(loc.x), static_cast(loc.y)); } @@ -290,7 +298,7 @@ { NSScreen* screen = [[self window] screen]; NSNumber* displayId = [[screen deviceDescription] objectForKey:@"NSScreenNumber"]; - return [displayId intValue]; + return static_cast([displayId intValue]); } @@ -300,7 +308,7 @@ if (m_requester != 0) { NSPoint loc = [self cursorPositionFromEvent:theEvent]; - m_requester->mouseWheelScrolledAt([theEvent deltaX], [theEvent deltaY], loc.x, loc.y); + m_requester->mouseWheelScrolledAt(static_cast([theEvent deltaX]), static_cast([theEvent deltaY]), static_cast(loc.x), static_cast(loc.y)); } // Transmit to non-SFML responder @@ -396,7 +404,7 @@ NSPoint loc = [self convertPoint:rawPos fromView:nil]; // Don't forget to change to SFML coord system. - float h = [self frame].size.height; + const double h = [self frame].size.height; loc.y = h - loc.y; return loc; diff --git a/src/SFML/Window/OSX/SFOpenGLView.h b/src/SFML/Window/OSX/SFOpenGLView.h index 38145f5a0..632fd8e0e 100644 --- a/src/SFML/Window/OSX/SFOpenGLView.h +++ b/src/SFML/Window/OSX/SFOpenGLView.h @@ -28,6 +28,16 @@ //////////////////////////////////////////////////////////// #import +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + namespace sf { namespace priv { class WindowImplCocoa; @@ -199,3 +209,11 @@ namespace sf { -(void)updateCursorGrabbed; @end + +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic pop + #elif defined(__GNUC__) + #pragma GCC diagnostic pop + #endif +#endif diff --git a/src/SFML/Window/OSX/SFOpenGLView.mm b/src/SFML/Window/OSX/SFOpenGLView.mm index e0245a8e4..ec7c9b7ec 100644 --- a/src/SFML/Window/OSX/SFOpenGLView.mm +++ b/src/SFML/Window/OSX/SFOpenGLView.mm @@ -33,6 +33,14 @@ #import #import +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + //////////////////////////////////////////////////////////// /// SFOpenGLView class: Privates Methods Declaration @@ -214,7 +222,7 @@ point = [self convertPointToScreen:point]; // Flip screen coordinates to match CGDisplayMoveCursorToPoint referential. - const float screenHeight = [[[self window] screen] frame].size.height; + const double screenHeight = [[[self window] screen] frame].size.height; point.y = screenHeight - point.y; return point; @@ -239,7 +247,7 @@ // Send a resize event if the scaling factor changed if ((m_scaleFactor != oldScaleFactor) && (m_requester != 0)) { NSSize newSize = [self frame].size; - m_requester->windowResized(newSize.width, newSize.height); + m_requester->windowResized(static_cast(newSize.width), static_cast(newSize.height)); } } @@ -271,7 +279,7 @@ // The new size NSSize newSize = [self frame].size; - m_requester->windowResized(newSize.width, newSize.height); + m_requester->windowResized(static_cast(newSize.width), static_cast(newSize.height)); } //////////////////////////////////////////////////////// diff --git a/src/SFML/Window/OSX/SFViewController.mm b/src/SFML/Window/OSX/SFViewController.mm index e3fe8ce98..f24eba310 100644 --- a/src/SFML/Window/OSX/SFViewController.mm +++ b/src/SFML/Window/OSX/SFViewController.mm @@ -33,6 +33,14 @@ #import #import +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + @implementation SFViewController diff --git a/src/SFML/Window/OSX/SFWindowController.mm b/src/SFML/Window/OSX/SFWindowController.mm index ea05f15e8..55d7cf336 100644 --- a/src/SFML/Window/OSX/SFWindowController.mm +++ b/src/SFML/Window/OSX/SFWindowController.mm @@ -42,6 +42,14 @@ #import #import +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + //////////////////////////////////////////////////////////// /// SFBlackView is a simple view filled with black, nothing more /// @@ -153,7 +161,7 @@ m_window = nil; m_oglView = nil; m_requester = 0; - m_fullscreen = (style & sf::Style::Fullscreen); + m_fullscreen = ((style & sf::Style::Fullscreen) != 0) ? YES : NO; m_restoreResize = NO; m_highDpi = NO; @@ -359,7 +367,7 @@ -(void)setCursorGrabbed:(BOOL)grabbed { // Remove or restore resizeable style if needed - BOOL resizeable = [m_window styleMask] & NSResizableWindowMask; + BOOL resizeable = (([m_window styleMask] & NSResizableWindowMask) != 0) ? YES : NO; if (grabbed && resizeable) { m_restoreResize = YES; @@ -403,7 +411,7 @@ CGFloat y = screen.origin.y + [m_oglView frame].size.height; // Flip y-axis (titlebar was already taken into account above) - y = [self screenHeight] - y; + y = static_cast([self screenHeight]) - y; return NSMakePoint(x, y); } @@ -415,7 +423,7 @@ NSPoint point = NSMakePoint(x, y); // Flip for SFML window coordinate system and take titlebar into account - point.y = [self screenHeight] - point.y + [self titlebarHeight]; + point.y = static_cast([self screenHeight]) - point.y + static_cast([self titlebarHeight]); // Place the window. [m_window setFrameTopLeftPoint:point]; @@ -461,7 +469,7 @@ [m_window setStyleMask:styleMask ^ NSResizableWindowMask]; // Add titlebar height. - height += [self titlebarHeight]; + height += static_cast([self titlebarHeight]); // Corner case: don't set the window height bigger than the screen height // or the view will be resized _later_ without generating a resize event. @@ -469,11 +477,11 @@ CGFloat maxVisibleHeight = screenFrame.size.height; if (height > maxVisibleHeight) { - height = maxVisibleHeight; + height = static_cast(maxVisibleHeight); // The size is not the requested one, we fire an event if (m_requester != 0) - m_requester->windowResized(width, height - [self titlebarHeight]); + m_requester->windowResized(width, height - static_cast([self titlebarHeight])); } NSRect frame = NSMakeRect([m_window frame].origin.x, @@ -621,16 +629,16 @@ { NSDictionary* deviceDescription = [[m_window screen] deviceDescription]; NSNumber* screenNumber = [deviceDescription valueForKey:@"NSScreenNumber"]; - CGDirectDisplayID screenID = (CGDirectDisplayID)[screenNumber intValue]; + CGDirectDisplayID screenID = static_cast([screenNumber intValue]); CGFloat height = CGDisplayPixelsHigh(screenID); - return height; + return static_cast(height); } //////////////////////////////////////////////////////// -(float)titlebarHeight { - return NSHeight([m_window frame]) - NSHeight([[m_window contentView] frame]); + return static_cast(NSHeight([m_window frame]) - NSHeight([[m_window contentView] frame])); } @end diff --git a/src/SFML/Window/OSX/Scaling.h b/src/SFML/Window/OSX/Scaling.h index 975a3f03d..cb54a1a7b 100644 --- a/src/SFML/Window/OSX/Scaling.h +++ b/src/SFML/Window/OSX/Scaling.h @@ -54,7 +54,7 @@ inline CGFloat getDefaultScaleFactor() template void scaleIn(T& in, id delegate) { - in /= delegate ? [delegate displayScaleFactor] : getDefaultScaleFactor(); + in /= static_cast(delegate ? [delegate displayScaleFactor] : getDefaultScaleFactor()); } template @@ -81,7 +81,7 @@ void scaleInXY(T& in, id delegate) template void scaleOut(T& out, id delegate) { - out *= delegate ? [delegate displayScaleFactor] : getDefaultScaleFactor(); + out = out * static_cast(delegate ? [delegate displayScaleFactor] : getDefaultScaleFactor()); } template diff --git a/src/SFML/Window/OSX/VideoModeImpl.cpp b/src/SFML/Window/OSX/VideoModeImpl.cpp index 92cf46c88..ab9fc6d4e 100644 --- a/src/SFML/Window/OSX/VideoModeImpl.cpp +++ b/src/SFML/Window/OSX/VideoModeImpl.cpp @@ -56,7 +56,7 @@ std::vector VideoModeImpl::getFullscreenModes() const CFIndex modesCount = CFArrayGetCount(cgmodes); for (CFIndex i = 0; i < modesCount; i++) { - CGDisplayModeRef cgmode = (CGDisplayModeRef)CFArrayGetValueAtIndex(cgmodes, i); + CGDisplayModeRef cgmode = static_cast(const_cast(CFArrayGetValueAtIndex(cgmodes, i))); VideoMode mode = convertCGModeToSFMode(cgmode); diff --git a/src/SFML/Window/OSX/WindowImplCocoa.hpp b/src/SFML/Window/OSX/WindowImplCocoa.hpp index 028147ee0..fa94989cc 100644 --- a/src/SFML/Window/OSX/WindowImplCocoa.hpp +++ b/src/SFML/Window/OSX/WindowImplCocoa.hpp @@ -32,6 +32,16 @@ #include #include +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + //////////////////////////////////////////////////////////// /// Predefine OBJ-C classes //////////////////////////////////////////////////////////// @@ -374,5 +384,12 @@ private: } // namespace sf +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic pop + #elif defined(__GNUC__) + #pragma GCC diagnostic pop + #endif +#endif #endif // SFML_WINDOWIMPLCOCOA_HPP diff --git a/src/SFML/Window/OSX/WindowImplCocoa.mm b/src/SFML/Window/OSX/WindowImplCocoa.mm index 4e6ef1d81..f79b792f0 100644 --- a/src/SFML/Window/OSX/WindowImplCocoa.mm +++ b/src/SFML/Window/OSX/WindowImplCocoa.mm @@ -89,7 +89,7 @@ m_showCursor(true) { AutoreleasePool pool; // Treat the handle as it real type - id nsHandle = (id)handle; + id nsHandle = static_cast(handle); if ([nsHandle isKindOfClass:[NSWindow class]]) { // We have a window. @@ -409,7 +409,7 @@ Vector2i WindowImplCocoa::getPosition() const { AutoreleasePool pool; NSPoint pos = [m_delegate position]; - sf::Vector2i ret(pos.x, pos.y); + sf::Vector2i ret(static_cast(pos.x), static_cast(pos.y)); scaleOutXY(ret, m_delegate); return ret; } @@ -430,7 +430,7 @@ Vector2u WindowImplCocoa::getSize() const { AutoreleasePool pool; NSSize size = [m_delegate size]; - Vector2u ret(size.width, size.height); + Vector2u ret(static_cast(size.width), static_cast(size.height)); scaleOutXY(ret, m_delegate); return ret; } diff --git a/src/SFML/Window/OSX/WindowImplDelegateProtocol.h b/src/SFML/Window/OSX/WindowImplDelegateProtocol.h index dd767f5e8..ba3194840 100644 --- a/src/SFML/Window/OSX/WindowImplDelegateProtocol.h +++ b/src/SFML/Window/OSX/WindowImplDelegateProtocol.h @@ -31,6 +31,16 @@ #import +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + namespace sf { namespace priv { class WindowImplCocoa; @@ -232,3 +242,11 @@ namespace sf { -(void)applyContext:(NSOpenGLContext*)context; @end + +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic pop + #elif defined(__GNUC__) + #pragma GCC diagnostic pop + #endif +#endif diff --git a/src/SFML/Window/OSX/cg_sf_conversion.mm b/src/SFML/Window/OSX/cg_sf_conversion.mm index 9f2aee0a5..54b4bf110 100644 --- a/src/SFML/Window/OSX/cg_sf_conversion.mm +++ b/src/SFML/Window/OSX/cg_sf_conversion.mm @@ -31,6 +31,14 @@ #import +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + namespace sf { namespace priv @@ -87,7 +95,7 @@ VideoMode convertCGModeToSFMode(CGDisplayModeRef cgmode) // // [1]: "APIs for Supporting High Resolution" > "Additions and Changes for OS X v10.8" // https://developer.apple.com/library/mac/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/APIs/APIs.html#//apple_ref/doc/uid/TP40012302-CH5-SW27 - VideoMode mode(CGDisplayModeGetWidth(cgmode), CGDisplayModeGetHeight(cgmode), modeBitsPerPixel(cgmode)); + VideoMode mode(static_cast(CGDisplayModeGetWidth(cgmode)), static_cast(CGDisplayModeGetHeight(cgmode)), static_cast(modeBitsPerPixel(cgmode))); scaleOutWidthHeight(mode, nil); return mode; } diff --git a/src/SFML/Window/OSX/cpp_objc_conversion.mm b/src/SFML/Window/OSX/cpp_objc_conversion.mm index 39de033ec..e3d58a857 100644 --- a/src/SFML/Window/OSX/cpp_objc_conversion.mm +++ b/src/SFML/Window/OSX/cpp_objc_conversion.mm @@ -44,7 +44,7 @@ NSString* stringToNSString(const std::string& string) //////////////////////////////////////////////////////////// NSString* sfStringToNSString(const sf::String& string) { - sf::Uint32 length = string.getSize() * sizeof(sf::Uint32); + sf::Uint32 length = static_cast(string.getSize() * sizeof(sf::Uint32)); const void* data = reinterpret_cast(string.getData()); NSStringEncoding encoding; diff --git a/src/SFML/Window/Vulkan.cpp b/src/SFML/Window/Vulkan.cpp index a109d35d6..564104684 100644 --- a/src/SFML/Window/Vulkan.cpp +++ b/src/SFML/Window/Vulkan.cpp @@ -51,6 +51,7 @@ bool Vulkan::isAvailable(bool requireGraphics) { #if defined(SFML_VULKAN_IMPLEMENTATION_NOT_AVAILABLE) + (void) requireGraphics; return false; #else @@ -66,6 +67,7 @@ VulkanFunctionPointer Vulkan::getFunction(const char* name) { #if defined(SFML_VULKAN_IMPLEMENTATION_NOT_AVAILABLE) + (void) name; return nullptr; #else diff --git a/src/SFML/Window/WindowImpl.cpp b/src/SFML/Window/WindowImpl.cpp index dd85d610c..4b83a815b 100644 --- a/src/SFML/Window/WindowImpl.cpp +++ b/src/SFML/Window/WindowImpl.cpp @@ -288,6 +288,9 @@ bool WindowImpl::createVulkanSurface(const VkInstance& instance, VkSurfaceKHR& s { #if defined(SFML_VULKAN_IMPLEMENTATION_NOT_AVAILABLE) + (void) instance; + (void) surface; + (void) allocator; return false; #else diff --git a/src/SFML/Window/iOS/CursorImpl.cpp b/src/SFML/Window/iOS/CursorImpl.cpp index 35249dd10..a8c06883f 100644 --- a/src/SFML/Window/iOS/CursorImpl.cpp +++ b/src/SFML/Window/iOS/CursorImpl.cpp @@ -47,7 +47,7 @@ CursorImpl::~CursorImpl() //////////////////////////////////////////////////////////// -bool CursorImpl::loadFromPixels(const Uint8* pixels, Vector2u size, Vector2u hotspot) +bool CursorImpl::loadFromPixels(const Uint8* /* pixels */, Vector2u /* size */, Vector2u /* hotspot */) { // Not supported return false; @@ -55,7 +55,7 @@ bool CursorImpl::loadFromPixels(const Uint8* pixels, Vector2u size, Vector2u hot //////////////////////////////////////////////////////////// -bool CursorImpl::loadFromSystem(Cursor::Type type) +bool CursorImpl::loadFromSystem(Cursor::Type /* type */) { // Not supported return false; diff --git a/src/SFML/Window/iOS/EaglContext.mm b/src/SFML/Window/iOS/EaglContext.mm index 93fef51c3..eec33e72b 100644 --- a/src/SFML/Window/iOS/EaglContext.mm +++ b/src/SFML/Window/iOS/EaglContext.mm @@ -35,6 +35,14 @@ #include #include +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + namespace { @@ -114,8 +122,8 @@ m_clock () //////////////////////////////////////////////////////////// -EaglContext::EaglContext(EaglContext* shared, const ContextSettings& settings, - unsigned int width, unsigned int height) : +EaglContext::EaglContext(EaglContext* /* shared */, const ContextSettings& /* settings */, + unsigned int /* width */, unsigned int /* height */) : m_context (nil), m_framebuffer (0), m_colorbuffer (0), @@ -171,7 +179,7 @@ GlFunctionPointer EaglContext::getFunction(const char* name) "/System/Library/Frameworks/OpenGLES.framework/OpenGLES", "OpenGLES.framework/OpenGLES" }; - + for (int i = 0; i < libCount; ++i) { if (!module) @@ -179,7 +187,8 @@ GlFunctionPointer EaglContext::getFunction(const char* name) } if (module) - return reinterpret_cast(dlsym(module, name)); + return reinterpret_cast( + reinterpret_cast(dlsym(module, name))); return 0; } @@ -205,7 +214,7 @@ void EaglContext::recreateRenderBuffers(SFView* glView) glGenRenderbuffersOESFunc(1, &m_colorbuffer); glBindRenderbufferOESFunc(GL_RENDERBUFFER_OES, m_colorbuffer); if (glView) - [m_context renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:(CAEAGLLayer*)glView.layer]; + [m_context renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:(static_cast(glView.layer))]; glFramebufferRenderbufferOESFunc(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, m_colorbuffer); // Create a depth buffer if requested @@ -278,7 +287,7 @@ void EaglContext::setVerticalSyncEnabled(bool enabled) //////////////////////////////////////////////////////////// void EaglContext::createContext(EaglContext* shared, const WindowImplUIKit* window, - unsigned int bitsPerPixel, + unsigned int /* bitsPerPixel */, const ContextSettings& settings) { // Save the settings diff --git a/src/SFML/Window/iOS/InputImpl.mm b/src/SFML/Window/iOS/InputImpl.mm index 795435ad0..b445f39ef 100644 --- a/src/SFML/Window/iOS/InputImpl.mm +++ b/src/SFML/Window/iOS/InputImpl.mm @@ -37,7 +37,7 @@ namespace sf namespace priv { //////////////////////////////////////////////////////////// -bool InputImpl::isKeyPressed(Keyboard::Key key) +bool InputImpl::isKeyPressed(Keyboard::Key /* key */) { // Not applicable return false; @@ -52,7 +52,7 @@ void InputImpl::setVirtualKeyboardVisible(bool visible) //////////////////////////////////////////////////////////// -bool InputImpl::isMouseButtonPressed(Mouse::Button button) +bool InputImpl::isMouseButtonPressed(Mouse::Button /* button */) { // Not applicable return false; @@ -67,23 +67,21 @@ Vector2i InputImpl::getMousePosition() //////////////////////////////////////////////////////////// -Vector2i InputImpl::getMousePosition(const WindowBase& relativeTo) +Vector2i InputImpl::getMousePosition(const WindowBase& /* relativeTo */) { - (void)relativeTo; - return getMousePosition(); } //////////////////////////////////////////////////////////// -void InputImpl::setMousePosition(const Vector2i& position) +void InputImpl::setMousePosition(const Vector2i& /* position */) { // Not applicable } //////////////////////////////////////////////////////////// -void InputImpl::setMousePosition(const Vector2i& position, const WindowBase& relativeTo) +void InputImpl::setMousePosition(const Vector2i& /* position */, const WindowBase& /* relativeTo */) { // Not applicable } @@ -104,10 +102,8 @@ Vector2i InputImpl::getTouchPosition(unsigned int finger) //////////////////////////////////////////////////////////// -Vector2i InputImpl::getTouchPosition(unsigned int finger, const WindowBase& relativeTo) +Vector2i InputImpl::getTouchPosition(unsigned int finger, const WindowBase& /* relativeTo */) { - (void)relativeTo; - return getTouchPosition(finger); } diff --git a/src/SFML/Window/iOS/JoystickImpl.mm b/src/SFML/Window/iOS/JoystickImpl.mm index 7be01bba4..239eaf5d1 100644 --- a/src/SFML/Window/iOS/JoystickImpl.mm +++ b/src/SFML/Window/iOS/JoystickImpl.mm @@ -47,7 +47,7 @@ void JoystickImpl::cleanup() //////////////////////////////////////////////////////////// -bool JoystickImpl::isConnected(unsigned int index) +bool JoystickImpl::isConnected(unsigned int /* index */) { // Not implemented return false; @@ -55,7 +55,7 @@ bool JoystickImpl::isConnected(unsigned int index) //////////////////////////////////////////////////////////// -bool JoystickImpl::open(unsigned int index) +bool JoystickImpl::open(unsigned int /* index */) { // Not implemented return false; diff --git a/src/SFML/Window/iOS/SFAppDelegate.mm b/src/SFML/Window/iOS/SFAppDelegate.mm index 90f17ff89..5e8344c82 100644 --- a/src/SFML/Window/iOS/SFAppDelegate.mm +++ b/src/SFML/Window/iOS/SFAppDelegate.mm @@ -171,7 +171,26 @@ namespace if (!self.sfWindow) return false; +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wold-style-cast" + #elif defined(__GNUC__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wold-style-cast" + #endif +#endif + UIViewController* rootViewController = [((__bridge UIWindow*)(self.sfWindow->getSystemHandle())) rootViewController]; + +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic pop + #elif defined(__GNUC__) + #pragma GCC diagnostic pop + #endif +#endif + if (!rootViewController || ![rootViewController shouldAutorotate]) return false; @@ -189,7 +208,7 @@ namespace if ([supportedOrientations containsObject:@"UIInterfaceOrientationLandscapeRight"]) appFlags += UIInterfaceOrientationMaskLandscapeRight; - return (1 << orientation) & [rootViewController supportedInterfaceOrientations] & appFlags; + return (1 << orientation) & [rootViewController supportedInterfaceOrientations] & static_cast(appFlags); } - (bool)needsToFlipFrameForOrientation:(UIDeviceOrientation)orientation @@ -244,10 +263,10 @@ namespace //////////////////////////////////////////////////////////// -- (void)notifyTouchBegin:(unsigned int)index atPosition:(sf::Vector2i)position; +- (void)notifyTouchBegin:(unsigned int)index atPosition:(sf::Vector2i)position { - position.x *= backingScaleFactor; - position.y *= backingScaleFactor; + position.x *= static_cast(backingScaleFactor); + position.y *= static_cast(backingScaleFactor); // save the touch position if (index >= touchPositions.size()) @@ -268,10 +287,10 @@ namespace //////////////////////////////////////////////////////////// -- (void)notifyTouchMove:(unsigned int)index atPosition:(sf::Vector2i)position; +- (void)notifyTouchMove:(unsigned int)index atPosition:(sf::Vector2i)position { - position.x *= backingScaleFactor; - position.y *= backingScaleFactor; + position.x *= static_cast(backingScaleFactor); + position.y *= static_cast(backingScaleFactor); // save the touch position if (index >= touchPositions.size()) @@ -292,7 +311,7 @@ namespace //////////////////////////////////////////////////////////// -- (void)notifyTouchEnd:(unsigned int)index atPosition:(sf::Vector2i)position; +- (void)notifyTouchEnd:(unsigned int)index atPosition:(sf::Vector2i)position { // clear the touch position if (index < touchPositions.size()) @@ -304,8 +323,8 @@ namespace sf::Event event; event.type = sf::Event::TouchEnded; event.touch.finger = index; - event.touch.x = position.x * backingScaleFactor; - event.touch.y = position.y * backingScaleFactor; + event.touch.x = position.x * static_cast(backingScaleFactor); + event.touch.y = position.y * static_cast(backingScaleFactor); sfWindow->forwardEvent(event); } } diff --git a/src/SFML/Window/iOS/SFView.mm b/src/SFML/Window/iOS/SFView.mm index 2fff25c4a..258f1597c 100644 --- a/src/SFML/Window/iOS/SFView.mm +++ b/src/SFML/Window/iOS/SFView.mm @@ -31,6 +31,14 @@ #include #include +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + @interface SFView() @property (nonatomic) NSMutableArray* touches; @@ -103,7 +111,7 @@ sf::Vector2i position(static_cast(point.x), static_cast(point.y)); // notify the application delegate - [[SFAppDelegate getInstance] notifyTouchBegin:index atPosition:position]; + [[SFAppDelegate getInstance] notifyTouchBegin:(static_cast(index)) atPosition:position]; } } @@ -122,7 +130,7 @@ sf::Vector2i position(static_cast(point.x), static_cast(point.y)); // notify the application delegate - [[SFAppDelegate getInstance] notifyTouchMove:index atPosition:position]; + [[SFAppDelegate getInstance] notifyTouchMove:(static_cast(index)) atPosition:position]; } } } @@ -142,7 +150,7 @@ sf::Vector2i position(static_cast(point.x), static_cast(point.y)); // notify the application delegate - [[SFAppDelegate getInstance] notifyTouchEnd:index atPosition:position]; + [[SFAppDelegate getInstance] notifyTouchEnd:(static_cast(index)) atPosition:position]; // remove the touch [self.touches replaceObjectAtIndex:index withObject:[NSNull null]]; @@ -187,7 +195,7 @@ self.touches = [NSMutableArray array]; // Configure the EAGL layer - CAEAGLLayer* eaglLayer = (CAEAGLLayer*)self.layer; + CAEAGLLayer* eaglLayer = static_cast(self.layer); eaglLayer.opaque = YES; eaglLayer.drawableProperties = [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool:FALSE], kEAGLDrawablePropertyRetainedBacking, diff --git a/src/SFML/Window/iOS/SensorImpl.mm b/src/SFML/Window/iOS/SensorImpl.mm index 33c7159c5..ae0d2bbb5 100644 --- a/src/SFML/Window/iOS/SensorImpl.mm +++ b/src/SFML/Window/iOS/SensorImpl.mm @@ -139,37 +139,37 @@ Vector3f SensorImpl::update() { case Sensor::Accelerometer: // Acceleration is given in G, convert to m/s^2 - value.x = manager.accelerometerData.acceleration.x * 9.81f; - value.y = manager.accelerometerData.acceleration.y * 9.81f; - value.z = manager.accelerometerData.acceleration.z * 9.81f; + value.x = static_cast(manager.accelerometerData.acceleration.x * 9.81); + value.y = static_cast(manager.accelerometerData.acceleration.y * 9.81); + value.z = static_cast(manager.accelerometerData.acceleration.z * 9.81); break; case Sensor::Gyroscope: // Rotation rates are given in rad/s, convert to deg/s - value.x = toDegrees(manager.gyroData.rotationRate.x); - value.y = toDegrees(manager.gyroData.rotationRate.y); - value.z = toDegrees(manager.gyroData.rotationRate.z); + value.x = toDegrees(static_cast(manager.gyroData.rotationRate.x)); + value.y = toDegrees(static_cast(manager.gyroData.rotationRate.y)); + value.z = toDegrees(static_cast(manager.gyroData.rotationRate.z)); break; case Sensor::Magnetometer: // Magnetic field is given in microteslas - value.x = manager.magnetometerData.magneticField.x; - value.y = manager.magnetometerData.magneticField.y; - value.z = manager.magnetometerData.magneticField.z; + value.x = static_cast(manager.magnetometerData.magneticField.x); + value.y = static_cast(manager.magnetometerData.magneticField.y); + value.z = static_cast(manager.magnetometerData.magneticField.z); break; case Sensor::UserAcceleration: // User acceleration is given in G, convert to m/s^2 - value.x = manager.deviceMotion.userAcceleration.x * 9.81f; - value.y = manager.deviceMotion.userAcceleration.y * 9.81f; - value.z = manager.deviceMotion.userAcceleration.z * 9.81f; + value.x = static_cast(manager.deviceMotion.userAcceleration.x * 9.81); + value.y = static_cast(manager.deviceMotion.userAcceleration.y * 9.81); + value.z = static_cast(manager.deviceMotion.userAcceleration.z * 9.81); break; case Sensor::Orientation: // Absolute rotation (Euler) angles are given in radians, convert to degrees - value.x = toDegrees(manager.deviceMotion.attitude.yaw); - value.y = toDegrees(manager.deviceMotion.attitude.pitch); - value.z = toDegrees(manager.deviceMotion.attitude.roll); + value.x = toDegrees(static_cast(manager.deviceMotion.attitude.yaw)); + value.y = toDegrees(static_cast(manager.deviceMotion.attitude.pitch)); + value.z = toDegrees(static_cast(manager.deviceMotion.attitude.roll)); break; default: diff --git a/src/SFML/Window/iOS/VideoModeImpl.mm b/src/SFML/Window/iOS/VideoModeImpl.mm index 258f4b1f6..d1f13b2fd 100644 --- a/src/SFML/Window/iOS/VideoModeImpl.mm +++ b/src/SFML/Window/iOS/VideoModeImpl.mm @@ -50,8 +50,8 @@ std::vector VideoModeImpl::getFullscreenModes() VideoMode VideoModeImpl::getDesktopMode() { CGRect bounds = [[UIScreen mainScreen] bounds]; - float backingScale = [SFAppDelegate getInstance].backingScaleFactor; - return VideoMode(bounds.size.width * backingScale, bounds.size.height * backingScale); + double backingScale = [SFAppDelegate getInstance].backingScaleFactor; + return VideoMode(static_cast(bounds.size.width * backingScale), static_cast(bounds.size.height * backingScale)); } } // namespace priv diff --git a/src/SFML/Window/iOS/WindowImplUIKit.mm b/src/SFML/Window/iOS/WindowImplUIKit.mm index e5fe87d12..0bdab0b69 100644 --- a/src/SFML/Window/iOS/WindowImplUIKit.mm +++ b/src/SFML/Window/iOS/WindowImplUIKit.mm @@ -33,12 +33,20 @@ #include #include +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +#endif + namespace sf { namespace priv { //////////////////////////////////////////////////////////// -WindowImplUIKit::WindowImplUIKit(WindowHandle handle) +WindowImplUIKit::WindowImplUIKit(WindowHandle /* handle */) { // Not implemented } @@ -46,11 +54,11 @@ WindowImplUIKit::WindowImplUIKit(WindowHandle handle) //////////////////////////////////////////////////////////// WindowImplUIKit::WindowImplUIKit(VideoMode mode, - const String& title, + const String& /* title */, unsigned long style, - const ContextSettings& /*settings*/) + const ContextSettings& /* settings */) { - m_backingScale = [SFAppDelegate getInstance].backingScaleFactor; + m_backingScale = static_cast([SFAppDelegate getInstance].backingScaleFactor); // Apply the fullscreen flag [UIApplication sharedApplication].statusBarHidden = !(style & Style::Titlebar) || (style & Style::Fullscreen); @@ -77,7 +85,7 @@ WindowImplUIKit::WindowImplUIKit(VideoMode mode, std::swap(viewRect.size.width, viewRect.size.height); // Create the view - m_view = [[SFView alloc] initWithFrame:viewRect andContentScaleFactor:m_backingScale]; + m_view = [[SFView alloc] initWithFrame:viewRect andContentScaleFactor:(static_cast(m_backingScale))]; [m_view resignFirstResponder]; // Create the view controller @@ -108,7 +116,25 @@ void WindowImplUIKit::processEvents() //////////////////////////////////////////////////////////// WindowHandle WindowImplUIKit::getSystemHandle() const { +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wold-style-cast" + #elif defined(__GNUC__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wold-style-cast" + #endif +#endif + return (__bridge WindowHandle)m_window; + +#if defined(__APPLE__) + #if defined(__clang__) + #pragma clang diagnostic pop + #elif defined(__GNUC__) + #pragma GCC diagnostic pop + #endif +#endif } @@ -116,12 +142,12 @@ WindowHandle WindowImplUIKit::getSystemHandle() const Vector2i WindowImplUIKit::getPosition() const { CGPoint origin = m_window.frame.origin; - return Vector2i(origin.x * m_backingScale, origin.y * m_backingScale); + return Vector2i(static_cast(origin.x * static_cast(m_backingScale)), static_cast(origin.y * static_cast(m_backingScale))); } //////////////////////////////////////////////////////////// -void WindowImplUIKit::setPosition(const Vector2i& position) +void WindowImplUIKit::setPosition(const Vector2i& /* position */) { } @@ -129,12 +155,12 @@ void WindowImplUIKit::setPosition(const Vector2i& position) //////////////////////////////////////////////////////////// Vector2u WindowImplUIKit::getSize() const { - auto physicalFrame = m_window.frame; + CGRect physicalFrame = m_window.frame; // iOS 7 and 8 do different stuff here. In iOS 7 frame.x(physicalFrame.size.width * static_cast(m_backingScale)), static_cast(physicalFrame.size.height * static_cast(m_backingScale))); } @@ -156,49 +182,49 @@ void WindowImplUIKit::setSize(const Vector2u& size) //////////////////////////////////////////////////////////// -void WindowImplUIKit::setTitle(const String& title) +void WindowImplUIKit::setTitle(const String& /* title */) { // Not applicable } //////////////////////////////////////////////////////////// -void WindowImplUIKit::setIcon(unsigned int width, unsigned int height, const Uint8* pixels) +void WindowImplUIKit::setIcon(unsigned int /* width */, unsigned int /* height */, const Uint8* /* pixels */) { // Not applicable } //////////////////////////////////////////////////////////// -void WindowImplUIKit::setVisible(bool visible) +void WindowImplUIKit::setVisible(bool /* visible */) { // Not applicable } //////////////////////////////////////////////////////////// -void WindowImplUIKit::setMouseCursorVisible(bool visible) +void WindowImplUIKit::setMouseCursorVisible(bool /* visible */) { // Not applicable } //////////////////////////////////////////////////////////// -void WindowImplUIKit::setMouseCursorGrabbed(bool grabbed) +void WindowImplUIKit::setMouseCursorGrabbed(bool /* grabbed */) { // Not applicable } //////////////////////////////////////////////////////////// -void WindowImplUIKit::setMouseCursor(const CursorImpl& cursor) +void WindowImplUIKit::setMouseCursor(const CursorImpl& /* cursor */) { // Not applicable } //////////////////////////////////////////////////////////// -void WindowImplUIKit::setKeyRepeatEnabled(bool enabled) +void WindowImplUIKit::setKeyRepeatEnabled(bool /* enabled */) { // Not applicable }