From 6b60ff77135c3717159f760e82f14841c50816aa Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Tue, 26 May 2020 22:53:21 +0200
Subject: Rename settings to be more consistent

---
 src/timeline/TimelineViewManager.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/timeline/TimelineViewManager.cpp')

diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 89882e9d..30abe506 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -19,7 +19,7 @@ Q_DECLARE_METATYPE(mtx::events::collections::TimelineEvents)
 void
 TimelineViewManager::updateEncryptedDescriptions()
 {
-        auto decrypt = settings->isDecryptSidebarEnabled();
+        auto decrypt = settings->decryptSidebar();
         QHash<QString, QSharedPointer<TimelineModel>>::iterator i;
         for (i = models.begin(); i != models.end(); ++i) {
                 auto ptr = i.value();
@@ -114,7 +114,7 @@ TimelineViewManager::sync(const mtx::responses::Rooms &rooms)
                 const auto &room_model = models.value(QString::fromStdString(room_id));
                 room_model->addEvents(room.timeline);
 
-                if (ChatPage::instance()->userSettings()->isTypingNotificationsEnabled()) {
+                if (ChatPage::instance()->userSettings()->typingNotifications()) {
                         std::vector<QString> typing;
                         typing.reserve(room.ephemeral.typing.size());
                         for (const auto &user : room.ephemeral.typing) {
@@ -134,7 +134,7 @@ TimelineViewManager::addRoom(const QString &room_id)
 {
         if (!models.contains(room_id)) {
                 QSharedPointer<TimelineModel> newRoom(new TimelineModel(this, room_id));
-                newRoom->setDecryptDescription(settings->isDecryptSidebarEnabled());
+                newRoom->setDecryptDescription(settings->decryptSidebar());
 
                 connect(newRoom.data(),
                         &TimelineModel::newEncryptedImage,
@@ -218,7 +218,7 @@ TimelineViewManager::queueTextMessage(const QString &msg)
         mtx::events::msg::Text text = {};
         text.body                   = msg.trimmed().toStdString();
 
-        if (settings->isMarkdownEnabled()) {
+        if (settings->markdown()) {
                 text.formatted_body = utils::markdownToHtml(msg).toStdString();
 
                 // Don't send formatted_body, when we don't need to
@@ -246,7 +246,7 @@ TimelineViewManager::queueTextMessage(const QString &msg)
 
                 // NOTE(Nico): rich replies always need a formatted_body!
                 text.format = "org.matrix.custom.html";
-                if (settings->isMarkdownEnabled())
+                if (settings->markdown())
                         text.formatted_body =
                           utils::getFormattedQuoteBody(related, utils::markdownToHtml(msg))
                             .toStdString();
@@ -269,7 +269,7 @@ TimelineViewManager::queueEmoteMessage(const QString &msg)
         mtx::events::msg::Emote emote;
         emote.body = msg.trimmed().toStdString();
 
-        if (html != msg.trimmed().toHtmlEscaped() && settings->isMarkdownEnabled()) {
+        if (html != msg.trimmed().toHtmlEscaped() && settings->markdown()) {
                 emote.formatted_body = html.toStdString();
                 emote.format         = "org.matrix.custom.html";
         }
-- 
cgit 1.5.1