[Bf-blender-cvs] [792e145c228] master: Cleanup: rename functions for consistency with other process*Events functions.
Nicholas Rishel
noreply at git.blender.org
Sat Oct 31 00:32:30 CET 2020
Commit: 792e145c2281c1a1230712206da219fd92d8d6cb
Author: Nicholas Rishel
Date: Thu Oct 22 17:32:07 2020 -0700
Branches: master
https://developer.blender.org/rB792e145c2281c1a1230712206da219fd92d8d6cb
Cleanup: rename functions for consistency with other process*Events functions.
===================================================================
M intern/ghost/intern/GHOST_SystemWin32.cpp
M intern/ghost/intern/GHOST_SystemWin32.h
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 697290a2d69..c506f98d6fe 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -951,7 +951,7 @@ GHOST_EventButton *GHOST_SystemWin32::processButtonEvent(GHOST_TEventType type,
* events to grab. The described behavior was observed in a Wacom Bamboo CTE-450. */
if (window->useTabletAPI(GHOST_kTabletWintab) &&
(window->m_tabletInRange || window->wintabSysButPressed()) &&
- processWintabEvents(type, window, mask, window->getMousePressed())) {
+ processWintabEvent(type, window, mask, window->getMousePressed())) {
/* Wintab processing only handles in-contact events. */
return NULL;
}
@@ -960,7 +960,7 @@ GHOST_EventButton *GHOST_SystemWin32::processButtonEvent(GHOST_TEventType type,
system->getMilliSeconds(), type, window, mask, GHOST_TABLET_DATA_NONE);
}
-GHOST_TSuccess GHOST_SystemWin32::processWintabEvents(GHOST_TEventType type,
+GHOST_TSuccess GHOST_SystemWin32::processWintabEvent(GHOST_TEventType type,
GHOST_WindowWin32 *window,
GHOST_TButtonMask mask,
bool mousePressed)
@@ -1069,7 +1069,7 @@ GHOST_TSuccess GHOST_SystemWin32::processWintabEvents(GHOST_TEventType type,
return GHOST_kSuccess;
}
-void GHOST_SystemWin32::processPointerEvents(
+void GHOST_SystemWin32::processPointerEvent(
UINT type, GHOST_WindowWin32 *window, WPARAM wParam, LPARAM lParam, bool &eventHandled)
{
std::vector<GHOST_PointerInfoWin32> pointerInfo;
@@ -1158,7 +1158,7 @@ GHOST_EventCursor *GHOST_SystemWin32::processCursorEvent(GHOST_WindowWin32 *wind
if (window->m_tabletInRange || window->wintabSysButPressed()) {
if (window->useTabletAPI(GHOST_kTabletWintab) &&
- processWintabEvents(
+ processWintabEvent(
GHOST_kEventCursorMove, window, GHOST_kButtonMaskNone, window->getMousePressed())) {
return NULL;
}
@@ -1628,7 +1628,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
case WM_POINTERUPDATE:
case WM_POINTERUP:
case WM_POINTERLEAVE:
- processPointerEvents(msg, window, wParam, lParam, eventHandled);
+ processPointerEvent(msg, window, wParam, lParam, eventHandled);
break;
////////////////////////////////////////////////////////////////////////
// Mouse events, processed
diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h
index 06054f27c4e..51a9dbae238 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.h
+++ b/intern/ghost/intern/GHOST_SystemWin32.h
@@ -328,7 +328,7 @@ class GHOST_SystemWin32 : public GHOST_System {
* \param mousePressed Whether the mouse is currently pressed.
* \return True if the method handled the event.
*/
- static GHOST_TSuccess processWintabEvents(GHOST_TEventType type,
+ static GHOST_TSuccess processWintabEvent(GHOST_TEventType type,
GHOST_WindowWin32 *window,
GHOST_TButtonMask mask,
bool mousePressed);
@@ -341,7 +341,7 @@ class GHOST_SystemWin32 : public GHOST_System {
* \param lParam The lParam from the wndproc.
* \param eventhandled True if the method handled the event.
*/
- static void processPointerEvents(
+ static void processPointerEvent(
UINT type, GHOST_WindowWin32 *window, WPARAM wParam, LPARAM lParam, bool &eventhandled);
/**
More information about the Bf-blender-cvs
mailing list