From 68813a37c3c6ae9e09a3425fba974c548b055136 Mon Sep 17 00:00:00 2001
From: Diadlo <polsha3@gmail.com>
Date: Thu, 28 Sep 2017 00:36:52 +0300
Subject: [PATCH] refactor: Remove Settings from Core

---
 src/core/core.cpp     | 3 ---
 src/widget/widget.cpp | 9 +++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/core/core.cpp b/src/core/core.cpp
index c604d2fcc..8b6005620 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -26,7 +26,6 @@
 #include "src/model/groupinvite.h"
 #include "src/nexus.h"
 #include "src/persistence/profile.h"
-#include "src/persistence/settings.h"
 #include "src/widget/gui.h"
 
 #include <QCoreApplication>
@@ -607,8 +606,6 @@ void Core::requestFriendship(const ToxId& friendId, const QString& message)
         emit failedToAddFriend(friendPk);
     } else {
         qDebug() << "Requested friendship of " << friendNumber;
-        Settings::getInstance().updateFriendAddress(friendId.toString());
-
         emit friendAdded(friendNumber, friendPk);
         emit requestSent(friendPk, message);
     }
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index 9a99b6574..9418c6c19 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -967,8 +967,11 @@ void Widget::onCallEnd(uint32_t friendId)
 
 void Widget::addFriend(int friendId, const ToxPk& friendPk)
 {
+    Settings& s = Settings::getInstance();
+    s.updateFriendAddress(friendPk.toString());
+
     Friend* newfriend = FriendList::addFriend(friendId, friendPk);
-    bool compact = Settings::getInstance().getCompactLayout();
+    bool compact = s.getCompactLayout();
     FriendWidget* widget = new FriendWidget(newfriend, compact);
     ChatForm* friendForm = new ChatForm(newfriend);
     newfriend->setChatForm(friendForm);
@@ -977,12 +980,10 @@ void Widget::addFriend(int friendId, const ToxPk& friendPk)
     chatForms[friendId] = friendForm;
     newfriend->loadHistory();
 
-    const Settings& s = Settings::getInstance();
-
     QDate activityDate = s.getFriendActivity(friendPk);
     QDate chatDate = friendForm->getLatestDate();
     if (chatDate > activityDate && chatDate.isValid()) {
-        Settings::getInstance().setFriendActivity(friendPk, chatDate);
+        s.setFriendActivity(friendPk, chatDate);
     }
 
     contactListWidget->addFriendWidget(widget, Status::Offline, s.getFriendCircleID(friendPk));