From 4bead379c6eb56b57e5cfc5408a35b161d590184 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 28 Mar 2023 12:14:23 +1100 Subject: [PATCH] Cleanup: remove redundant (void) in C++ function declarations --- intern/ghost/GHOST_ISystem.h | 6 +++--- intern/ghost/GHOST_IWindow.h | 2 +- intern/ghost/intern/GHOST_CallbackEventConsumer.h | 2 +- intern/ghost/intern/GHOST_DisplayManager.h | 8 ++++---- intern/ghost/intern/GHOST_DropTargetX11.h | 4 ++-- intern/ghost/intern/GHOST_Path-api.cpp | 4 ++-- intern/ghost/intern/GHOST_System.h | 6 +++--- intern/ghost/intern/GHOST_Window.h | 2 +- intern/ghost/intern/GHOST_WindowManager.h | 8 ++++---- intern/ghost/intern/GHOST_WindowSDL.h | 2 +- intern/ghost/test/gears/GHOST_Test.cpp | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index 45e757eb525..ca5c4645c5e 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -304,18 +304,18 @@ class GHOST_ISystem { * Ends full screen mode. * \return Indication of success. */ - virtual GHOST_TSuccess endFullScreen(void) = 0; + virtual GHOST_TSuccess endFullScreen() = 0; /** * Returns current full screen mode status. * \return The current status. */ - virtual bool getFullScreen(void) = 0; + virtual bool getFullScreen() = 0; /** * Native pixel size support (MacBook 'retina'). */ - virtual bool useNativePixel(void) = 0; + virtual bool useNativePixel() = 0; /** * Return features supported by the system back-end. diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h index f92f4241a40..7f6e6e8d202 100644 --- a/intern/ghost/GHOST_IWindow.h +++ b/intern/ghost/GHOST_IWindow.h @@ -333,7 +333,7 @@ class GHOST_IWindow { virtual GHOST_TSuccess beginFullScreen() const = 0; virtual GHOST_TSuccess endFullScreen() const = 0; - virtual float getNativePixelSize(void) = 0; + virtual float getNativePixelSize() = 0; /** * Returns the recommended DPI for this window. diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.h b/intern/ghost/intern/GHOST_CallbackEventConsumer.h index 113cd2e818b..8637594c3ce 100644 --- a/intern/ghost/intern/GHOST_CallbackEventConsumer.h +++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.h @@ -28,7 +28,7 @@ class GHOST_CallbackEventConsumer : public GHOST_IEventConsumer { /** * Destructor. */ - ~GHOST_CallbackEventConsumer(void) + ~GHOST_CallbackEventConsumer() { } diff --git a/intern/ghost/intern/GHOST_DisplayManager.h b/intern/ghost/intern/GHOST_DisplayManager.h index 839998ac1e1..f1d00b7a17d 100644 --- a/intern/ghost/intern/GHOST_DisplayManager.h +++ b/intern/ghost/intern/GHOST_DisplayManager.h @@ -21,18 +21,18 @@ class GHOST_DisplayManager { /** * Constructor. */ - GHOST_DisplayManager(void); + GHOST_DisplayManager(); /** * Destructor. */ - virtual ~GHOST_DisplayManager(void); + virtual ~GHOST_DisplayManager(); /** * Initializes the list with devices and settings. * \return Indication of success. */ - virtual GHOST_TSuccess initialize(void); + virtual GHOST_TSuccess initialize(); /** * Returns the number of display devices on this system. @@ -98,7 +98,7 @@ class GHOST_DisplayManager { * Retrieves settings for each display device and stores them. * \return Indication of success. */ - GHOST_TSuccess initializeSettings(void); + GHOST_TSuccess initializeSettings(); /** Tells whether the list of display modes has been stored already. */ bool m_settingsInitialized; diff --git a/intern/ghost/intern/GHOST_DropTargetX11.h b/intern/ghost/intern/GHOST_DropTargetX11.h index db73ddff70f..44e7afbe0ac 100644 --- a/intern/ghost/intern/GHOST_DropTargetX11.h +++ b/intern/ghost/intern/GHOST_DropTargetX11.h @@ -49,12 +49,12 @@ class GHOST_DropTargetX11 { /** * Initialize XDND and all related X atoms */ - void Initialize(void); + void Initialize(); /** * Uninitialized XDND and all related X atoms */ - void Uninitialize(void); + void Uninitialize(); /** * Get data to be passed to event from text/URI-list mime type diff --git a/intern/ghost/intern/GHOST_Path-api.cpp b/intern/ghost/intern/GHOST_Path-api.cpp index 58f36dc096d..94feeb1a388 100644 --- a/intern/ghost/intern/GHOST_Path-api.cpp +++ b/intern/ghost/intern/GHOST_Path-api.cpp @@ -12,12 +12,12 @@ #include "GHOST_Types.h" #include "intern/GHOST_Debug.h" -GHOST_TSuccess GHOST_CreateSystemPaths(void) +GHOST_TSuccess GHOST_CreateSystemPaths() { return GHOST_ISystemPaths::create(); } -GHOST_TSuccess GHOST_DisposeSystemPaths(void) +GHOST_TSuccess GHOST_DisposeSystemPaths() { return GHOST_ISystemPaths::dispose(); } diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index 4ceb2ff81bc..a319f553231 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -135,19 +135,19 @@ class GHOST_System : public GHOST_ISystem { * Ends full screen mode. * \return Indication of success. */ - GHOST_TSuccess endFullScreen(void); + GHOST_TSuccess endFullScreen(); /** * Returns current full screen mode status. * \return The current status. */ - bool getFullScreen(void); + bool getFullScreen(); /** * Native pixel size support (MacBook 'retina'). * \return The pixel size in float. */ - bool useNativePixel(void); + bool useNativePixel(); bool m_nativePixel; /** diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h index e008fcc72c1..85d7babfb56 100644 --- a/intern/ghost/intern/GHOST_Window.h +++ b/intern/ghost/intern/GHOST_Window.h @@ -295,7 +295,7 @@ class GHOST_Window : public GHOST_IWindow { m_userData = userData; } - float getNativePixelSize(void) override + float getNativePixelSize() override { if (m_nativePixelSize > 0.0f) { return m_nativePixelSize; diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h index a0a58fa82d8..79645bc68ed 100644 --- a/intern/ghost/intern/GHOST_WindowManager.h +++ b/intern/ghost/intern/GHOST_WindowManager.h @@ -54,13 +54,13 @@ class GHOST_WindowManager { * Returns whether one of the windows is full-screen. * \return A boolean indicator. */ - bool getFullScreen(void) const; + bool getFullScreen() const; /** * Returns pointer to the full-screen window. * \return The full-screen window (NULL if not in full-screen). */ - GHOST_IWindow *getFullScreenWindow(void) const; + GHOST_IWindow *getFullScreenWindow() const; /** * Activates full-screen mode for a window. @@ -73,7 +73,7 @@ class GHOST_WindowManager { * Closes full-screen mode down. * \return Indication of success. */ - GHOST_TSuccess endFullScreen(void); + GHOST_TSuccess endFullScreen(); /** * Sets new window as active window (the window receiving events). @@ -87,7 +87,7 @@ class GHOST_WindowManager { * There can be only one window active which should be in the current window list. * \return window The active window (or NULL if there is none). */ - GHOST_IWindow *getActiveWindow(void) const; + GHOST_IWindow *getActiveWindow() const; /** * Set this window to be inactive (not receiving events). diff --git a/intern/ghost/intern/GHOST_WindowSDL.h b/intern/ghost/intern/GHOST_WindowSDL.h index 68daa44e774..49ff3ace6c3 100644 --- a/intern/ghost/intern/GHOST_WindowSDL.h +++ b/intern/ghost/intern/GHOST_WindowSDL.h @@ -52,7 +52,7 @@ class GHOST_WindowSDL : public GHOST_Window { return m_sdl_win; } - GHOST_TSuccess invalidate(void) override; + GHOST_TSuccess invalidate() override; /** * called by the X11 system implementation when expose events diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp index 3c9206b2010..818cbc38e95 100644 --- a/intern/ghost/test/gears/GHOST_Test.cpp +++ b/intern/ghost/test/gears/GHOST_Test.cpp @@ -381,7 +381,7 @@ void StereoProjection(float left, class Application : public GHOST_IEventConsumer { public: Application(GHOST_ISystem *system); - ~Application(void); + ~Application(); virtual bool processEvent(GHOST_IEvent *event); GHOST_ISystem *m_system; @@ -431,7 +431,7 @@ Application::Application(GHOST_ISystem *system) m_gearsTimer = system->installTimer(0 /*delay*/, 20 /*interval*/, gearsTimerProc, m_mainWindow); } -Application::~Application(void) +Application::~Application() { // Dispose windows if (m_system->validWindow(m_mainWindow)) {