Skip to content

Commit 19bc5de

Browse files
committed
Remove obsolete font tag helpers and \preliminary tag from documentation
Fixes: QTBUG-117046 Change-Id: I7e68298ba1c52bea9bdc2fca0c1f082df76d952e Reviewed-by: Marc Mutz <marc.mutz@qt.io>
1 parent 61ceff8 commit 19bc5de

File tree

2 files changed

+6
-55
lines changed

2 files changed

+6
-55
lines changed

src/gui/text/qfont.cpp

Lines changed: 6 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2364,9 +2364,8 @@ std::optional<QFont::Tag> QFont::Tag::fromString(QAnyStringView view) noexcept
23642364
*/
23652365

23662366
/*!
2367-
\since 6.6
2367+
\since 6.7
23682368
\overload
2369-
\preliminary
23702369
23712370
Applies an integer value to the typographical feature specified by \a tag when shaping the
23722371
text. This provides advanced access to the font shaping process, and can be used to support
@@ -2410,9 +2409,8 @@ void QFont::setFeature(Tag tag, quint32 value)
24102409
}
24112410

24122411
/*!
2413-
\since 6.6
2412+
\since 6.7
24142413
\overload
2415-
\preliminary
24162414
24172415
Unsets the \a tag from the map of explicitly enabled/disabled features.
24182416
@@ -2435,8 +2433,7 @@ void QFont::unsetFeature(Tag tag)
24352433
}
24362434

24372435
/*!
2438-
\since 6.6
2439-
\preliminary
2436+
\since 6.7
24402437
24412438
Returns a list of tags for all font features currently set on this QFont.
24422439
@@ -2450,8 +2447,7 @@ QList<QFont::Tag> QFont::featureTags() const
24502447
}
24512448

24522449
/*!
2453-
\since 6.6
2454-
\preliminary
2450+
\since 6.7
24552451
24562452
Returns the value set for a specific feature \a tag. If the tag has not been set, 0 will be
24572453
returned instead.
@@ -2466,8 +2462,7 @@ quint32 QFont::featureValue(Tag tag) const
24662462
}
24672463

24682464
/*!
2469-
\since 6.6
2470-
\preliminary
2465+
\since 6.7
24712466
24722467
Returns true if a value for the feature given by \a tag has been set on the QFont, otherwise
24732468
returns false.
@@ -2482,8 +2477,7 @@ bool QFont::isFeatureSet(Tag tag) const
24822477
}
24832478

24842479
/*!
2485-
\since 6.6
2486-
\preliminary
2480+
\since 6.7
24872481
24882482
Clears any previously set features on the QFont.
24892483
@@ -2496,43 +2490,6 @@ void QFont::clearFeatures()
24962490
d->features.clear();
24972491
}
24982492

2499-
/*!
2500-
\since 6.6
2501-
\internal
2502-
2503-
Returns the decoded name for \a tag as defined in the OpenType font specification. The tag
2504-
is decoded into four 8 bit characters. For valid tags, each will be in the basic Latin range of
2505-
0x20 to 0x7E.
2506-
2507-
\sa setFeature(), unsetFeature(), featureTags(), featureValue()
2508-
*/
2509-
QByteArray QFont::tagToString(quint32 tag)
2510-
{
2511-
if (auto maybeTag = QFont::Tag::fromValue(tag))
2512-
return maybeTag->toString();
2513-
return {};
2514-
}
2515-
2516-
/*!
2517-
\since 6.6
2518-
\internal
2519-
2520-
Returns the encoded tag for \a name as defined in the OpenType font specification. The name
2521-
must be a null-terminated string of four characters exactly, and in order to be a valid tag,
2522-
each character must be in the basic Latin range of 0x20 to 0x7E.
2523-
2524-
The function returns 0 for strings of the wrong length, but does not otherwise check the input
2525-
for validity.
2526-
2527-
\sa setFeature(), unsetFeature(), featureTags(), featureValue()
2528-
*/
2529-
quint32 QFont::stringToTag(const char *name)
2530-
{
2531-
if (auto maybeTag = QFont::Tag::fromString(name))
2532-
return maybeTag->value();
2533-
return 0;
2534-
}
2535-
25362493
extern QStringList qt_fallbacksForFamily(const QString &family, QFont::Style style,
25372494
QFont::StyleHint styleHint, QChar::Script script);
25382495

src/gui/text/qfont.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,6 @@ class Q_GUI_EXPORT QFont
208208
void setHintingPreference(HintingPreference hintingPreference);
209209
HintingPreference hintingPreference() const;
210210

211-
// Note: The following set of APIs are preliminary and may change in future releases
212-
213211
struct Tag
214212
{
215213
constexpr Tag() = default;
@@ -273,10 +271,6 @@ class Q_GUI_EXPORT QFont
273271
QList<Tag> featureTags() const;
274272
void clearFeatures();
275273

276-
static QByteArray tagToString(quint32 tag);
277-
static quint32 stringToTag(const char *tagString);
278-
// --
279-
280274
// dupicated from QFontInfo
281275
bool exactMatch() const;
282276

0 commit comments

Comments
 (0)