From bb2d7bca5a5de675d6ee1f4ec4c4f868229da47a Mon Sep 17 00:00:00 2001
From: Carlos Knippschild <carlos.chuim@gmail.com>
Date: Mon, 24 Jun 2019 22:45:22 -0700
Subject: [PATCH] Fix build broken by Qt

Updating mingw-w64-x86_64-qt5 to version 5.12.4-2 caused EditEntryWidget to fail
building. Fixed that with proper includes. Also ran `make format` which revealed
one file in need of formatting.
---
 src/gui/DatabaseOpenWidget.cpp    | 7 +++----
 src/gui/entry/EditEntryWidget.cpp | 1 +
 src/gui/entry/EditEntryWidget.h   | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp
index 78a08b1d8..939a40154 100644
--- a/src/gui/DatabaseOpenWidget.cpp
+++ b/src/gui/DatabaseOpenWidget.cpp
@@ -34,10 +34,10 @@
 
 #include "config-keepassx.h"
 
-#include <QSharedPointer>
-#include <QtConcurrentRun>
 #include <QDesktopServices>
 #include <QFont>
+#include <QSharedPointer>
+#include <QtConcurrentRun>
 
 DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent)
     : DialogyWidget(parent)
@@ -311,8 +311,7 @@ QSharedPointer<CompositeKey> DatabaseOpenWidget::databaseKey()
             legacyWarning.setDefaultButton(QMessageBox::Ok);
             legacyWarning.setCheckBox(new QCheckBox(tr("Don't show this warning again")));
 
-            connect(legacyWarning.checkBox(), &QCheckBox::stateChanged, [](int state)
-            {
+            connect(legacyWarning.checkBox(), &QCheckBox::stateChanged, [](int state) {
                 config()->set("Messages/NoLegacyKeyFileWarning", state == Qt::CheckState::Checked);
             });
 
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index 523b8cdcd..5a557d472 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -32,6 +32,7 @@
 #include <QSortFilterProxyModel>
 #include <QStackedLayout>
 #include <QStandardPaths>
+#include <QStringListModel>
 #include <QTemporaryFile>
 
 #include "autotype/AutoType.h"
diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h
index dd7bf8c07..9a90097b0 100644
--- a/src/gui/entry/EditEntryWidget.h
+++ b/src/gui/entry/EditEntryWidget.h
@@ -41,6 +41,7 @@ class EntryHistoryModel;
 class QButtonGroup;
 class QMenu;
 class QSortFilterProxyModel;
+class QStringListModel;
 #ifdef WITH_XC_SSHAGENT
 #include "sshagent/KeeAgentSettings.h"
 class OpenSSHKey;