mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-04 21:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move global shortcut handling into OSUtils (#5566)

Browse source 
Move global shortcut handling into OSUtils
This commit is contained in:
Jonathan White 2020-12-13 23:23:25 -05:00 • committed by GitHub
parent a6f01349e8
commit 404fd941e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 1124 additions and 1136 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/gui/Application.cpp
View file

@ -36,10 +36,6 @@
#include <QStandardPaths>
#include <QtNetwork/QLocalSocket>
#if defined(Q_OS_WIN) || (defined(Q_OS_UNIX) && !defined(Q_OS_MACOS))
#include "gui/osutils/OSEventFilter.h"
#endif
#if defined(Q_OS_UNIX)
#include <signal.h>
#include <sys/socket.h>
@ -60,9 +56,7 @@ Application::Application(int& argc, char** argv)
, m_alreadyRunning(false)
, m_lockFile(nullptr)
#if defined(Q_OS_WIN) || (defined(Q_OS_UNIX) && !defined(Q_OS_MACOS))
, m_osEventFilter(new OSEventFilter())
{
installNativeEventFilter(m_osEventFilter.data());
#else
{
#endif
@ -160,6 +154,7 @@ void Application::bootstrap()
QApplication::setFont(QApplication::font("QMessageBox"));
#endif
osUtils->registerNativeEventFilter();
MessageBox::initializeButtonDefs();
#ifdef Q_OS_MACOS