From b3015ab0a815c9f516f40d72b8133d9db0011c3f Mon Sep 17 00:00:00 2001
From: Diadlo <polsha3@gmail.com>
Date: Mon, 17 Apr 2017 23:35:32 +0300
Subject: [PATCH] refactor(friend): Remove Settings from Friend

---
 src/friend.cpp     | 13 ++++++-------
 src/friend.h       |  2 +-
 src/friendlist.cpp |  3 ++-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/friend.cpp b/src/friend.cpp
index cbc7573d3..42fce234f 100644
--- a/src/friend.cpp
+++ b/src/friend.cpp
@@ -24,16 +24,15 @@
 #include "src/grouplist.h"
 #include "src/nexus.h"
 #include "src/persistence/profile.h"
-#include "src/persistence/settings.h"
 #include "src/widget/form/chatform.h"
 
-Friend::Friend(uint32_t friendId, const ToxPk& friendPk)
+Friend::Friend(uint32_t friendId, const ToxPk& friendPk, const QString& userAlias)
     : userName{Core::getInstance()->getPeerName(friendPk)}
-    , userAlias(Settings::getInstance().getFriendAlias(friendPk))
-    , friendPk(friendPk)
-    , friendId(friendId)
-    , hasNewEvents(false)
-    , friendStatus(Status::Offline)
+    , userAlias{userAlias}
+    , friendPk{friendPk}
+    , friendId{friendId}
+    , hasNewEvents{false}
+    , friendStatus{Status::Offline}
 {
     if (userName.isEmpty()) {
         userName = friendPk.toString();
diff --git a/src/friend.h b/src/friend.h
index bad9aee6e..0965c615d 100644
--- a/src/friend.h
+++ b/src/friend.h
@@ -32,7 +32,7 @@ class Friend : public QObject
 {
     Q_OBJECT
 public:
-    Friend(uint32_t FriendId, const ToxPk& FriendPk);
+    Friend(uint32_t FriendId, const ToxPk& FriendPk, const QString& userAlias);
     Friend(const Friend& other) = delete;
     ~Friend();
     Friend& operator=(const Friend& other) = delete;
diff --git a/src/friendlist.cpp b/src/friendlist.cpp
index 8f6a1eca3..8c05eaa14 100644
--- a/src/friendlist.cpp
+++ b/src/friendlist.cpp
@@ -33,7 +33,8 @@ Friend* FriendList::addFriend(int friendId, const ToxPk& friendPk)
     if (friendChecker != friendList.end())
         qWarning() << "addFriend: friendId already taken";
 
-    Friend* newfriend = new Friend(friendId, friendPk);
+    QString alias = Settings::getInstance().getFriendAlias(friendPk);
+    Friend* newfriend = new Friend(friendId, friendPk, alias);
     friendList[friendId] = newfriend;
     key2id[friendPk.getKey()] = friendId;