diff --git a/src/autotype/xcb/AutoTypeXCB.cpp b/src/autotype/xcb/AutoTypeXCB.cpp index 2d93f367f..f419875dc 100644 --- a/src/autotype/xcb/AutoTypeXCB.cpp +++ b/src/autotype/xcb/AutoTypeXCB.cpp @@ -24,7 +24,7 @@ #include bool AutoTypePlatformX11::m_catchXErrors = false; -bool AutoTypePlatformX11::m_xErrorOccured = false; +bool AutoTypePlatformX11::m_xErrorOccurred = false; int (*AutoTypePlatformX11::m_oldXErrorHandler)(Display*, XErrorEvent*) = nullptr; AutoTypePlatformX11::AutoTypePlatformX11() @@ -153,7 +153,7 @@ bool AutoTypePlatformX11::registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifi GrabModeAsync, GrabModeAsync); stopCatchXErrors(); - if (!m_xErrorOccured) { + if (!m_xErrorOccurred) { m_currentGlobalKey = key; m_currentGlobalModifiers = modifiers; m_currentGlobalKeycode = keycode; @@ -556,7 +556,7 @@ void AutoTypePlatformX11::startCatchXErrors() Q_ASSERT(!m_catchXErrors); m_catchXErrors = true; - m_xErrorOccured = false; + m_xErrorOccurred = false; m_oldXErrorHandler = XSetErrorHandler(x11ErrorHandler); } @@ -575,7 +575,7 @@ int AutoTypePlatformX11::x11ErrorHandler(Display* display, XErrorEvent* error) Q_UNUSED(error) if (m_catchXErrors) { - m_xErrorOccured = true; + m_xErrorOccurred = true; } return 1; diff --git a/src/autotype/xcb/AutoTypeXCB.h b/src/autotype/xcb/AutoTypeXCB.h index bb33516bc..26d1e8102 100644 --- a/src/autotype/xcb/AutoTypeXCB.h +++ b/src/autotype/xcb/AutoTypeXCB.h @@ -100,7 +100,7 @@ private: uint m_currentGlobalNativeModifiers; int m_modifierMask; static bool m_catchXErrors; - static bool m_xErrorOccured; + static bool m_xErrorOccurred; static int (*m_oldXErrorHandler)(Display*, XErrorEvent*); static const int m_unicodeToKeysymLen;