From ad0d120ae61edcf48817ea1870ea14a2b68b8ccb Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Mon, 23 Jul 2012 15:06:48 +0200 Subject: [PATCH] Coding style fixes. --- src/autotype/x11/AutoTypeX11.cpp | 9 +++++---- src/autotype/x11/AutoTypeX11.h | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/autotype/x11/AutoTypeX11.cpp b/src/autotype/x11/AutoTypeX11.cpp index f52e41c27..d358400b1 100644 --- a/src/autotype/x11/AutoTypeX11.cpp +++ b/src/autotype/x11/AutoTypeX11.cpp @@ -20,7 +20,7 @@ bool AutoTypePlatformX11::m_catchXErrors = false; bool AutoTypePlatformX11::m_xErrorOccured = false; -int (*AutoTypePlatformX11::m_oldXErrorHandler) (Display*, XErrorEvent*) = Q_NULLPTR; +int (*AutoTypePlatformX11::m_oldXErrorHandler)(Display*, XErrorEvent*) = Q_NULLPTR; AutoTypePlatformX11::AutoTypePlatformX11() { @@ -357,7 +357,8 @@ KeySym AutoTypePlatformX11::keyToKeySym(Qt::Key key) } } -void AutoTypePlatformX11::updateKeymap() { +void AutoTypePlatformX11::updateKeymap() +{ ReadKeymap(); if (!m_altgrMask) { @@ -553,7 +554,7 @@ void AutoTypePlatformX11::ReadKeymap() * If input focus is specified explicitly, select the window * before send event to the window. */ -void AutoTypePlatformX11::SendEvent(XKeyEvent *event) +void AutoTypePlatformX11::SendEvent(XKeyEvent* event) { XSync(event->display, FALSE); 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]; diff --git a/src/autotype/x11/AutoTypeX11.h b/src/autotype/x11/AutoTypeX11.h index dc5cc90ab..e553a7130 100644 --- a/src/autotype/x11/AutoTypeX11.h +++ b/src/autotype/x11/AutoTypeX11.h @@ -70,8 +70,8 @@ private: int AddKeysym(KeySym keysym, bool top); void AddModifier(KeySym keysym); void ReadKeymap(); - void SendEvent(XKeyEvent *event); - static int MyErrorHandler(Display *my_dpy, XErrorEvent *event); + void SendEvent(XKeyEvent* event); + static int MyErrorHandler(Display* my_dpy, XErrorEvent* event); Display* m_dpy; Window m_rootWindow; @@ -86,7 +86,7 @@ private: int m_modifierMask; static bool m_catchXErrors; static bool m_xErrorOccured; - static int (*m_oldXErrorHandler) (Display*, XErrorEvent*); + static int (*m_oldXErrorHandler)(Display*, XErrorEvent*); KeySym* m_keysymTable; int m_minKeycode;