1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API-cleanup: Add QPlatformFontDatabase::registerAliasToFontFamily().

Browse Source 
Unexport free function qt_registerAliasToFontFamily() and
Make it a static member of QPlatformFontDatabase instead.

Change-Id: I1df49a8e37a24b3961f92288d67b6f1108a7d520
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
This commit is contained in:
Friedemann Kleint 2013-07-11 16:23:02 +02:00 committed by The Qt Project
parent ba1aba61cc
commit 915f4d8c95
8 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/qfontdatabase_qpa.cpp
View File

@ -85,7 +85,7 @@ Q_GUI_EXPORT void qt_registerFont(const QString &familyName, const QString &sty
size->handle = handle;
}
Q_GUI_EXPORT void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias)
void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias)
{
if (alias.isEmpty())
return;

13
src/gui/text/qplatformfontdatabase.cpp
View File

@ -53,6 +53,8 @@ extern void qt_registerFont(const QString &familyname, const QString &stylename,
bool scalable, int pixelSize, bool fixedPitch,
const QSupportedWritingSystems &writingSystems, void *hanlde);
void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias);
/*!
\fn void QPlatformFontDatabase::registerQPF2Font(const QByteArray &dataArray, void *handle)
@ -516,6 +518,17 @@ QSupportedWritingSystems QPlatformFontDatabase::writingSystemsFromTrueTypeBits(q
return writingSystems;
}
/*!
Helper function that register the \a alias for the \a familyName.
\since 5.2
*/
void QPlatformFontDatabase::registerAliasToFontFamily(const QString &familyName, const QString &alias)
{
qt_registerAliasToFontFamily(familyName, alias);
}
/*!
\class QPlatformFontDatabase
\since 5.0

2
src/gui/text/qplatformfontdatabase.h
View File

@ -122,6 +122,8 @@ public:
QFont::Style style, QFont::Stretch stretch, bool antialiased,
bool scalable, int pixelSize, bool fixedPitch,
const QSupportedWritingSystems &writingSystems, void *handle);
static void registerAliasToFontFamily(const QString &familyName, const QString &alias);
};
QT_END_NAMESPACE

4
src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
View File

@ -317,8 +317,6 @@ static const char *getFcFamilyForStyleHint(const QFont::StyleHint style)
return stylehint;
}
Q_GUI_EXPORT void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias);
void QFontconfigDatabase::populateFontDatabase()
{
FcFontSet *fonts;
@ -453,7 +451,7 @@ void QFontconfigDatabase::populateFontDatabase()
// qDebug() << familyName << (const char *)foundry_value << weight << style << &writingSystems << scalable << true << pixel_size;
for (int k = 1; FcPatternGetString(fonts->fonts[i], FC_FAMILY, k, &value) == FcResultMatch; ++k)
qt_registerAliasToFontFamily(familyName, QString::fromUtf8((const char *)value));
QPlatformFontDatabase::registerAliasToFontFamily(familyName, QString::fromUtf8((const char *)value));
}
FcFontSetDestroy (fonts);

4
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
View File

@ -838,8 +838,6 @@ error:
return i18n_name;
}
Q_GUI_EXPORT void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias);
static bool addFontToDatabase(const QString &familyName, uchar charSet,
const TEXTMETRIC *textmetric,
const FONTSIGNATURE *signature,
@ -932,7 +930,7 @@ static bool addFontToDatabase(const QString &familyName, uchar charSet,
QFont::StyleItalic, stretch, antialias, scalable, size, fixed, writingSystems, 0);
if (!englishName.isEmpty())
qt_registerAliasToFontFamily(familyName, englishName);
QPlatformFontDatabase::registerAliasToFontFamily(familyName, englishName);
return true;
}

4
src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
View File

@ -122,8 +122,6 @@ static FontFile * createFontFile(const QString &fileName, int index)
extern bool localizedName(const QString &name);
extern QString getEnglishName(const QString &familyName);
Q_GUI_EXPORT void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias);
static bool addFontToDatabase(const QString &familyName, uchar charSet,
const TEXTMETRIC *textmetric,
const FONTSIGNATURE *signature,
@ -304,7 +302,7 @@ static bool addFontToDatabase(const QString &familyName, uchar charSet,
antialias, scalable, size, fixed, writingSystems, createFontFile(value, index));
if (!englishName.isEmpty())
qt_registerAliasToFontFamily(faceName, englishName);
QPlatformFontDatabase::registerAliasToFontFamily(faceName, englishName);
return true;
}

3
tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
View File

@ -2,8 +2,7 @@ CONFIG += testcase
CONFIG += parallel_test
TARGET = tst_qfontdatabase
SOURCES += tst_qfontdatabase.cpp
QT += testlib
!mac: QT += core-private gui-private
QT += testlib core-private gui-private
wince* {
additionalFiles.files = FreeMono.ttf

7
tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
View File

@ -44,6 +44,7 @@
#include <qfontdatabase.h>
#include <qfontinfo.h>
#include <qfontmetrics.h>
#include <qpa/qplatformfontdatabase.h>
class tst_QFontDatabase : public QObject
{
@ -277,10 +278,6 @@ void tst_QFontDatabase::addAppFont()
QCOMPARE(db.families(), oldFamilies);
}
QT_BEGIN_NAMESPACE
Q_GUI_EXPORT void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias);
QT_END_NAMESPACE
void tst_QFontDatabase::aliases()
{
QFontDatabase db;
@ -290,7 +287,7 @@ void tst_QFontDatabase::aliases()
QVERIFY(db.hasFamily(firstFont));
const QString alias = QStringLiteral("AliasToFirstFont") + firstFont;
QVERIFY(!db.hasFamily(alias));
qt_registerAliasToFontFamily(firstFont, alias);
QPlatformFontDatabase::registerAliasToFontFamily(firstFont, alias);
QVERIFY(db.hasFamily(alias));
}