From 76eb935024fd777b88e8d0373e9a046f7f0af4e4 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Mon, 21 May 2012 22:11:26 +0200
Subject: [PATCH] Small fixes in Application.

---
 src/gui/Application.cpp | 10 +++-------
 src/gui/Application.h   |  6 ++----
 src/main.cpp            |  2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp
index 882f1b23..d1354990 100644
--- a/src/gui/Application.cpp
+++ b/src/gui/Application.cpp
@@ -24,17 +24,13 @@ Application::Application(int& argc, char** argv)
 {
 }
 
-Application::~Application()
-{
-}
-
-bool Application::event(QEvent *event)
+bool Application::event(QEvent* event)
 {
     // Handle Apple QFileOpenEvent from finder (double click on .kdbx file)
     if (event->type() == QEvent::FileOpen) {
-        Q_EMIT openDatabase(static_cast<QFileOpenEvent*>(event)->file());
+        Q_EMIT openFile(static_cast<QFileOpenEvent*>(event)->file());
         return true;
     }
 
-  return (QApplication::event(event));
+    return QApplication::event(event);
 }
diff --git a/src/gui/Application.h b/src/gui/Application.h
index 491d7eba..b620d7b4 100644
--- a/src/gui/Application.h
+++ b/src/gui/Application.h
@@ -19,7 +19,6 @@
 #define KEEPASSX_APPLICATION_H
 
 #include <QtGui/QApplication>
-#include "gui/MainWindow.h"
 
 class Application : public QApplication
 {
@@ -27,12 +26,11 @@ class Application : public QApplication
 
 public:
     Application(int& argc, char** argv);
-    ~Application();
 
-    bool event(QEvent *event);
+    bool event(QEvent* event);
 
 Q_SIGNALS:
-    void openDatabase(const QString& filename);
+    void openFile(const QString& filename);
 };
 
 #endif // KEEPASSX_APPLICATION_H
diff --git a/src/main.cpp b/src/main.cpp
index f5f4768c..35ff19b1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
     MainWindow mainWindow;
     mainWindow.show();
 
-    QObject::connect(&app, SIGNAL(openDatabase(QString)), &mainWindow, SLOT(openDatabase(QString)));
+    QObject::connect(&app, SIGNAL(openFile(QString)), &mainWindow, SLOT(openDatabase(QString)));
 
     if (!filename.isEmpty()) {
         mainWindow.openDatabase(filename, password, QString());