← Back to branch summary

~faenil/ubuntu-ui-toolkit/UbuntuTestCase_flick_flakiness_fix

« back to all changes in this revision

Viewing changes to src/Ubuntu/Components/plugin/ucfontutils.cpp

  • Committer: Andrea Bernabei
  • Date: 2016-02-09 21:30:24 UTC
  • mfrom: (1795.2.47 staging)
  • Revision ID: andrea.bernabei@canonical.com-20160209213024-txzjng3d5bewlu1l
merge staging

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Ubuntu/Components/plugin/ucfontutils.cpp
18
18
#include "ucfontutils.h"
19
19
#include "ucunits.h"
20
20
 
 
21
UCFontUtils *UCFontUtils::m_instance = nullptr;
 
22
 
21
23
/*!
22
24
 * \qmltype FontUtils
23
25
 * \instantiates UCFontUtils
64
66
 */
65
67
qreal UCFontUtils::sizeToPixels(const QString &size)
66
68
{
67
 
    return modularScale(size) * UCUnits::instance().dp(fontUnits);
 
69
    return modularScale(size) * UCUnits::instance()->dp(fontUnits);
68
70
}
69
71
 
70
72
/*!