From 760d1cfb9cb93c0e6cb9bf6bc22e55dd01c0f1a3 Mon Sep 17 00:00:00 2001
From: Black Hat <bhat@encom.eu.org>
Date: Tue, 30 Apr 2019 17:12:16 +0800
Subject: [PATCH] Remove CommonFont singleton.

---
 imports/Spectral/Component/Timeline/MessageDelegate.qml | 3 +--
 imports/Spectral/Font/CommonFont.qml                    | 5 -----
 imports/Spectral/Font/qmldir                            | 1 -
 res.qrc                                                 | 1 -
 4 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 imports/Spectral/Font/CommonFont.qml

diff --git a/imports/Spectral/Component/Timeline/MessageDelegate.qml b/imports/Spectral/Component/Timeline/MessageDelegate.qml
index 2565fb9..e9a949d 100644
--- a/imports/Spectral/Component/Timeline/MessageDelegate.qml
+++ b/imports/Spectral/Component/Timeline/MessageDelegate.qml
@@ -10,7 +10,6 @@ import Spectral.Component 2.0
 import Spectral.Dialog 2.0
 import Spectral.Menu.Timeline 2.0
 import Spectral.Effect 2.0
-import Spectral.Font 0.1
 
 ColumnLayout {
     readonly property bool avatarVisible: !sentByMe && (aboveAuthor !== author || aboveSection !== section || aboveEventType === "state" || aboveEventType === "emote" || aboveEventType === "other")
@@ -202,7 +201,7 @@ ColumnLayout {
 
                     color: "white"
 
-                    font.family: CommonFont.font.family
+                    font.family: window.font.family
                     font.pixelSize: 14
                     selectByMouse: true
                     readOnly: true
diff --git a/imports/Spectral/Font/CommonFont.qml b/imports/Spectral/Font/CommonFont.qml
deleted file mode 100644
index 6205c2e..0000000
--- a/imports/Spectral/Font/CommonFont.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma Singleton
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-
-Label {}
diff --git a/imports/Spectral/Font/qmldir b/imports/Spectral/Font/qmldir
index bdd2daa..96721b2 100644
--- a/imports/Spectral/Font/qmldir
+++ b/imports/Spectral/Font/qmldir
@@ -1,3 +1,2 @@
 module Spectral.Font
 singleton MaterialFont 0.1 MaterialFont.qml
-singleton CommonFont 0.1 CommonFont.qml
diff --git a/res.qrc b/res.qrc
index 3608cc1..bec5bb8 100644
--- a/res.qrc
+++ b/res.qrc
@@ -30,7 +30,6 @@
         <file>imports/Spectral/Component/AutoListView.qml</file>
         <file>imports/Spectral/Component/AutoTextField.qml</file>
         <file>imports/Spectral/Panel/RoomPanelInput.qml</file>
-        <file>imports/Spectral/Font/CommonFont.qml</file>
         <file>imports/Spectral/Component/Timeline/SectionDelegate.qml</file>
         <file>assets/img/matrix.svg</file>
         <file>imports/Spectral/Effect/RippleEffect.qml</file>