From 2ee5d6dd5de94e8bade310330a6f8e651edbb60e Mon Sep 17 00:00:00 2001
From: johanneshilden <hildenjohannes@gmail.com>
Date: Fri, 6 Oct 2017 23:11:41 +0300
Subject: [PATCH] Use resource alias to load fonts, as per suggestion from
 fperillo

---
 components/lib/qtmaterialcheckable.cpp      |  6 +-----
 components/lib/qtmaterialstyle.cpp          |  6 +++---
 components/qtmaterialflatbutton.cpp         |  4 +---
 components/qtmaterialsnackbar.cpp           |  4 +---
 components/qtmaterialtextfield.cpp          |  5 +----
 components/qtmaterialtextfield_internal.cpp |  4 +---
 components/resources.qrc                    | 12 ++++++------
 7 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/components/lib/qtmaterialcheckable.cpp b/components/lib/qtmaterialcheckable.cpp
index 9921f9e..ee4e0bd 100644
--- a/components/lib/qtmaterialcheckable.cpp
+++ b/components/lib/qtmaterialcheckable.cpp
@@ -1,7 +1,6 @@
 #include "lib/qtmaterialcheckable.h"
 #include "lib/qtmaterialcheckable_p.h"
 #include <QPainter>
-#include <QFontDatabase>
 #include <QEvent>
 #include <QStateMachine>
 #include <QSignalTransition>
@@ -49,10 +48,7 @@ void QtMaterialCheckablePrivate::init()
 
     q->setCheckable(true);
     q->setStyle(&QtMaterialStyle::instance());
-
-    QFontDatabase db;
-    QFont font(db.font("Roboto", "Regular", 11));
-    q->setFont(font);
+    q->setFont(QFont("Roboto", 11, QFont::Normal));
 
     stateMachine->addState(uncheckedState);
     stateMachine->addState(checkedState);
diff --git a/components/lib/qtmaterialstyle.cpp b/components/lib/qtmaterialstyle.cpp
index aedbf12..83bbab8 100644
--- a/components/lib/qtmaterialstyle.cpp
+++ b/components/lib/qtmaterialstyle.cpp
@@ -20,9 +20,9 @@ void QtMaterialStylePrivate::init()
 {
     Q_Q(QtMaterialStyle);
 
-    QFontDatabase::addApplicationFont(":/material/fonts/Roboto/Roboto-Regular.ttf");
-    QFontDatabase::addApplicationFont(":/material/fonts/Roboto/Roboto-Medium.ttf");
-    QFontDatabase::addApplicationFont(":/material/fonts/Roboto/Roboto-Bold.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/roboto_regular");
+    QFontDatabase::addApplicationFont(":/fonts/roboto_medium");
+    QFontDatabase::addApplicationFont(":/fonts/roboto_bold");
 
     q->setTheme(new QtMaterialTheme);
 }
diff --git a/components/qtmaterialflatbutton.cpp b/components/qtmaterialflatbutton.cpp
index 4a2debe..6f6ab48 100644
--- a/components/qtmaterialflatbutton.cpp
+++ b/components/qtmaterialflatbutton.cpp
@@ -1,6 +1,5 @@
 #include "qtmaterialflatbutton.h"
 #include "qtmaterialflatbutton_p.h"
-#include <QFontDatabase>
 #include <QPainter>
 #include <QMouseEvent>
 #include <QResizeEvent>
@@ -58,8 +57,7 @@ void QtMaterialFlatButtonPrivate::init()
     q->setAttribute(Qt::WA_Hover);
     q->setMouseTracking(true);
 
-    QFontDatabase db;
-    QFont font(db.font("Roboto", "Medium", fontSize));
+    QFont font("Roboto", fontSize, QFont::Medium);
     font.setCapitalization(QFont::AllUppercase);
     q->setFont(font);
 
diff --git a/components/qtmaterialsnackbar.cpp b/components/qtmaterialsnackbar.cpp
index a773e5d..323ff20 100644
--- a/components/qtmaterialsnackbar.cpp
+++ b/components/qtmaterialsnackbar.cpp
@@ -2,7 +2,6 @@
 #include "qtmaterialsnackbar_p.h"
 #include <QtWidgets/QApplication>
 #include <QPainter>
