From b71ff372c75a21f99351a6d79842510ac2d51cca Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Wed, 30 Mar 2022 22:41:05 -0600 Subject: [PATCH] Use `()` for functions with no parameters --- src/SFML/Window/DRM/InputImplUDev.cpp | 2 +- src/SFML/Window/OSX/SFKeyboardModifiersHelper.h | 2 +- src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm | 2 +- src/SFML/Window/OSX/WindowImplCocoa.hpp | 12 ++++++------ src/SFML/Window/OSX/WindowImplCocoa.mm | 12 ++++++------ .../SFML/SFML App.xctemplate/ResourcePath.hpp | 2 +- .../SFML/SFML App.xctemplate/ResourcePath.mm | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/SFML/Window/DRM/InputImplUDev.cpp b/src/SFML/Window/DRM/InputImplUDev.cpp index 1f5b0e1ba..2cf047f0d 100644 --- a/src/SFML/Window/DRM/InputImplUDev.cpp +++ b/src/SFML/Window/DRM/InputImplUDev.cpp @@ -79,7 +79,7 @@ namespace bool shiftDown() { return (keyMap[sf::Keyboard::LShift] || keyMap[sf::Keyboard::RShift]); } bool systemDown() { return (keyMap[sf::Keyboard::LSystem] || keyMap[sf::Keyboard::RSystem]); } - void uninitFileDescriptors(void) + void uninitFileDescriptors() { for (std::vector::iterator itr = fileDescriptors.begin(); itr != fileDescriptors.end(); ++itr) close(*itr); diff --git a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.h b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.h index a7010053d..7074e55dc 100644 --- a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.h +++ b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.h @@ -49,7 +49,7 @@ namespace sf { /// It needs to be called before any event, e.g. in the window constructor. /// //////////////////////////////////////////////////////////// -void initialiseKeyboardHelper(void); +void initialiseKeyboardHelper(); //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm index 80494a4cd..1c9a33505 100644 --- a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm +++ b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm @@ -123,7 +123,7 @@ void processLeftRightModifiers(NSUInteger modifiers, //////////////////////////////////////////////////////// -void initialiseKeyboardHelper(void) +void initialiseKeyboardHelper() { if (isStateInitialized) return; diff --git a/src/SFML/Window/OSX/WindowImplCocoa.hpp b/src/SFML/Window/OSX/WindowImplCocoa.hpp index ff568f97f..f3c55f611 100644 --- a/src/SFML/Window/OSX/WindowImplCocoa.hpp +++ b/src/SFML/Window/OSX/WindowImplCocoa.hpp @@ -106,7 +106,7 @@ public: /// Send the event to SFML WindowImpl class. /// //////////////////////////////////////////////////////////// - void windowClosed(void); + void windowClosed(); //////////////////////////////////////////////////////////// /// \brief Window Resized Event - called by the cocoa window object @@ -124,7 +124,7 @@ public: /// Send the event to SFML WindowImpl class. /// //////////////////////////////////////////////////////////// - void windowLostFocus(void); + void windowLostFocus(); //////////////////////////////////////////////////////////// /// \brief Window Get Focus Event - called by the cocoa window object @@ -132,7 +132,7 @@ public: /// Send the event to SFML WindowImpl class. /// //////////////////////////////////////////////////////////// - void windowGainedFocus(void); + void windowGainedFocus(); //////////////////////////////////////////////////////////// /// \brief Mouse Down Event - called by the cocoa view object @@ -188,7 +188,7 @@ public: /// Send the event to SFML WindowImpl class. /// //////////////////////////////////////////////////////////// - void mouseMovedIn(void); + void mouseMovedIn(); //////////////////////////////////////////////////////////// /// \brief Mouse Out Event - called by the cocoa view object @@ -196,7 +196,7 @@ public: /// Send the event to SFML WindowImpl class. /// //////////////////////////////////////////////////////////// - void mouseMovedOut(void); + void mouseMovedOut(); //////////////////////////////////////////////////////////// /// \brief Key Down Event - called by the cocoa view object @@ -245,7 +245,7 @@ public: /// Also ensure NSApp is constructed. /// //////////////////////////////////////////////////////////// - static void setUpProcess(void); + static void setUpProcess(); public: diff --git a/src/SFML/Window/OSX/WindowImplCocoa.mm b/src/SFML/Window/OSX/WindowImplCocoa.mm index 57b8be56f..6594b2c07 100644 --- a/src/SFML/Window/OSX/WindowImplCocoa.mm +++ b/src/SFML/Window/OSX/WindowImplCocoa.mm @@ -172,7 +172,7 @@ void WindowImplCocoa::applyContext(NSOpenGLContextRef context) const //////////////////////////////////////////////////////////// -void WindowImplCocoa::setUpProcess(void) +void WindowImplCocoa::setUpProcess() { AutoreleasePool pool; static bool isTheProcessSetAsApplication = false; @@ -209,7 +209,7 @@ void WindowImplCocoa::setUpProcess(void) //////////////////////////////////////////////////////////// -void WindowImplCocoa::windowClosed(void) +void WindowImplCocoa::windowClosed() { Event event; event.type = Event::Closed; @@ -232,7 +232,7 @@ void WindowImplCocoa::windowResized(const Vector2u& size) //////////////////////////////////////////////////////////// -void WindowImplCocoa::windowLostFocus(void) +void WindowImplCocoa::windowLostFocus() { if (!m_showCursor && [m_delegate isMouseInside]) showMouseCursor(); // Make sure the cursor is visible @@ -245,7 +245,7 @@ void WindowImplCocoa::windowLostFocus(void) //////////////////////////////////////////////////////////// -void WindowImplCocoa::windowGainedFocus(void) +void WindowImplCocoa::windowGainedFocus() { if (!m_showCursor && [m_delegate isMouseInside]) hideMouseCursor(); // Restore user's setting @@ -323,7 +323,7 @@ void WindowImplCocoa::mouseWheelScrolledAt(float deltaX, float deltaY, int x, in } //////////////////////////////////////////////////////////// -void WindowImplCocoa::mouseMovedIn(void) +void WindowImplCocoa::mouseMovedIn() { if (!m_showCursor) hideMouseCursor(); // Restore user's setting @@ -335,7 +335,7 @@ void WindowImplCocoa::mouseMovedIn(void) } //////////////////////////////////////////////////////////// -void WindowImplCocoa::mouseMovedOut(void) +void WindowImplCocoa::mouseMovedOut() { if (!m_showCursor) showMouseCursor(); // Make sure the cursor is visible diff --git a/tools/xcode/templates/SFML/SFML App.xctemplate/ResourcePath.hpp b/tools/xcode/templates/SFML/SFML App.xctemplate/ResourcePath.hpp index d748ed71a..6d5976684 100644 --- a/tools/xcode/templates/SFML/SFML App.xctemplate/ResourcePath.hpp +++ b/tools/xcode/templates/SFML/SFML App.xctemplate/ResourcePath.hpp @@ -38,6 +38,6 @@ /// with the main bundle or an empty string is there is no bundle. /// //////////////////////////////////////////////////////////// -std::filesystem::path resourcePath(void); +std::filesystem::path resourcePath(); #endif diff --git a/tools/xcode/templates/SFML/SFML App.xctemplate/ResourcePath.mm b/tools/xcode/templates/SFML/SFML App.xctemplate/ResourcePath.mm index c877eac0a..3c1e0aba9 100644 --- a/tools/xcode/templates/SFML/SFML App.xctemplate/ResourcePath.mm +++ b/tools/xcode/templates/SFML/SFML App.xctemplate/ResourcePath.mm @@ -31,7 +31,7 @@ #include //////////////////////////////////////////////////////////// -std::filesystem::path resourcePath(void) +std::filesystem::path resourcePath() { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];