From 77e345570d6c0d5e52cddf28d6759d27a805b5e9 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sat, 24 Feb 2018 07:44:28 -0500
Subject: [PATCH] Correct test failures; moved gui calls into gui objects

---
 src/gui/entry/EntryModel.cpp | 15 ++++++++++-----
 src/gui/entry/EntryModel.h   |  2 ++
 src/gui/entry/EntryView.cpp  |  3 +++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/gui/entry/EntryModel.cpp b/src/gui/entry/EntryModel.cpp
index ab2a8114..afd25aa1 100644
--- a/src/gui/entry/EntryModel.cpp
+++ b/src/gui/entry/EntryModel.cpp
@@ -29,7 +29,6 @@
 #include "core/Global.h"
 #include "core/Group.h"
 #include "core/Metadata.h"
-#include "core/FilePath.h"
 
 // String being displayed when hiding content
 const QString EntryModel::HiddenContentDisplay(QString("\u25cf").repeated(6));
@@ -42,12 +41,9 @@ EntryModel::EntryModel(QObject* parent)
     , m_group(nullptr)
     , m_hideUsernames(false)
     , m_hidePasswords(true)
-    , m_paperClipPixmap(FilePath::instance()->icon("actions", "paperclip").pixmap(16))
+    , m_paperClipPixmap(16, 16)
     , m_paperClipPixmapCentered(24, 16)
 {
-    m_paperClipPixmapCentered.fill(Qt::transparent);
-    QPainter painter(&m_paperClipPixmapCentered);
-    painter.drawPixmap(8, 0, m_paperClipPixmap);
 }
 
 Entry* EntryModel::entryFromIndex(const QModelIndex& index) const
@@ -504,3 +500,12 @@ void EntryModel::togglePasswordsHidden(const bool hide)
 {
     setPasswordsHidden(hide);
 }
+
+void EntryModel::setPaperClipPixmap(const QPixmap& paperclip)
+{
+    m_paperClipPixmap = paperclip;
+
+    m_paperClipPixmapCentered.fill(Qt::transparent);
+    QPainter painter2(&m_paperClipPixmapCentered);
+    painter2.drawPixmap(8, 0, paperclip);
+}
diff --git a/src/gui/entry/EntryModel.h b/src/gui/entry/EntryModel.h
index a2323c64..b436c6a9 100644
--- a/src/gui/entry/EntryModel.h
+++ b/src/gui/entry/EntryModel.h
@@ -66,6 +66,8 @@ public:
     bool isPasswordsHidden() const;
     void setPasswordsHidden(const bool hide);
 
+    void setPaperClipPixmap(const QPixmap& paperclip);
+
 signals:
     void switchedToListMode();
     void switchedToSearchMode();
diff --git a/src/gui/entry/EntryView.cpp b/src/gui/entry/EntryView.cpp
index dbbdd144..f39dd218 100644
--- a/src/gui/entry/EntryView.cpp
+++ b/src/gui/entry/EntryView.cpp
@@ -22,6 +22,7 @@
 #include <QKeyEvent>
 #include <QMenu>
 
+#include "core/FilePath.h"
 #include "gui/SortFilterHideProxyModel.h"
 
 EntryView::EntryView(QWidget* parent)
@@ -114,6 +115,8 @@ EntryView::EntryView(QWidget* parent)
     m_sortModel->sort(EntryModel::Title, Qt::AscendingOrder);
     sortByColumn(EntryModel::Title, Qt::AscendingOrder);
     m_defaultListViewState = header()->saveState();
+
+    m_model->setPaperClipPixmap(filePath()->icon("actions", "paperclip").pixmap(16));
 }
 
 void EntryView::keyPressEvent(QKeyEvent* event)