-#include <QFontDatabase>
 #include "qtmaterialsnackbar_internal.h"
 #include "lib/qtmaterialstyle.h"
 #include "lib/qtmaterialstatetransition.h"
@@ -35,8 +34,7 @@ void QtMaterialSnackbarPrivate::init()
 
     q->setAttribute(Qt::WA_TransparentForMouseEvents);
 
-    QFontDatabase db;
-    QFont font(db.font("Roboto", "Medium", 10));
+    QFont font("Roboto", 10, QFont::Medium);
     font.setCapitalization(QFont::AllUppercase);
     q->setFont(font);
 
diff --git a/components/qtmaterialtextfield.cpp b/components/qtmaterialtextfield.cpp
index 3804e7c..5301c73 100644
--- a/components/qtmaterialtextfield.cpp
+++ b/components/qtmaterialtextfield.cpp
@@ -1,6 +1,5 @@
 #include "qtmaterialtextfield.h"
 #include "qtmaterialtextfield_p.h"
-#include <QFontDatabase>
 #include <QtWidgets/QApplication>
 #include <QPainter>
 #include "qtmaterialtextfield_internal.h"
@@ -38,9 +37,7 @@ void QtMaterialTextFieldPrivate::init()
     q->setMouseTracking(true);
     q->setTextMargins(0, 2, 0, 4);
 
-    QFontDatabase db;
-    QFont font(db.font("Roboto", "Regular", 11));
-    q->setFont(font);
+    q->setFont(QFont("Roboto", 11, QFont::Normal));
 
     stateMachine->start();
     QCoreApplication::processEvents();
diff --git a/components/qtmaterialtextfield_internal.cpp b/components/qtmaterialtextfield_internal.cpp
index 156acc9..b8b4ce7 100644
--- a/components/qtmaterialtextfield_internal.cpp
+++ b/components/qtmaterialtextfield_internal.cpp
@@ -2,7 +2,6 @@
 #include <QPropertyAnimation>
 #include <QEventTransition>
 #include <QPainter>
-#include <QFontDatabase>
 #include "qtmaterialtextfield.h"
 
 /*!
@@ -134,8 +133,7 @@ QtMaterialTextFieldLabel::QtMaterialTextFieldLabel(QtMaterialTextField *parent)
 {
     Q_ASSERT(parent);
 
-    QFontDatabase db;
-    QFont font(db.font("Roboto", "Medium", parent->labelFontSize()));
+    QFont font("Roboto", parent->labelFontSize(), QFont::Medium);
     font.setLetterSpacing(QFont::PercentageSpacing, 102);
     setFont(font);
 }
diff --git a/components/resources.qrc b/components/resources.qrc
index 2c9f6a4..605bd1a 100644
--- a/components/resources.qrc
+++ b/components/resources.qrc
@@ -1,11 +1,11 @@
 <RCC>
     <qresource prefix="/fonts">
-        <file>../fonts/Roboto/Roboto-Black.ttf</file>
-        <file>../fonts/Roboto/Roboto-Bold.ttf</file>
-        <file>../fonts/Roboto/Roboto-Medium.ttf</file>
-        <file>../fonts/Roboto/Roboto-Regular.ttf</file>
-        <file>../fonts/Roboto/Roboto-Light.ttf</file>
-        <file>../fonts/Roboto/Roboto-Thin.ttf</file>
+        <file alias="roboto_black">../fonts/Roboto/Roboto-Black.ttf</file>
+        <file alias="roboto_bold">../fonts/Roboto/Roboto-Bold.ttf</file>
+        <file alias="roboto_medium">../fonts/Roboto/Roboto-Medium.ttf</file>
+        <file alias="roboto_regular">../fonts/Roboto/Roboto-Regular.ttf</file>
+        <file alias="roboto_light">../fonts/Roboto/Roboto-Light.ttf</file>
+        <file alias="roboto_thin">../fonts/Roboto/Roboto-Thin.ttf</file>
     </qresource>
     <qresource prefix="/icons">
         <file>icons/communication/svg/production/ic_message_24px.svg</file>