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

Coding style fixes.

Browse Source
This commit is contained in:
Felix Geyer 2012-07-23 15:06:48 +02:00
parent ecea101962
commit ad0d120ae6
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/autotype/x11/AutoTypeX11.cpp
View File

@ -20,7 +20,7 @@
bool AutoTypePlatformX11::m_catchXErrors = false; bool AutoTypePlatformX11::m_catchXErrors = false;
bool AutoTypePlatformX11::m_xErrorOccured = false; bool AutoTypePlatformX11::m_xErrorOccured = false;
int (*AutoTypePlatformX11::m_oldXErrorHandler) (Display*, XErrorEvent*) = Q_NULLPTR; int (*AutoTypePlatformX11::m_oldXErrorHandler)(Display*, XErrorEvent*) = Q_NULLPTR;
AutoTypePlatformX11::AutoTypePlatformX11() AutoTypePlatformX11::AutoTypePlatformX11()
{ {
@ -357,7 +357,8 @@ KeySym AutoTypePlatformX11::keyToKeySym(Qt::Key key)
} }
} }
void AutoTypePlatformX11::updateKeymap() { void AutoTypePlatformX11::updateKeymap()
{
ReadKeymap(); ReadKeymap();
if (!m_altgrMask) { if (!m_altgrMask) {
@ -553,7 +554,7 @@ void AutoTypePlatformX11::ReadKeymap()
* If input focus is specified explicitly, select the window * If input focus is specified explicitly, select the window
* before send event to the window. * before send event to the window.
*/ */
void AutoTypePlatformX11::SendEvent(XKeyEvent *event) void AutoTypePlatformX11::SendEvent(XKeyEvent* event)
{ {
XSync(event->display, FALSE); XSync(event->display, FALSE);
int (*oldHandler) (Display*, XErrorEvent*) = XSetErrorHandler(MyErrorHandler); int (*oldHandler) (Display*, XErrorEvent*) = XSetErrorHandler(MyErrorHandler);
@ -743,7 +744,7 @@ void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym, unsigned int shift)
} }
} }
int AutoTypePlatformX11::MyErrorHandler(Display *my_dpy, XErrorEvent *event) int AutoTypePlatformX11::MyErrorHandler(Display* my_dpy, XErrorEvent* event)
{ {
char msg[200]; char msg[200];

6
src/autotype/x11/AutoTypeX11.h
View File

@ -70,8 +70,8 @@ private:
int AddKeysym(KeySym keysym, bool top); int AddKeysym(KeySym keysym, bool top);
void AddModifier(KeySym keysym); void AddModifier(KeySym keysym);
void ReadKeymap(); void ReadKeymap();
void SendEvent(XKeyEvent *event); void SendEvent(XKeyEvent* event);
static int MyErrorHandler(Display *my_dpy, XErrorEvent *event); static int MyErrorHandler(Display* my_dpy, XErrorEvent* event);
Display* m_dpy; Display* m_dpy;
Window m_rootWindow; Window m_rootWindow;
@ -86,7 +86,7 @@ private:
int m_modifierMask; int m_modifierMask;
static bool m_catchXErrors; static bool m_catchXErrors;
static bool m_xErrorOccured; static bool m_xErrorOccured;
static int (*m_oldXErrorHandler) (Display*, XErrorEvent*); static int (*m_oldXErrorHandler)(Display*, XErrorEvent*);
KeySym* m_keysymTable; KeySym* m_keysymTable;
int m_minKeycode; int m_minKeycode;