Fix a number of qdoc warnings related to deprecation
Remove obsolete documentation. Change-Id: Iaf4b6f9852a883dea0f256c5c89e74f6ebbe85f3 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
This commit is contained in:
Friedemann Kleint
parent
27fcf66319
commit
61a50b2b9b
@ -1943,20 +1943,6 @@ void qErrnoWarning(int code, const char *msg, ...)
|
||||
qt_message_output(QtCriticalMsg, context, buf);
|
||||
}
|
||||
|
||||
/*!
|
||||
\typedef QtMsgHandler
|
||||
\relates <QtGlobal>
|
||||
\deprecated
|
||||
|
||||
This is a typedef for a pointer to a function with the following
|
||||
signature:
|
||||
|
||||
\snippet code/src_corelib_global_qglobal.cpp 7
|
||||
|
||||
This typedef is deprecated, you should use QtMessageHandler instead.
|
||||
\sa QtMsgType, QtMessageHandler, qInstallMessageHandler()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\typedef QtMessageHandler
|
||||
\relates <QtGlobal>
|
||||
|
||||
@ -2745,11 +2745,9 @@
|
||||
default delegate. (Qt::Alignment)
|
||||
\value BackgroundRole The background brush used for items rendered with
|
||||
the default delegate. (QBrush)
|
||||
\value BackgroundColorRole This role is obsolete. Use BackgroundRole instead.
|
||||
\value ForegroundRole The foreground brush (text color, typically)
|
||||
used for items rendered with the default delegate.
|
||||
(QBrush)
|
||||
\value TextColorRole This role is obsolete. Use ForegroundRole instead.
|
||||
\value CheckStateRole This role is used to obtain the checked state of
|
||||
an item. (Qt::CheckState)
|
||||
\value InitialSortOrderRole This role is used to obtain the initial sort order
|
||||
|
||||
@ -765,13 +765,6 @@ void QProcessPrivate::Channel::clear()
|
||||
\sa QProcess::CreateProcessArgumentModifier
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn void QProcess::error(QProcess::ProcessError error)
|
||||
\obsolete
|
||||
|
||||
Use errorOccurred() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn void QProcess::errorOccurred(QProcess::ProcessError error)
|
||||
\since 5.6
|
||||
|
||||
@ -862,21 +862,6 @@ bool QTemporaryFile::rename(const QString &newName)
|
||||
return false;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTemporaryFile *QTemporaryFile::createLocalFile(const QString &fileName)
|
||||
\overload
|
||||
\obsolete
|
||||
|
||||
Use QTemporaryFile::createNativeFile(const QString &fileName) instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QTemporaryFile *QTemporaryFile::createLocalFile(QFile &file)
|
||||
\obsolete
|
||||
|
||||
Use QTemporaryFile::createNativeFile(QFile &file) instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QTemporaryFile *QTemporaryFile::createNativeFile(const QString &fileName)
|
||||
\overload
|
||||
|
||||
@ -1931,21 +1931,6 @@ void QUrl::setUrl(const QString &url, ParsingMode parsingMode)
|
||||
}
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn void QUrl::setEncodedUrl(const QByteArray &encodedUrl, ParsingMode parsingMode)
|
||||
\deprecated
|
||||
Constructs a URL by parsing the contents of \a encodedUrl.
|
||||
|
||||
\a encodedUrl is assumed to be a URL string in percent encoded
|
||||
form, containing only ASCII characters.
|
||||
|
||||
The parsing mode \a parsingMode is used for parsing \a encodedUrl.
|
||||
|
||||
\obsolete Use setUrl(QString::fromUtf8(encodedUrl), parsingMode)
|
||||
|
||||
\sa setUrl()
|
||||
*/
|
||||
|
||||
/*!
|
||||
Sets the scheme of the URL to \a scheme. As a scheme can only
|
||||
contain ASCII characters, no conversion or decoding is done on the
|
||||
@ -2214,35 +2199,6 @@ QString QUrl::userName(ComponentFormattingOptions options) const
|
||||
return result;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn void QUrl::setEncodedUserName(const QByteArray &userName)
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Sets the URL's user name to the percent-encoded \a userName. The \a
|
||||
userName is part of the user info element in the authority of the
|
||||
URL, as described in setUserInfo().
|
||||
|
||||
\obsolete Use setUserName(QString::fromUtf8(userName))
|
||||
|
||||
\sa setUserName(), encodedUserName(), setUserInfo()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QByteArray QUrl::encodedUserName() const
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Returns the user name of the URL if it is defined; otherwise
|
||||
an empty string is returned. The returned value will have its
|
||||
non-ASCII and other control characters percent-encoded, as in
|
||||
toEncoded().
|
||||
|
||||
\obsolete Use userName(QUrl::FullyEncoded).toLatin1()
|
||||
|
||||
\sa setEncodedUserName()
|
||||
*/
|
||||
|
||||
/*!
|
||||
Sets the URL's password to \a password. The \a password is part of
|
||||
the user info element in the authority of the URL, as described in
|
||||
@ -2306,35 +2262,6 @@ QString QUrl::password(ComponentFormattingOptions options) const
|
||||
return result;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn void QUrl::setEncodedPassword(const QByteArray &password)
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Sets the URL's password to the percent-encoded \a password. The \a
|
||||
password is part of the user info element in the authority of the
|
||||
URL, as described in setUserInfo().
|
||||
|
||||
\obsolete Use setPassword(QString::fromUtf8(password));
|
||||
|
||||
\sa setPassword(), encodedPassword(), setUserInfo()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QByteArray QUrl::encodedPassword() const
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Returns the password of the URL if it is defined; otherwise an
|
||||
empty string is returned. The returned value will have its
|
||||
non-ASCII and other control characters percent-encoded, as in
|
||||
toEncoded().
|
||||
|
||||
\obsolete Use password(QUrl::FullyEncoded).toLatin1()
|
||||
|
||||
\sa setEncodedPassword(), toEncoded()
|
||||
*/
|
||||
|
||||
/*!
|
||||
Sets the host of the URL to \a host. The host is part of the
|
||||
authority.
|
||||
@ -2416,40 +2343,6 @@ QString QUrl::host(ComponentFormattingOptions options) const
|
||||
return result;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn void QUrl::setEncodedHost(const QByteArray &host)
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Sets the URL's host to the ACE- or percent-encoded \a host. The \a
|
||||
host is part of the user info element in the authority of the
|
||||
URL, as described in setAuthority().
|
||||
|
||||
\obsolete Use setHost(QString::fromUtf8(host)).
|
||||
|
||||
\sa setHost(), encodedHost(), setAuthority(), fromAce()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QByteArray QUrl::encodedHost() const
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Returns the host part of the URL if it is defined; otherwise
|
||||
an empty string is returned.
|
||||
|
||||
Note: encodedHost() does not return percent-encoded hostnames. Instead,
|
||||
the ACE-encoded (bare ASCII in Punycode encoding) form will be
|
||||
returned for any non-ASCII hostname.
|
||||
|
||||
This function is equivalent to calling QUrl::toAce() on the return
|
||||
value of host().
|
||||
|
||||
\obsolete Use host(QUrl::FullyEncoded).toLatin1() or toAce(host()).
|
||||
|
||||
\sa setEncodedHost()
|
||||
*/
|
||||
|
||||
/*!
|
||||
Sets the port of the URL to \a port. The port is part of the
|
||||
authority of the URL, as described in setAuthority().
|
||||
@ -2575,42 +2468,6 @@ QString QUrl::path(ComponentFormattingOptions options) const
|
||||
return result;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn void QUrl::setEncodedPath(const QByteArray &path)
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Sets the URL's path to the percent-encoded \a path. The path is
|
||||
the part of the URL that comes after the authority but before the
|
||||
query string.
|
||||
|
||||
\image qurl-ftppath.png
|
||||
|
||||
For non-hierarchical schemes, the path will be everything
|
||||
following the scheme declaration, as in the following example:
|
||||
|
||||
\image qurl-mailtopath.png
|
||||
|
||||
\obsolete Use setPath(QString::fromUtf8(path)).
|
||||
|
||||
\sa setPath(), encodedPath(), setUserInfo()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QByteArray QUrl::encodedPath() const
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Returns the path of the URL if it is defined; otherwise an
|
||||
empty string is returned. The returned value will have its
|
||||
non-ASCII and other control characters percent-encoded, as in
|
||||
toEncoded().
|
||||
|
||||
\obsolete Use path(QUrl::FullyEncoded).toLatin1().
|
||||
|
||||
\sa setEncodedPath(), toEncoded()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\since 5.2
|
||||
|
||||
@ -2703,29 +2560,6 @@ void QUrl::setQuery(const QString &query, ParsingMode mode)
|
||||
d->query.clear();
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn void QUrl::setEncodedQuery(const QByteArray &query)
|
||||
\deprecated
|
||||
|
||||
Sets the query string of the URL to \a query. The string is
|
||||
inserted as-is, and no further encoding is performed when calling
|
||||
toEncoded().
|
||||
|
||||
This function is useful if you need to pass a query string that
|
||||
does not fit into the key-value pattern, or that uses a different
|
||||
scheme for encoding special characters than what is suggested by
|
||||
QUrl.
|
||||
|
||||
Passing a value of QByteArray() to \a query (a null QByteArray) unsets
|
||||
the query completely. However, passing a value of QByteArray("")
|
||||
will set the query to an empty value, as if the original URL
|
||||
had a lone "?".
|
||||
|
||||
\obsolete Use setQuery, which has the same null / empty behavior.
|
||||
|
||||
\sa encodedQuery(), hasQuery()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\overload
|
||||
\since 5.0
|
||||
@ -2750,248 +2584,6 @@ void QUrl::setQuery(const QUrlQuery &query)
|
||||
d->sectionIsPresent |= QUrlPrivate::Query;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn void QUrl::setQueryItems(const QList<QPair<QString, QString> > &query)
|
||||
\deprecated
|
||||
|
||||
Sets the query string of the URL to an encoded version of \a
|
||||
query. The contents of \a query are converted to a string
|
||||
internally, each pair delimited by the character returned by
|
||||
\l {QUrlQuery::queryPairDelimiter()}{queryPairDelimiter()}, and the key and value are delimited by
|
||||
\l {QUrlQuery::queryValueDelimiter()}{queryValueDelimiter()}
|
||||
|
||||
\note This method does not encode spaces (ASCII 0x20) as plus (+) signs,
|
||||
like HTML forms do. If you need that kind of encoding, you must encode
|
||||
the value yourself and use QUrl::setEncodedQueryItems.
|
||||
|
||||
\obsolete Use QUrlQuery and setQuery().
|
||||
|
||||
\sa queryItems(), setEncodedQueryItems()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn void QUrl::setEncodedQueryItems(const QList<QPair<QByteArray, QByteArray> > &query)
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Sets the query string of the URL to the encoded version of \a
|
||||
query. The contents of \a query are converted to a string
|
||||
internally, each pair delimited by the character returned by
|
||||
\l {QUrlQuery::queryPairDelimiter()}{queryPairDelimiter()}, and the key and value are delimited by
|
||||
\l {QUrlQuery::queryValueDelimiter()}{queryValueDelimiter()}.
|
||||
|
||||
\obsolete Use QUrlQuery and setQuery().
|
||||
|
||||
\sa encodedQueryItems(), setQueryItems()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn void QUrl::addQueryItem(const QString &key, const QString &value)
|
||||
\deprecated
|
||||
|
||||
Inserts the pair \a key = \a value into the query string of the
|
||||
URL.
|
||||
|
||||
The key-value pair is encoded before it is added to the query. The
|
||||
pair is converted into separate strings internally. The \a key and
|
||||
\a value is first encoded into UTF-8 and then delimited by the
|
||||
character returned by \l {QUrlQuery::queryValueDelimiter()}{queryValueDelimiter()}.
|
||||
Each key-value pair is delimited by the character returned by
|
||||
\l {QUrlQuery::queryPairDelimiter()}{queryPairDelimiter()}
|
||||
|
||||
\note This method does not encode spaces (ASCII 0x20) as plus (+) signs,
|
||||
like HTML forms do. If you need that kind of encoding, you must encode
|
||||
the value yourself and use QUrl::addEncodedQueryItem.
|
||||
|
||||
\obsolete Use QUrlQuery and setQuery().
|
||||
|
||||
\sa addEncodedQueryItem()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn void QUrl::addEncodedQueryItem(const QByteArray &key, const QByteArray &value)
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Inserts the pair \a key = \a value into the query string of the
|
||||
URL.
|
||||
|
||||
\obsolete Use QUrlQuery and setQuery().
|
||||
|
||||
\sa addQueryItem()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QList<QPair<QString, QString> > QUrl::queryItems() const
|
||||
\deprecated
|
||||
|
||||
Returns the query string of the URL, as a map of keys and values.
|
||||
|
||||
\note This method does not decode spaces plus (+) signs as spaces (ASCII
|
||||
0x20), like HTML forms do. If you need that kind of decoding, you must
|
||||
use QUrl::encodedQueryItems and decode the data yourself.
|
||||
|
||||
\obsolete Use QUrlQuery.
|
||||
|
||||
\sa setQueryItems(), setEncodedQuery()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QList<QPair<QByteArray, QByteArray> > QUrl::encodedQueryItems() const
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Returns the query string of the URL, as a map of encoded keys and values.
|
||||
|
||||
\obsolete Use QUrlQuery.
|
||||
|
||||
\sa setEncodedQueryItems(), setQueryItems(), setEncodedQuery()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn bool QUrl::hasQueryItem(const QString &key) const
|
||||
\deprecated
|
||||
|
||||
Returns \c true if there is a query string pair whose key is equal
|
||||
to \a key from the URL.
|
||||
|
||||
\obsolete Use QUrlQuery.
|
||||
|
||||
\sa hasEncodedQueryItem()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn bool QUrl::hasEncodedQueryItem(const QByteArray &key) const
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Returns \c true if there is a query string pair whose key is equal
|
||||
to \a key from the URL.
|
||||
|
||||
\obsolete Use QUrlQuery.
|
||||
|
||||
\sa hasQueryItem()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QString QUrl::queryItemValue(const QString &key) const
|
||||
\deprecated
|
||||
|
||||
Returns the first query string value whose key is equal to \a key
|
||||
from the URL.
|
||||
|
||||
\note This method does not decode spaces plus (+) signs as spaces (ASCII
|
||||
0x20), like HTML forms do. If you need that kind of decoding, you must
|
||||
use QUrl::encodedQueryItemValue and decode the data yourself.
|
||||
|
||||
\obsolete Use QUrlQuery.
|
||||
|
||||
\sa allQueryItemValues()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QByteArray QUrl::encodedQueryItemValue(const QByteArray &key) const
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Returns the first query string value whose key is equal to \a key
|
||||
from the URL.
|
||||
|
||||
\obsolete Use QUrlQuery.
|
||||
|
||||
\sa queryItemValue(), allQueryItemValues()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QStringList QUrl::allQueryItemValues(const QString &key) const
|
||||
\deprecated
|
||||
|
||||
Returns the a list of query string values whose key is equal to
|
||||
\a key from the URL.
|
||||
|
||||
\note This method does not decode spaces plus (+) signs as spaces (ASCII
|
||||
0x20), like HTML forms do. If you need that kind of decoding, you must
|
||||
use QUrl::allEncodedQueryItemValues and decode the data yourself.
|
||||
|
||||
\obsolete Use QUrlQuery.
|
||||
|
||||
\sa queryItemValue()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QList<QByteArray> QUrl::allEncodedQueryItemValues(const QByteArray &key) const
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Returns the a list of query string values whose key is equal to
|
||||
\a key from the URL.
|
||||
|
||||
\obsolete Use QUrlQuery.
|
||||
|
||||
\sa allQueryItemValues(), queryItemValue(), encodedQueryItemValue()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn void QUrl::removeQueryItem(const QString &key)
|
||||
\deprecated
|
||||
|
||||
Removes the first query string pair whose key is equal to \a key
|
||||
from the URL.
|
||||
|
||||
\obsolete Use QUrlQuery.
|
||||
|
||||
\sa removeAllQueryItems()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn void QUrl::removeEncodedQueryItem(const QByteArray &key)
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Removes the first query string pair whose key is equal to \a key
|
||||
from the URL.
|
||||
|
||||
\obsolete Use QUrlQuery.
|
||||
|
||||
\sa removeQueryItem(), removeAllQueryItems()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn void QUrl::removeAllQueryItems(const QString &key)
|
||||
\deprecated
|
||||
|
||||
Removes all the query string pairs whose key is equal to \a key
|
||||
from the URL.
|
||||
|
||||
\obsolete Use QUrlQuery.
|
||||
|
||||
\sa removeQueryItem()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn void QUrl::removeAllEncodedQueryItems(const QByteArray &key)
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Removes all the query string pairs whose key is equal to \a key
|
||||
from the URL.
|
||||
|
||||
\obsolete Use QUrlQuery.
|
||||
|
||||
\sa removeQueryItem()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QByteArray QUrl::encodedQuery() const
|
||||
\deprecated
|
||||
|
||||
Returns the query string of the URL in percent encoded form.
|
||||
|
||||
\obsolete Use query(QUrl::FullyEncoded).toLatin1()
|
||||
|
||||
\sa setEncodedQuery(), query()
|
||||
*/
|
||||
|
||||
/*!
|
||||
Returns the query string of the URL if there's a query string, or an empty
|
||||
result if not. To determine if the parsed URL contained a query string, use
|
||||
@ -3093,45 +2685,6 @@ QString QUrl::fragment(ComponentFormattingOptions options) const
|
||||
return result;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn void QUrl::setEncodedFragment(const QByteArray &fragment)
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Sets the URL's fragment to the percent-encoded \a fragment. The fragment is the
|
||||
last part of the URL, represented by a '#' followed by a string of
|
||||
characters. It is typically used in HTTP for referring to a
|
||||
certain link or point on a page:
|
||||
|
||||
\image qurl-fragment.png
|
||||
|
||||
The fragment is sometimes also referred to as the URL "reference".
|
||||
|
||||
Passing an argument of QByteArray() (a null QByteArray) will unset the fragment.
|
||||
Passing an argument of QByteArray("") (an empty but not null QByteArray)
|
||||
will set the fragment to an empty string (as if the original URL
|
||||
had a lone "#").
|
||||
|
||||
\obsolete Use setFragment(), which has the same behavior of null / empty.
|
||||
|
||||
\sa setFragment(), encodedFragment()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QByteArray QUrl::encodedFragment() const
|
||||
\deprecated
|
||||
\since 4.4
|
||||
|
||||
Returns the fragment of the URL if it is defined; otherwise an
|
||||
empty string is returned. The returned value will have its
|
||||
non-ASCII and other control characters percent-encoded, as in
|
||||
toEncoded().
|
||||
|
||||
\obsolete Use query(QUrl::FullyEncoded).toLatin1().
|
||||
|
||||
\sa setEncodedFragment(), toEncoded()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\since 4.2
|
||||
|
||||
|
||||
@ -2832,7 +2832,8 @@ void QSortFilterProxyModel::setRecursiveFilteringEnabled(bool recursive)
|
||||
|
||||
/*!
|
||||
\since 6.0
|
||||
\fn void QSortFilterProxyModel::showMatchesChildrenChanged(bool autoAcceptChildRows)
|
||||
\fn void QSortFilterProxyModel::autoAcceptChildRowsChanged(bool autoAcceptChildRows)
|
||||
|
||||
\brief This signals is emitted when the value of the \a autoAcceptChildRows property is changed.
|
||||
|
||||
\sa autoAcceptChildRows
|
||||
|
||||
@ -74,9 +74,8 @@ QAbstractNativeEventFilter::~QAbstractNativeEventFilter()
|
||||
eventDispatcher->removeNativeEventFilter(this);
|
||||
}
|
||||
|
||||
// ### fixme Qt 6: result will be qintptr *
|
||||
/*!
|
||||
\fn bool QAbstractNativeEventFilter::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
|
||||
\fn bool QAbstractNativeEventFilter::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result)
|
||||
|
||||
This method is called for every native event.
|
||||
|
||||
|
||||
@ -676,7 +676,7 @@ void QMetaType::destruct(void *data) const
|
||||
|
||||
\note If no less than operator was visible to the metatype declaration, values are
|
||||
unordered even if an equality operator visible to the declaration considers them equal:
|
||||
\s{compare() == 0} only agrees with equals() if the less than operator was visible.
|
||||
\c{compare() == 0} only agrees with equals() if the less than operator was visible.
|
||||
|
||||
\since 6.0
|
||||
\sa equals(), isOrdered()
|
||||
@ -996,26 +996,6 @@ bool QMetaType::convert(const void *from, int fromTypeId, void *to, int toTypeId
|
||||
return f && f->convert(f, from, to);
|
||||
}
|
||||
|
||||
/*!
|
||||
bool QMetaType::compare(const void *lhs, const void *rhs, int typeId, int* result)
|
||||
\deprecated Use the non-static compare method instead
|
||||
|
||||
Compares the objects at \a lhs and \a rhs. Both objects need to be of type \a typeId.
|
||||
\a result is set to less than, equal to or greater than zero, if \a lhs is less than, equal to
|
||||
or greater than \a rhs. Returns \c true, if the comparison succeeded, otherwise \c false.
|
||||
\since 5.2
|
||||
*/
|
||||
|
||||
/*!
|
||||
bool QMetaType::equals(const void *lhs, const void *rhs, int typeId, int *result)
|
||||
\deprecated Use the non-static equals method instead
|
||||
|
||||
Compares the objects at \a lhs and \a rhs. Both objects need to be of type \a typeId.
|
||||
\a result is set to zero, if \a lhs equals to rhs. Returns \c true, if the comparison
|
||||
succeeded, otherwise \c false.
|
||||
\since 5.5
|
||||
*/
|
||||
|
||||
/*!
|
||||
Streams the object at \a rhs of type \a typeId to the debug stream \a dbg. Returns \c true
|
||||
on success, otherwise false.
|
||||
|
||||
@ -4091,21 +4091,6 @@ static void dumpRecursive(int level, const QObject *object)
|
||||
}
|
||||
}
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
/*!
|
||||
\overload
|
||||
\obsolete
|
||||
|
||||
Dumps a tree of children to the debug output.
|
||||
|
||||
\sa dumpObjectInfo()
|
||||
*/
|
||||
|
||||
void QObject::dumpObjectTree()
|
||||
{
|
||||
const_cast<const QObject *>(this)->dumpObjectTree();
|
||||
}
|
||||
#endif
|
||||
|
||||
/*!
|
||||
Dumps a tree of children to the debug output.
|
||||
@ -4120,23 +4105,6 @@ void QObject::dumpObjectTree() const
|
||||
dumpRecursive(0, this);
|
||||
}
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
/*!
|
||||
\overload
|
||||
\obsolete
|
||||
|
||||
Dumps information about signal connections, etc. for this object
|
||||
to the debug output.
|
||||
|
||||
\sa dumpObjectTree()
|
||||
*/
|
||||
|
||||
void QObject::dumpObjectInfo()
|
||||
{
|
||||
const_cast<const QObject *>(this)->dumpObjectInfo();
|
||||
}
|
||||
#endif
|
||||
|
||||
/*!
|
||||
Dumps information about signal connections, etc. for this object
|
||||
to the debug output.
|
||||
|
||||
@ -2599,12 +2599,6 @@ QTextStream &QTextStream::operator<<(const void *ptr)
|
||||
|
||||
namespace Qt {
|
||||
|
||||
/*!
|
||||
\fn QTextStream &bin(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::bin() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setIntegerBase(2) on \a stream and returns \a
|
||||
stream.
|
||||
@ -2619,12 +2613,6 @@ QTextStream &bin(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &oct(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::oct() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setIntegerBase(8) on \a stream and returns \a
|
||||
stream.
|
||||
@ -2639,12 +2627,6 @@ QTextStream &oct(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &dec(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::dec() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setIntegerBase(10) on \a stream and returns \a
|
||||
stream.
|
||||
@ -2659,12 +2641,6 @@ QTextStream &dec(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &hex(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::hex() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setIntegerBase(16) on \a stream and returns \a
|
||||
stream.
|
||||
@ -2680,12 +2656,6 @@ QTextStream &hex(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &showbase(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::showbase() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() |
|
||||
QTextStream::ShowBase) on \a stream and returns \a stream.
|
||||
@ -2700,12 +2670,6 @@ QTextStream &showbase(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &forcesign(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::forcesign() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() |
|
||||
QTextStream::ForceSign) on \a stream and returns \a stream.
|
||||
@ -2720,12 +2684,6 @@ QTextStream &forcesign(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &forcepoint(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::forcepoint() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() |
|
||||
QTextStream::ForcePoint) on \a stream and returns \a stream.
|
||||
@ -2740,12 +2698,6 @@ QTextStream &forcepoint(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &noshowbase(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::noshowbase() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() &
|
||||
~QTextStream::ShowBase) on \a stream and returns \a stream.
|
||||
@ -2760,12 +2712,6 @@ QTextStream &noshowbase(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &noforcesign(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::noforcesign() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() &
|
||||
~QTextStream::ForceSign) on \a stream and returns \a stream.
|
||||
@ -2780,12 +2726,6 @@ QTextStream &noforcesign(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &noforcepoint(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::noforcepoint() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() &
|
||||
~QTextStream::ForcePoint) on \a stream and returns \a stream.
|
||||
@ -2800,12 +2740,6 @@ QTextStream &noforcepoint(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &uppercasebase(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::uppercasebase() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() |
|
||||
QTextStream::UppercaseBase) on \a stream and returns \a stream.
|
||||
@ -2820,12 +2754,6 @@ QTextStream &uppercasebase(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &uppercasedigits(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::uppercasedigits() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() |
|
||||
QTextStream::UppercaseDigits) on \a stream and returns \a stream.
|
||||
@ -2840,12 +2768,6 @@ QTextStream &uppercasedigits(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &lowercasebase(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::lowercasebase() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() &
|
||||
~QTextStream::UppercaseBase) on \a stream and returns \a stream.
|
||||
@ -2860,12 +2782,6 @@ QTextStream &lowercasebase(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &lowercasedigits(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::lowercasedigits() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() &
|
||||
~QTextStream::UppercaseDigits) on \a stream and returns \a stream.
|
||||
@ -2880,12 +2796,6 @@ QTextStream &lowercasedigits(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &fixed(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::fixed() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setRealNumberNotation(QTextStream::FixedNotation)
|
||||
on \a stream and returns \a stream.
|
||||
@ -2900,12 +2810,6 @@ QTextStream &fixed(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &scientific(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::scientific() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setRealNumberNotation(QTextStream::ScientificNotation)
|
||||
on \a stream and returns \a stream.
|
||||
@ -2920,12 +2824,6 @@ QTextStream &scientific(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &left(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::left() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setFieldAlignment(QTextStream::AlignLeft)
|
||||
on \a stream and returns \a stream.
|
||||
@ -2940,12 +2838,6 @@ QTextStream &left(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &right(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::right() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setFieldAlignment(QTextStream::AlignRight)
|
||||
on \a stream and returns \a stream.
|
||||
@ -2960,12 +2852,6 @@ QTextStream &right(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream ¢er(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::center() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::setFieldAlignment(QTextStream::AlignCenter)
|
||||
on \a stream and returns \a stream.
|
||||
@ -2980,12 +2866,6 @@ QTextStream ¢er(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &endl(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::endl() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Writes '\\n' to the \a stream and flushes the stream.
|
||||
|
||||
@ -3005,12 +2885,6 @@ QTextStream &endl(QTextStream &stream)
|
||||
return stream << QLatin1Char('\n') << Qt::flush;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &flush(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::flush() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::flush() on \a stream and returns \a stream.
|
||||
|
||||
@ -3024,12 +2898,6 @@ QTextStream &flush(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &reset(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::reset() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls QTextStream::reset() on \a stream and returns \a stream.
|
||||
|
||||
@ -3043,12 +2911,6 @@ QTextStream &reset(QTextStream &stream)
|
||||
return stream;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QTextStream &ws(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::ws() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Calls \l {QTextStream::}{skipWhiteSpace()} on \a stream and returns \a stream.
|
||||
|
||||
@ -3087,12 +2949,6 @@ QTextStream &ws(QTextStream &stream)
|
||||
|
||||
|
||||
namespace Qt {
|
||||
/*!
|
||||
\fn QTextStream &bom(QTextStream &stream)
|
||||
\relates QTextStream
|
||||
\obsolete Use Qt::bom() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Toggles insertion of the Byte Order Mark on \a stream when QTextStream is
|
||||
used with a UTF encoding.
|
||||
|
||||
@ -2292,15 +2292,6 @@ QXmlStreamAttribute::QXmlStreamAttribute()
|
||||
m_isDefault = false;
|
||||
}
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
/*!
|
||||
Destructs an attribute.
|
||||
*/
|
||||
QXmlStreamAttribute::~QXmlStreamAttribute()
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
/*! Constructs an attribute in the namespace described with \a
|
||||
namespaceUri with \a name and value \a value.
|
||||
*/
|
||||
@ -2374,30 +2365,6 @@ QXmlStreamAttribute::QXmlStreamAttribute(const QString &qualifiedName, const QSt
|
||||
not equal; otherwise returns \c false.
|
||||
*/
|
||||
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
/*!
|
||||
Creates a copy of \a other.
|
||||
*/
|
||||
QXmlStreamAttribute::QXmlStreamAttribute(const QXmlStreamAttribute &other)
|
||||
{
|
||||
*this = other;
|
||||
}
|
||||
|
||||
/*!
|
||||
Assigns \a other to this attribute.
|
||||
*/
|
||||
QXmlStreamAttribute& QXmlStreamAttribute::operator=(const QXmlStreamAttribute &other)
|
||||
{
|
||||
m_name = other.m_name;
|
||||
m_namespaceUri = other.m_namespaceUri;
|
||||
m_qualifiedName = other.m_qualifiedName;
|
||||
m_value = other.m_value;
|
||||
m_isDefault = other.m_isDefault;
|
||||
return *this;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*!
|
||||
\class QXmlStreamAttributes
|
||||
\inmodule QtCore
|
||||
@ -2453,34 +2420,6 @@ QXmlStreamNotationDeclaration::QXmlStreamNotationDeclaration()
|
||||
{
|
||||
}
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
/*!
|
||||
Creates a copy of \a other.
|
||||
*/
|
||||
QXmlStreamNotationDeclaration::QXmlStreamNotationDeclaration(const QXmlStreamNotationDeclaration &other)
|
||||
{
|
||||
*this = other;
|
||||
}
|
||||
|
||||
/*!
|
||||
Assigns \a other to this notation declaration.
|
||||
*/
|
||||
QXmlStreamNotationDeclaration& QXmlStreamNotationDeclaration::operator=(const QXmlStreamNotationDeclaration &other)
|
||||
{
|
||||
m_name = other.m_name;
|
||||
m_systemId = other.m_systemId;
|
||||
m_publicId = other.m_publicId;
|
||||
return *this;
|
||||
}
|
||||
|
||||
/*!
|
||||
Destructs this notation declaration.
|
||||
*/
|
||||
QXmlStreamNotationDeclaration::~QXmlStreamNotationDeclaration()
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
/*! \fn QStringRef QXmlStreamNotationDeclaration::name() const
|
||||
|
||||
Returns the notation name.
|
||||
@ -2552,32 +2491,6 @@ QXmlStreamNamespaceDeclaration::QXmlStreamNamespaceDeclaration(const QString &pr
|
||||
m_namespaceUri = namespaceUri;
|
||||
}
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
/*!
|
||||
Creates a copy of \a other.
|
||||
*/
|
||||
QXmlStreamNamespaceDeclaration::QXmlStreamNamespaceDeclaration(const QXmlStreamNamespaceDeclaration &other)
|
||||
{
|
||||
*this = other;
|
||||
}
|
||||
|
||||
/*!
|
||||
Assigns \a other to this namespace declaration.
|
||||
*/
|
||||
QXmlStreamNamespaceDeclaration& QXmlStreamNamespaceDeclaration::operator=(const QXmlStreamNamespaceDeclaration &other)
|
||||
{
|
||||
m_prefix = other.m_prefix;
|
||||
m_namespaceUri = other.m_namespaceUri;
|
||||
return *this;
|
||||
}
|
||||
/*!
|
||||
Destructs this namespace declaration.
|
||||
*/
|
||||
QXmlStreamNamespaceDeclaration::~QXmlStreamNamespaceDeclaration()
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
/*! \fn QStringRef QXmlStreamNamespaceDeclaration::prefix() const
|
||||
|
||||
Returns the prefix.
|
||||
@ -2624,36 +2537,6 @@ QXmlStreamEntityDeclaration::QXmlStreamEntityDeclaration()
|
||||
{
|
||||
}
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
/*!
|
||||
Creates a copy of \a other.
|
||||
*/
|
||||
QXmlStreamEntityDeclaration::QXmlStreamEntityDeclaration(const QXmlStreamEntityDeclaration &other)
|
||||
{
|
||||
*this = other;
|
||||
}
|
||||
|
||||
/*!
|
||||
Assigns \a other to this entity declaration.
|
||||
*/
|
||||
QXmlStreamEntityDeclaration& QXmlStreamEntityDeclaration::operator=(const QXmlStreamEntityDeclaration &other)
|
||||
{
|
||||
m_name = other.m_name;
|
||||
m_notationName = other.m_notationName;
|
||||
m_systemId = other.m_systemId;
|
||||
m_publicId = other.m_publicId;
|
||||
m_value = other.m_value;
|
||||
return *this;
|
||||
}
|
||||
|
||||
/*!
|
||||
Destructs this entity declaration.
|
||||
*/
|
||||
QXmlStreamEntityDeclaration::~QXmlStreamEntityDeclaration()
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
/*! \fn QXmlStreamStringRef::swap(QXmlStreamStringRef &other)
|
||||
\since 5.6
|
||||
|
||||
|
||||
@ -2103,7 +2103,7 @@ QByteArray &QByteArray::replace(const char *c, const QByteArray &after)
|
||||
\overload
|
||||
|
||||
Replaces every occurrence of the \a bsize bytes starting at \a before with
|
||||
the \asize bytes starting at \a after. Since the sizes of the strings are
|
||||
the \a size bytes starting at \a after. Since the sizes of the strings are
|
||||
given by \a bsize and \a asize, they may contain '\\0' bytes and do not need
|
||||
to be '\\0'-terminated.
|
||||
*/
|
||||
|
||||
@ -150,22 +150,6 @@ QByteArray QtPrivate::QByteArrayList_join(const QByteArrayList *that, const char
|
||||
return res;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn int QByteArrayList::indexOf(const char *needle, int from) const
|
||||
|
||||
Returns the index position of the first occurrence of \a needle in
|
||||
the list, searching forward from index position \a from. Returns
|
||||
-1 if no item matched.
|
||||
|
||||
\a needle must be NUL-terminated.
|
||||
|
||||
This overload doesn't require creating a QByteArray, thus saving a
|
||||
memory allocation and some CPU time.
|
||||
|
||||
\since 5.13
|
||||
\overload
|
||||
*/
|
||||
|
||||
int QtPrivate::QByteArrayList_indexOf(const QByteArrayList *that, const char *needle, int from)
|
||||
{
|
||||
const auto it = std::find_if(that->begin() + from, that->end(), [needle](const QByteArray &item) { return item == needle; });
|
||||
|
||||
@ -660,7 +660,7 @@
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn int QByteArrayView::count(QByteArrayView &bv) const
|
||||
\fn qizetype QByteArrayView::count(QByteArrayView bv) const
|
||||
|
||||
Returns the number of (potentially overlapping) occurrences of the
|
||||
sequence of bytes viewed by \a bv in this byte array view.
|
||||
|
||||
@ -1724,38 +1724,6 @@ char32_t QChar::toCaseFolded(char32_t ucs4) noexcept
|
||||
\sa toLatin1(), unicode()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn char QChar::toAscii() const
|
||||
\deprecated
|
||||
|
||||
Returns the Latin-1 character value of the QChar, or 0 if the character is not
|
||||
representable.
|
||||
|
||||
The main purpose of this function is to preserve ASCII characters used
|
||||
in C strings. This is mainly useful for developers of non-internationalized
|
||||
software.
|
||||
|
||||
\note It is not possible to distinguish a non-Latin 1 character from an ASCII 0
|
||||
(NUL) character. Prefer to use unicode(), which does not have this ambiguity.
|
||||
|
||||
\note This function does not check whether the character value is inside
|
||||
the valid range of US-ASCII.
|
||||
|
||||
\sa toLatin1(), unicode()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QChar QChar::fromAscii(char)
|
||||
\deprecated
|
||||
|
||||
Converts the ASCII character \a c to it's equivalent QChar. This
|
||||
is mainly useful for non-internationalized software.
|
||||
|
||||
An alternative is to use QLatin1Char.
|
||||
|
||||
\sa fromLatin1(), unicode()
|
||||
*/
|
||||
|
||||
#ifndef QT_NO_DATASTREAM
|
||||
/*!
|
||||
\relates QChar
|
||||
|
||||
@ -4110,7 +4110,6 @@ QString QLocale::toCurrencyString(double value, const QString &symbol, int preci
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QString QLocale::toCurrencyString(float i, const QString &symbol) const
|
||||
\fn QString QLocale::toCurrencyString(float i, const QString &symbol, int precision) const
|
||||
\overload toCurrencyString()
|
||||
*/
|
||||
|
||||
@ -1267,8 +1267,3 @@
|
||||
\since 4.8
|
||||
\overload
|
||||
*/
|
||||
/*!
|
||||
\fn QString QLocale::toCurrencyString(float value, const QString &symbol) const
|
||||
\since 4.8
|
||||
\overload
|
||||
*/
|
||||
|
||||
@ -1790,21 +1790,6 @@ inline char qToLower(char ch)
|
||||
\sa fromRawData(), QChar, QLatin1String, QByteArray, QStringRef
|
||||
*/
|
||||
|
||||
/*!
|
||||
\enum QString::SplitBehavior
|
||||
|
||||
\obsolete
|
||||
Use Qt::SplitBehavior instead.
|
||||
|
||||
This enum specifies how the split() function should behave with
|
||||
respect to empty strings.
|
||||
|
||||
\value KeepEmptyParts If a field is empty, keep it in the result.
|
||||
\value SkipEmptyParts If a field is empty, don't include it in the result.
|
||||
|
||||
\sa split()
|
||||
*/
|
||||
|
||||
/*! \typedef QString::ConstIterator
|
||||
|
||||
Qt-style synonym for QString::const_iterator.
|
||||
@ -2476,20 +2461,6 @@ QString &QString::operator=(QChar ch)
|
||||
\sa append(), prepend(), replace(), remove()
|
||||
*/
|
||||
|
||||
|
||||
/*!
|
||||
\fn QString& QString::insert(qsizetype position, const QStringRef &str)
|
||||
\since 5.5
|
||||
\overload insert()
|
||||
|
||||
Inserts the string reference \a str at the given index \a position and
|
||||
returns a reference to this string.
|
||||
|
||||
If the given \a position is greater than size(), the array is
|
||||
first extended using resize().
|
||||
*/
|
||||
|
||||
|
||||
/*!
|
||||
\fn QString& QString::insert(qsizetype position, QStringView str)
|
||||
\since 6.0
|
||||
@ -2753,14 +2724,6 @@ QString &QString::append(QChar ch)
|
||||
returns a reference to this string.
|
||||
*/
|
||||
|
||||
/*! \fn QString &QString::prepend(const QStringRef &str)
|
||||
\since 5.5
|
||||
\overload prepend()
|
||||
|
||||
Prepends the string reference \a str to the beginning of this string and
|
||||
returns a reference to this string.
|
||||
*/
|
||||
|
||||
/*! \fn QString &QString::prepend(QStringView str)
|
||||
\since 6.0
|
||||
\overload prepend()
|
||||
@ -4063,20 +4026,6 @@ qsizetype QString::count(QStringView str, Qt::CaseSensitivity cs) const
|
||||
character \a ch; otherwise returns \c false.
|
||||
*/
|
||||
|
||||
#if QT_STRINGVIEW_LEVEL < 2
|
||||
/*! \fn bool QString::contains(const QStringRef &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
|
||||
\since 4.8
|
||||
|
||||
Returns \c true if this string contains an occurrence of the string
|
||||
reference \a str; otherwise returns \c false.
|
||||
|
||||
If \a cs is Qt::CaseSensitive (default), the search is
|
||||
case sensitive; otherwise the search is case insensitive.
|
||||
|
||||
\sa indexOf(), count()
|
||||
*/
|
||||
#endif // QT_STRINGVIEW_LEVEL < 2
|
||||
|
||||
/*! \fn bool QString::contains(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
|
||||
\since 5.14
|
||||
\overload contains()
|
||||
@ -5550,13 +5499,6 @@ QString& QString::fill(QChar ch, qsizetype size)
|
||||
\sa QT_NO_CAST_FROM_ASCII
|
||||
*/
|
||||
|
||||
/*! \fn QString &QString::operator+=(const QStringRef &str)
|
||||
|
||||
\overload operator+=()
|
||||
|
||||
Appends the string section referenced by \a str to this string.
|
||||
*/
|
||||
|
||||
/*! \fn QString &QString::operator+=(QStringView str)
|
||||
\since 6.0
|
||||
\overload operator+=()
|
||||
@ -11897,13 +11839,6 @@ float QStringRef::toFloat(bool *ok) const
|
||||
return QLocaleData::convertDoubleToFloat(toDouble(ok), ok);
|
||||
}
|
||||
|
||||
/*!
|
||||
\obsolete
|
||||
\fn QString Qt::escape(const QString &plain)
|
||||
|
||||
Use QString::toHtmlEscaped() instead.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\since 5.0
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user