summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2011-10-17 14:18:42 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-18 10:26:39 +0200
commit0e341948ae6ab993f9d56f81809e71b8a9cc753d (patch)
treef9cb0a0d1bbc18c650c975e88eb2661a83acb6a6 /src/gui/text
parent41b01096ccae8761bb5a0a761780ad48ce7e34ba (diff)
Remove stale documentation.
Change-Id: I85139e0334b648bee0d18129cef9387dcc6c3222 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qfontmetrics.cpp68
-rw-r--r--src/gui/text/qplatformfontdatabase_qpa.cpp5
2 files changed, 0 insertions, 73 deletions
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index 012e9f300b..1d80e316fd 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -228,18 +228,6 @@ bool QFontMetrics::operator ==(const QFontMetrics &other) const
}
/*!
- \fn bool QFontMetrics::operator!=(const QFontMetrics &other)
-
- Returns true if \a other is not equal to this object; otherwise returns false.
-
- Two font metrics are considered equal if they were constructed
- from the same QFont and the paint devices they were constructed
- for are considered compatible.
-
- \sa operator==()
-*/
-
-/*!
\fn bool QFontMetrics::operator !=(const QFontMetrics &other) const
Returns true if \a other is not equal to this object; otherwise returns false.
@@ -1099,15 +1087,6 @@ bool QFontMetricsF::operator ==(const QFontMetricsF &other) const
}
/*!
- \fn bool QFontMetricsF::operator!=(const QFontMetricsF &other)
-
- Returns true if the font metrics are not equal to the \a other font
- metrics; otherwise returns false.
-
- \sa operator==()
-*/
-
-/*!
\fn bool QFontMetricsF::operator !=(const QFontMetricsF &other) const
\overload
@@ -1725,51 +1704,4 @@ qreal QFontMetricsF::lineWidth() const
return engine->lineThickness().toReal();
}
-/*!
- \fn QSize QFontMetrics::size(int flags, const QString &text, int len,
- int tabStops, int *tabArray) const
- \compat
-
- Use the size() function in combination with QString::left()
- instead.
-
- \oldcode
- QSize size = size(flags, str, len, tabstops, tabarray);
- \newcode
- QSize size = size(flags, str.left(len), tabstops, tabarray);
- \endcode
-*/
-
-/*!
- \fn QRect QFontMetrics::boundingRect(int x, int y, int w, int h, int flags,
- const QString& text, int len, int tabStops, int *tabArray) const
- \compat
-
- Use the boundingRect() function in combination with
- QString::left() and a QRect constructor instead.
-
- \oldcode
- QRect rect = boundingRect(x, y, w, h , flags, text, len,
- tabStops, tabArray);
- \newcode
- QRect rect = boundingRect(QRect(x, y, w, h), flags, text.left(len),
- tabstops, tabarray);
- \endcode
-
-*/
-
-/*!
- \fn QRect QFontMetrics::boundingRect(const QString &text, int len) const
- \compat
-
- Use the boundingRect() function in combination with
- QString::left() instead.
-
- \oldcode
- QRect rect = boundingRect(text, len);
- \newcode
- QRect rect = boundingRect(text.left(len));
- \endcode
-*/
-
QT_END_NAMESPACE
diff --git a/src/gui/text/qplatformfontdatabase_qpa.cpp b/src/gui/text/qplatformfontdatabase_qpa.cpp
index 89bc05985d..80ad31cea3 100644
--- a/src/gui/text/qplatformfontdatabase_qpa.cpp
+++ b/src/gui/text/qplatformfontdatabase_qpa.cpp
@@ -97,11 +97,6 @@ void QPlatformFontDatabase::registerQPF2Font(const QByteArray &dataArray, void *
}
/*!
- \fn void QPlatformFontDatabase::registerFont(const QString &familyName,
- const QString &foundryName, QFont::Weight weight, QFont::Style style,
- QFont::Stretch stretch, bool antialiased, bool scalable, int pixelSize,
- const QSupportedWritingSystems &writingSystems, void *usrPtr)
-
Registers a font with the given set of attributes describing the font's
foundry, family name, style and stretch information, pixel size, and
supported writing systems. Additional information about whether the font