[Bf-blender-cvs] [c4a16389bc1] master: Cleanup: use bool for GHOST_SystemWin32::setConsoleWindowState return
Campbell Barton
noreply at git.blender.org
Wed Aug 31 07:05:21 CEST 2022
Commit: c4a16389bc1881d26738b5576024e3f0f1b33d5c
Author: Campbell Barton
Date: Wed Aug 31 14:26:49 2022 +1000
Branches: master
https://developer.blender.org/rBc4a16389bc1881d26738b5576024e3f0f1b33d5c
Cleanup: use bool for GHOST_SystemWin32::setConsoleWindowState return
===================================================================
M intern/ghost/GHOST_ISystem.h
M intern/ghost/intern/GHOST_C-api.cpp
M intern/ghost/intern/GHOST_SystemCocoa.h
M intern/ghost/intern/GHOST_SystemHeadless.h
M intern/ghost/intern/GHOST_SystemSDL.h
M intern/ghost/intern/GHOST_SystemWayland.cpp
M intern/ghost/intern/GHOST_SystemWayland.h
M intern/ghost/intern/GHOST_SystemWin32.cpp
M intern/ghost/intern/GHOST_SystemWin32.h
M intern/ghost/intern/GHOST_SystemX11.h
===================================================================
diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h
index 0dd855bb513..aa893a66a9d 100644
--- a/intern/ghost/GHOST_ISystem.h
+++ b/intern/ghost/GHOST_ISystem.h
@@ -437,9 +437,9 @@ class GHOST_ISystem {
/**
* Set the Console State
* \param action: console state
- * \return current status (1 -visible, 0 - hidden)
+ * \return current status (true: visible, 0: hidden)
*/
- virtual int setConsoleWindowState(GHOST_TConsoleWindowState action) = 0;
+ virtual bool setConsoleWindowState(GHOST_TConsoleWindowState action) = 0;
/***************************************************************************************
* Access to clipboard.
diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp
index 62e1e470010..710512881e8 100644
--- a/intern/ghost/intern/GHOST_C-api.cpp
+++ b/intern/ghost/intern/GHOST_C-api.cpp
@@ -869,8 +869,7 @@ void GHOST_putClipboard(const char *buffer, bool selection)
bool GHOST_setConsoleWindowState(GHOST_TConsoleWindowState action)
{
GHOST_ISystem *system = GHOST_ISystem::getSystem();
- /* FIXME: use `bool` instead of int for this value. */
- return (bool)system->setConsoleWindowState(action);
+ return system->setConsoleWindowState(action);
}
bool GHOST_UseNativePixels(void)
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h b/intern/ghost/intern/GHOST_SystemCocoa.h
index 8b6dfb4efed..a9e659d3565 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.h
+++ b/intern/ghost/intern/GHOST_SystemCocoa.h
@@ -236,9 +236,9 @@ class GHOST_SystemCocoa : public GHOST_System {
/**
* \see GHOST_ISystem
*/
- int setConsoleWindowState(GHOST_TConsoleWindowState action)
+ bool setConsoleWindowState(GHOST_TConsoleWindowState action)
{
- return 0;
+ return false;
}
/**
diff --git a/intern/ghost/intern/GHOST_SystemHeadless.h b/intern/ghost/intern/GHOST_SystemHeadless.h
index dcf445420a4..b02a82fc9eb 100644
--- a/intern/ghost/intern/GHOST_SystemHeadless.h
+++ b/intern/ghost/intern/GHOST_SystemHeadless.h
@@ -30,7 +30,7 @@ class GHOST_SystemHeadless : public GHOST_System {
{
return false;
}
- int setConsoleWindowState(GHOST_TConsoleWindowState /*action*/) override
+ bool setConsoleWindowState(GHOST_TConsoleWindowState /*action*/) override
{
return 0;
}
diff --git a/intern/ghost/intern/GHOST_SystemSDL.h b/intern/ghost/intern/GHOST_SystemSDL.h
index aefea5eda34..bee277ba674 100644
--- a/intern/ghost/intern/GHOST_SystemSDL.h
+++ b/intern/ghost/intern/GHOST_SystemSDL.h
@@ -33,9 +33,9 @@ class GHOST_SystemSDL : public GHOST_System {
bool processEvents(bool waitForEvent);
- int setConsoleWindowState(GHOST_TConsoleWindowState /*action*/)
+ bool setConsoleWindowState(GHOST_TConsoleWindowState /*action*/)
{
- return 0;
+ return false;
}
GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys &keys) const;
diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cpp
index 13357a3d31a..c2859edc56b 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.cpp
+++ b/intern/ghost/intern/GHOST_SystemWayland.cpp
@@ -3035,9 +3035,9 @@ bool GHOST_SystemWayland::processEvents(bool waitForEvent)
return any_processed;
}
-int GHOST_SystemWayland::setConsoleWindowState(GHOST_TConsoleWindowState /*action*/)
+bool GHOST_SystemWayland::setConsoleWindowState(GHOST_TConsoleWindowState /*action*/)
{
- return 0;
+ return false;
}
GHOST_TSuccess GHOST_SystemWayland::getModifierKeys(GHOST_ModifierKeys &keys) const
diff --git a/intern/ghost/intern/GHOST_SystemWayland.h b/intern/ghost/intern/GHOST_SystemWayland.h
index 632f4bf28d8..f3b42de5a1b 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.h
+++ b/intern/ghost/intern/GHOST_SystemWayland.h
@@ -97,7 +97,7 @@ class GHOST_SystemWayland : public GHOST_System {
bool processEvents(bool waitForEvent) override;
- int setConsoleWindowState(GHOST_TConsoleWindowState action) override;
+ bool setConsoleWindowState(GHOST_TConsoleWindowState action) override;
GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys &keys) const override;
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 5ea369c50bf..afc18704c9b 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -131,7 +131,7 @@ GHOST_SystemWin32::GHOST_SystemWin32()
GHOST_ASSERT(m_displayManager, "GHOST_SystemWin32::GHOST_SystemWin32(): m_displayManager==0\n");
m_displayManager->initialize();
- m_consoleStatus = 1;
+ m_consoleStatus = true;
/* Tell Windows we are per monitor DPI aware. This disables the default
* blurry scaling and enables WM_DPICHANGED to allow us to draw at proper DPI. */
@@ -2320,7 +2320,7 @@ static bool isStartedFromCommandPrompt()
return false;
}
-int GHOST_SystemWin32::setConsoleWindowState(GHOST_TConsoleWindowState action)
+bool GHOST_SystemWin32::setConsoleWindowState(GHOST_TConsoleWindowState action)
{
HWND wnd = GetConsoleWindow();
@@ -2328,13 +2328,13 @@ int GHOST_SystemWin32::setConsoleWindowState(GHOST_TConsoleWindowState action)
case GHOST_kConsoleWindowStateHideForNonConsoleLaunch: {
if (!isStartedFromCommandPrompt()) {
ShowWindow(wnd, SW_HIDE);
- m_consoleStatus = 0;
+ m_consoleStatus = false;
}
break;
}
case GHOST_kConsoleWindowStateHide: {
ShowWindow(wnd, SW_HIDE);
- m_consoleStatus = 0;
+ m_consoleStatus = false;
break;
}
case GHOST_kConsoleWindowStateShow: {
@@ -2342,7 +2342,7 @@ int GHOST_SystemWin32::setConsoleWindowState(GHOST_TConsoleWindowState action)
if (!isStartedFromCommandPrompt()) {
DeleteMenu(GetSystemMenu(wnd, FALSE), SC_CLOSE, MF_BYCOMMAND);
}
- m_consoleStatus = 1;
+ m_consoleStatus = true;
break;
}
case GHOST_kConsoleWindowStateToggle: {
diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h
index 93b56a128c0..81c565ae732 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.h
+++ b/intern/ghost/intern/GHOST_SystemWin32.h
@@ -430,7 +430,7 @@ class GHOST_SystemWin32 : public GHOST_System {
* \param action: console state
* \return current status (1 -visible, 0 - hidden)
*/
- int setConsoleWindowState(GHOST_TConsoleWindowState action);
+ bool setConsoleWindowState(GHOST_TConsoleWindowState action);
/** The virtual-key code (VKey) of the last press event. Used to detect repeat events. */
unsigned short m_keycode_last_repeat_key;
@@ -450,7 +450,7 @@ class GHOST_SystemWin32 : public GHOST_System {
HKL m_keylayout;
/** Console status. */
- int m_consoleStatus;
+ bool m_consoleStatus;
/** Wheel delta accumulator. */
int m_wheelDeltaAccum;
diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h
index 7938aa2b646..bd6ace101e9 100644
--- a/intern/ghost/intern/GHOST_SystemX11.h
+++ b/intern/ghost/intern/GHOST_SystemX11.h
@@ -253,7 +253,7 @@ class GHOST_SystemX11 : public GHOST_System {
/**
* \see GHOST_ISystem
*/
- int setConsoleWindowState(GHOST_TConsoleWindowState /*action*/)
+ bool setConsoleWindowState(GHOST_TConsoleWindowState /*action*/)
{
return 0;
}
More information about the Bf-blender-cvs
mailing list