OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-21 10:13:43 +03:00
Code

0032220: Configuration, Aspect_VKeySet - eliminate name collision with X11 macros

Browse Source 
Aspect_VKeySet::KeyState::Status field has been renamed to KStatus.
This commit is contained in:
kgv 2021-03-17 09:51:39 +03:00
parent 58210e5983
commit 442850c032
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Aspect/Aspect_VKeySet.cxx
View File

@ -49,9 +49,9 @@ void Aspect_VKeySet::KeyDown (Aspect_VKey theKey,
double thePressure) double thePressure)
{ {
Standard_Mutex::Sentry aLock (myLock); Standard_Mutex::Sentry aLock (myLock);
if (myKeys[theKey].Status != KeyStatus_Pressed) if (myKeys[theKey].KStatus != KeyStatus_Pressed)
{ {
myKeys[theKey].Status = KeyStatus_Pressed; myKeys[theKey].KStatus = KeyStatus_Pressed;
myKeys[theKey].TimeDown = theTime; myKeys[theKey].TimeDown = theTime;
} }
myKeys[theKey].Pressure = thePressure; myKeys[theKey].Pressure = thePressure;
@ -68,9 +68,9 @@ void Aspect_VKeySet::KeyUp (Aspect_VKey theKey,
double theTime) double theTime)
{ {
Standard_Mutex::Sentry aLock (myLock); Standard_Mutex::Sentry aLock (myLock);
if (myKeys[theKey].Status == KeyStatus_Pressed) if (myKeys[theKey].KStatus == KeyStatus_Pressed)
{ {
myKeys[theKey].Status = KeyStatus_Released; myKeys[theKey].KStatus = KeyStatus_Released;
myKeys[theKey].TimeUp = theTime; myKeys[theKey].TimeUp = theTime;
} }
@ -97,18 +97,18 @@ void Aspect_VKeySet::KeyFromAxis (Aspect_VKey theNegative,
const Aspect_VKey aKeyUp = thePressure < 0 ? thePositive : theNegative; const Aspect_VKey aKeyUp = thePressure < 0 ? thePositive : theNegative;
KeyDown (aKeyDown, theTime, Abs (thePressure)); KeyDown (aKeyDown, theTime, Abs (thePressure));
if (myKeys[aKeyUp].Status == KeyStatus_Pressed) if (myKeys[aKeyUp].KStatus == KeyStatus_Pressed)
{ {
KeyUp (aKeyUp, theTime); KeyUp (aKeyUp, theTime);
} }
} }
else else
{ {
if (myKeys[theNegative].Status == KeyStatus_Pressed) if (myKeys[theNegative].KStatus == KeyStatus_Pressed)
{ {
KeyUp (theNegative, theTime); KeyUp (theNegative, theTime);
} }
if (myKeys[thePositive].Status == KeyStatus_Pressed) if (myKeys[thePositive].KStatus == KeyStatus_Pressed)
{ {
KeyUp (thePositive, theTime); KeyUp (thePositive, theTime);
} }
@ -125,7 +125,7 @@ bool Aspect_VKeySet::HoldDuration (Aspect_VKey theKey,
double& thePressure) double& thePressure)
{ {
Standard_Mutex::Sentry aLock (myLock); Standard_Mutex::Sentry aLock (myLock);
switch (myKeys[theKey].Status) switch (myKeys[theKey].KStatus)
{ {
case KeyStatus_Free: case KeyStatus_Free:
{ {
@ -134,7 +134,7 @@ bool Aspect_VKeySet::HoldDuration (Aspect_VKey theKey,
} }
case KeyStatus_Released: case KeyStatus_Released:
{ {
myKeys[theKey].Status = KeyStatus_Free; myKeys[theKey].KStatus = KeyStatus_Free;
theDuration = myKeys[theKey].TimeUp - myKeys[theKey].TimeDown; theDuration = myKeys[theKey].TimeUp - myKeys[theKey].TimeDown;
thePressure = myKeys[theKey].Pressure; thePressure = myKeys[theKey].Pressure;
return true; return true;

10
src/Aspect/Aspect_VKeySet.hxx
View File

@ -55,14 +55,14 @@ public:
bool IsFreeKey (Aspect_VKey theKey) const bool IsFreeKey (Aspect_VKey theKey) const
{ {
Standard_Mutex::Sentry aLock (myLock); Standard_Mutex::Sentry aLock (myLock);
return myKeys[theKey].Status == KeyStatus_Free; return myKeys[theKey].KStatus == KeyStatus_Free;
} }
//! Return TRUE if key is in Pressed state. //! Return TRUE if key is in Pressed state.
bool IsKeyDown (Aspect_VKey theKey) const bool IsKeyDown (Aspect_VKey theKey) const
{ {
Standard_Mutex::Sentry aLock (myLock); Standard_Mutex::Sentry aLock (myLock);
return myKeys[theKey].Status == KeyStatus_Pressed; return myKeys[theKey].KStatus == KeyStatus_Pressed;
} }
//! Return mutex for thread-safe updates. //! Return mutex for thread-safe updates.
@ -131,10 +131,10 @@ private:
//! Structure defining key state. //! Structure defining key state.
struct KeyState struct KeyState
{ {
KeyState() : TimeDown (0.0), TimeUp (0.0), Pressure (1.0), Status (KeyStatus_Free) {} KeyState() : TimeDown (0.0), TimeUp (0.0), Pressure (1.0), KStatus (KeyStatus_Free) {}
void Reset() void Reset()
{ {
Status = KeyStatus_Free; KStatus = KeyStatus_Free;
TimeDown = 0.0; TimeDown = 0.0;
TimeUp = 0.0; TimeUp = 0.0;
Pressure = 1.0; Pressure = 1.0;
@ -143,7 +143,7 @@ private:
double TimeDown; //!< time of key press event double TimeDown; //!< time of key press event
double TimeUp; //!< time of key release event double TimeUp; //!< time of key release event
double Pressure; //!< key pressure double Pressure; //!< key pressure
KeyStatus Status; //!< key status KeyStatus KStatus; //!< key status
}; };
private: private: