Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-26 16:25:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/yubikey

Browse source
This commit is contained in:
Janek Bevendorff 2017-03-10 18:01:14 +01:00
commit 15dd783d2c
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
119 changed files with 616 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/gui/Application.cpp
View file

@ -101,7 +101,7 @@ bool Application::event(QEvent* event)
{
// Handle Apple QFileOpenEvent from finder (double click on .kdbx file)
if (event->type() == QEvent::FileOpen) {
Q_EMIT openFile(static_cast<QFileOpenEvent*>(event)->file());
emit openFile(static_cast<QFileOpenEvent*>(event)->file());
return true;
}
#ifdef Q_OS_MAC
@ -153,7 +153,7 @@ void Application::handleUnixSignal(int sig)
case SIGTERM:
{
char buf = 0;
::write(unixSignalSocket[0], &buf, sizeof(buf));
Q_UNUSED(::write(unixSignalSocket[0], &buf, sizeof(buf)));
return;
}
case SIGHUP:
@ -165,7 +165,7 @@ void Application::quitBySignal()
{
m_unixSignalNotifier->setEnabled(false);
char buf;
::read(unixSignalSocket[1], &buf, sizeof(buf));
Q_UNUSED(::read(unixSignalSocket[1], &buf, sizeof(buf)));
if (nullptr != m_mainWindow)
static_cast<MainWindow*>(m_mainWindow)->appExit();