Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

spelling: occurred

Browse Source
This commit is contained in:
Josh Soref 2016-12-02 04:02:41 +00:00 committed by Janek Bevendorff
parent b8c93b3572
commit ce06fcdbe0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/autotype/xcb/AutoTypeXCB.cpp
View File

@ -24,7 +24,7 @@
#include <xcb/xcb.h> #include <xcb/xcb.h>
bool AutoTypePlatformX11::m_catchXErrors = false; bool AutoTypePlatformX11::m_catchXErrors = false;
bool AutoTypePlatformX11::m_xErrorOccured = false; bool AutoTypePlatformX11::m_xErrorOccurred = false;
int (*AutoTypePlatformX11::m_oldXErrorHandler)(Display*, XErrorEvent*) = nullptr; int (*AutoTypePlatformX11::m_oldXErrorHandler)(Display*, XErrorEvent*) = nullptr;
AutoTypePlatformX11::AutoTypePlatformX11() AutoTypePlatformX11::AutoTypePlatformX11()
@ -153,7 +153,7 @@ bool AutoTypePlatformX11::registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifi
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
stopCatchXErrors(); stopCatchXErrors();
if (!m_xErrorOccured) { if (!m_xErrorOccurred) {
m_currentGlobalKey = key; m_currentGlobalKey = key;
m_currentGlobalModifiers = modifiers; m_currentGlobalModifiers = modifiers;
m_currentGlobalKeycode = keycode; m_currentGlobalKeycode = keycode;
@ -556,7 +556,7 @@ void AutoTypePlatformX11::startCatchXErrors()
Q_ASSERT(!m_catchXErrors); Q_ASSERT(!m_catchXErrors);
m_catchXErrors = true; m_catchXErrors = true;
m_xErrorOccured = false; m_xErrorOccurred = false;
m_oldXErrorHandler = XSetErrorHandler(x11ErrorHandler); m_oldXErrorHandler = XSetErrorHandler(x11ErrorHandler);
} }
@ -575,7 +575,7 @@ int AutoTypePlatformX11::x11ErrorHandler(Display* display, XErrorEvent* error)
Q_UNUSED(error) Q_UNUSED(error)
if (m_catchXErrors) { if (m_catchXErrors) {
m_xErrorOccured = true; m_xErrorOccurred = true;
} }
return 1; return 1;

2
src/autotype/xcb/AutoTypeXCB.h
View File

@ -100,7 +100,7 @@ private:
uint m_currentGlobalNativeModifiers; uint m_currentGlobalNativeModifiers;
int m_modifierMask; int m_modifierMask;
static bool m_catchXErrors; static bool m_catchXErrors;
static bool m_xErrorOccured; static bool m_xErrorOccurred;
static int (*m_oldXErrorHandler)(Display*, XErrorEvent*); static int (*m_oldXErrorHandler)(Display*, XErrorEvent*);
static const int m_unicodeToKeysymLen; static const int m_unicodeToKeysymLen;