From 3f8aef259dd9f3b73e291ce9ee74182e7b7521a3 Mon Sep 17 00:00:00 2001
From: Pete Sevander <pete.sevander@liilak.com>
Date: Fri, 15 May 2015 00:45:56 +0300
Subject: [PATCH] Moved call to performGlobalAutoType() to a better place and
 cleaned the code a bit

---
 src/gui/DatabaseWidget.cpp       | 17 ++++++++++-------
 src/gui/DatabaseWidget.h         |  2 --
 src/gui/UnlockDatabaseDialog.cpp |  4 ----
 src/gui/UnlockDatabaseDialog.h   |  1 -
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 76ed71dcb..60adbecfd 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -661,13 +661,10 @@ void DatabaseWidget::unlockDatabase(bool accepted)
     }
 
     // check if sender() is either the unlock widget or the unlock dialog
-    UnlockDatabaseDialog* widget = qobject_cast<UnlockDatabaseDialog*>(sender());
-    if (widget) {
-        replaceDatabase(widget->database());
-    } else {
-        DatabaseOpenWidget* widget = qobject_cast<DatabaseOpenWidget*>(sender());
-        replaceDatabase(widget->database());
-    }
+    Database *db = sender() == m_unlockDatabaseDialog ? m_unlockDatabaseDialog->database() :
+                   sender() == m_unlockDatabaseWidget ? m_unlockDatabaseWidget->database() :
+                   Q_NULLPTR;
+    replaceDatabase(db);
 
     QList<Group*> groups = m_db->rootGroup()->groupsRecursive(true);
     Q_FOREACH (Group* group, groups) {
@@ -681,6 +678,12 @@ void DatabaseWidget::unlockDatabase(bool accepted)
     setCurrentWidget(m_mainWidget);
     m_unlockDatabaseWidget->clearForms();
     Q_EMIT unlockedDatabase();
+
+    if (sender() == m_unlockDatabaseDialog) {
+        QList<Database*> dbList;
+        dbList.append(m_db);
+        autoType()->performGlobalAutoType(dbList);
+    }
 }
 
 void DatabaseWidget::entryActivationSignalReceived(Entry* entry, EntryModel::ModelColumn column)
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
index dfda952ab..a22429e24 100644
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -26,8 +26,6 @@
 
 #include "gui/entry/EntryModel.h"
 
-//#include "gui/UnlockDatabaseDialog.h"
-
 class ChangeMasterKeyWidget;
 class DatabaseOpenWidget;
 class DatabaseSettingsWidget;
diff --git a/src/gui/UnlockDatabaseDialog.cpp b/src/gui/UnlockDatabaseDialog.cpp
index aff3c1dd6..b17417c4d 100644
--- a/src/gui/UnlockDatabaseDialog.cpp
+++ b/src/gui/UnlockDatabaseDialog.cpp
@@ -31,12 +31,8 @@ Database *UnlockDatabaseDialog::database()
 void UnlockDatabaseDialog::Done(bool r)
 {
     if (r) {
-        QList<Database*> dbList;
-        m_db = static_cast<DatabaseOpenWidget*>(sender())->database();
-        dbList.append(m_db);
         accept();
         Q_EMIT unlockDone(true);
-        autoType()->performGlobalAutoType(dbList);
     } else {
         reject();
     }
diff --git a/src/gui/UnlockDatabaseDialog.h b/src/gui/UnlockDatabaseDialog.h
index 5db92f815..3d417a4fb 100644
--- a/src/gui/UnlockDatabaseDialog.h
+++ b/src/gui/UnlockDatabaseDialog.h
@@ -29,7 +29,6 @@ public Q_SLOTS:
 
 private:
     UnlockDatabaseWidget* const m_view;
-    Database *m_db;
     DatabaseManagerStruct m_dbStruct;
 };