[Bf-blender-cvs] [621a1f69182] wintab-high-frequency: Renaming and debug cleanup.

[Nicholas Rishel]

Commit: 621a1f69182a9b3ce9f924edcb079030a8ade5e1
Author: Nicholas Rishel
Date:   Tue Jun 15 15:56:00 2021 -0700
Branches: wintab-high-frequency
https://developer.blender.org/rB621a1f69182a9b3ce9f924edcb079030a8ade5e1

Renaming and debug cleanup.

===================================================================

M	intern/ghost/intern/GHOST_SystemWin32.cpp
M	intern/ghost/intern/GHOST_WindowWin32.cpp
M	intern/ghost/intern/GHOST_WindowWin32.h
M	intern/ghost/intern/GHOST_Wintab.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 62f174db476..214af4d70ad 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -1285,7 +1285,7 @@ void GHOST_SystemWin32::setTabletAPI(GHOST_TTabletAPI api)
       windowWin32->loadWintab(GHOST_kWindowStateMinimized != windowWin32->getState());
 
       if (windowWin32->useTabletAPI(GHOST_kTabletWintab)) {
-        windowWin32->resetPointerInfo();
+        windowWin32->resetPointerPenInfo();
       }
     }
     else {
@@ -1580,7 +1580,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
             wt->processInfoChange(lParam);
 
             if (window->useTabletAPI(GHOST_kTabletWintab)) {
-              window->resetPointerInfo();
+              window->resetPointerPenInfo();
             }
           }
           eventHandled = true;
@@ -1598,7 +1598,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
           processPointerEvent(msg, window, wParam, lParam, eventHandled);
           break;
         case WM_POINTERLEAVE:
-          window->resetPointerInfo();
+          window->resetPointerPenInfo();
           eventHandled = true;
           break;
         ////////////////////////////////////////////////////////////////////////
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index 07120a7772c..889e9bdb42a 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -925,7 +925,7 @@ GHOST_TSuccess GHOST_WindowWin32::getPointerInfo(
   return GHOST_kSuccess;
 }
 
-void GHOST_WindowWin32::resetPointerInfo()
+void GHOST_WindowWin32::resetPointerPenInfo()
 {
   m_lastPointerTabletData = GHOST_TABLET_DATA_NONE;
 }
diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h
index fe9219fcb6b..a50a31b01af 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.h
+++ b/intern/ghost/intern/GHOST_WindowWin32.h
@@ -262,7 +262,7 @@ class GHOST_WindowWin32 : public GHOST_Window {
   /**
   * Resets pointer pen tablet state.
   */
-  void resetPointerInfo();
+  void resetPointerPenInfo();
 
   /**
    * Retrieves pointer to Wintab if Wintab is the set Tablet API.
diff --git a/intern/ghost/intern/GHOST_Wintab.cpp b/intern/ghost/intern/GHOST_Wintab.cpp
index 5c196909bb4..1ec63520c78 100644
--- a/intern/ghost/intern/GHOST_Wintab.cpp
+++ b/intern/ghost/intern/GHOST_Wintab.cpp
@@ -482,7 +482,6 @@ bool GHOST_Wintab::testCoordinates(int sysX, int sysY, int wtX, int wtY)
     return true;
   }
   else {
-    printf("off sys (%d, %d) wt (%d, %d)\n", sysX, sysY, wtX, wtY);
     m_coordTrusted = false;
     return false;
   }