From af7dac72f4063dd8d4dac71973ea51c25896089a Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 11 Sep 2020 18:29:33 +0200 Subject: FORMAT: Run clang-format 10 on all C/CXX source-files --- src/mumble/GlobalShortcut_unix.h | 48 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src/mumble/GlobalShortcut_unix.h') diff --git a/src/mumble/GlobalShortcut_unix.h b/src/mumble/GlobalShortcut_unix.h index 1ed46243c..b29310f7f 100644 --- a/src/mumble/GlobalShortcut_unix.h +++ b/src/mumble/GlobalShortcut_unix.h @@ -6,9 +6,9 @@ #ifndef MUMBLE_MUMBLE_GLOBALSHORTCUT_UNIX_H_ #define MUMBLE_MUMBLE_GLOBALSHORTCUT_UNIX_H_ -#include "GlobalShortcut.h" #include "ConfigDialog.h" #include "Global.h" +#include "GlobalShortcut.h" #include @@ -18,29 +18,29 @@ struct _XDisplay; typedef _XDisplay Display; class GlobalShortcutX : public GlobalShortcutEngine { - private: - Q_OBJECT - Q_DISABLE_COPY(GlobalShortcutX) - public: - Display *display; - QSet qsRootWindows; - int iXIopcode; - QSet qsMasterDevices; - - volatile bool bRunning; - QSet qsKeyboards; - QMap qmInputDevices; - - GlobalShortcutX(); - ~GlobalShortcutX() Q_DECL_OVERRIDE; - void run() Q_DECL_OVERRIDE; - QString buttonName(const QVariant &) Q_DECL_OVERRIDE; - - void queryXIMasterList(); - public slots: - void displayReadyRead(int); - void inputReadyRead(int); - void directoryChanged(const QString &); +private: + Q_OBJECT + Q_DISABLE_COPY(GlobalShortcutX) +public: + Display *display; + QSet< Window > qsRootWindows; + int iXIopcode; + QSet< int > qsMasterDevices; + + volatile bool bRunning; + QSet< QString > qsKeyboards; + QMap< QString, QFile * > qmInputDevices; + + GlobalShortcutX(); + ~GlobalShortcutX() Q_DECL_OVERRIDE; + void run() Q_DECL_OVERRIDE; + QString buttonName(const QVariant &) Q_DECL_OVERRIDE; + + void queryXIMasterList(); +public slots: + void displayReadyRead(int); + void inputReadyRead(int); + void directoryChanged(const QString &); }; #endif -- cgit v1.2.3