diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 83f1bac2ef..6c8db11212 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -7888,6 +7888,11 @@ QString &QString::setRawData(const QChar *unicode, int size) Returns the Latin-1 string stored in this object. */ +/*! \fn const char *QLatin1String::data() const + + Returns the Latin-1 string stored in this object. +*/ + /*! \fn int QLatin1String::size() const Returns the size of the Latin-1 string stored in this object. @@ -7918,6 +7923,20 @@ QString &QString::setRawData(const QChar *unicode, int size) go through QObject::tr(), for example. */ +/*! + \fn bool QLatin1String::operator==(const QByteArray &other) const + \since 5.0 + \overload + + The \a other byte array is converted to a QString using + the QString::fromUtf8() function. + + You can disable this operator by defining \c + QT_NO_CAST_FROM_ASCII when you compile your applications. This + can be useful if you want to ensure that all user-visible strings + go through QObject::tr(), for example. +*/ + /*! \fn bool QLatin1String::operator!=(const QString &other) const Returns \c true if this string is not equal to string \a other; @@ -7943,6 +7962,20 @@ QString &QString::setRawData(const QChar *unicode, int size) go through QObject::tr(), for example. */ +/*! + \fn bool QLatin1String::operator!=(const QByteArray &other) const + \since 5.0 + \overload operator!=() + + The \a other byte array is converted to a QString using + the QString::fromUtf8() function. + + You can disable this operator by defining \c + QT_NO_CAST_FROM_ASCII when you compile your applications. This + can be useful if you want to ensure that all user-visible strings + go through QObject::tr(), for example. +*/ + /*! \fn bool QLatin1String::operator>(const QString &other) const @@ -7969,6 +8002,20 @@ QString &QString::setRawData(const QChar *unicode, int size) for example. */ +/*! + \fn bool QLatin1String::operator>(const QByteArray &other) const + \since 5.0 + \overload + + The \a other const char pointer is converted to a QString using + the QString::fromUtf8() function. + + You can disable this operator by defining \c QT_NO_CAST_FROM_ASCII + when you compile your applications. This can be useful if you want + to ensure that all user-visible strings go through QObject::tr(), + for example. +*/ + /*! \fn bool QLatin1String::operator<(const QString &other) const @@ -7995,6 +8042,20 @@ QString &QString::setRawData(const QChar *unicode, int size) go through QObject::tr(), for example. */ +/*! + \fn bool QLatin1String::operator<(const QByteArray &other) const + \since 5.0 + \overload + + The \a other const char pointer is converted to a QString using + the QString::fromUtf8() function. + + You can disable this operator by defining \c + QT_NO_CAST_FROM_ASCII when you compile your applications. This + can be useful if you want to ensure that all user-visible strings + go through QObject::tr(), for example. +*/ + /*! \fn bool QLatin1String::operator>=(const QString &other) const @@ -8021,6 +8082,20 @@ QString &QString::setRawData(const QChar *unicode, int size) go through QObject::tr(), for example. */ +/*! + \fn bool QLatin1String::operator>=(const QByteArray &other) const + \since 5.0 + \overload + + The \a other array is converted to a QString using + the QString::fromUtf8() function. + + You can disable this operator by defining \c + QT_NO_CAST_FROM_ASCII when you compile your applications. This + can be useful if you want to ensure that all user-visible strings + go through QObject::tr(), for example. +*/ + /*! \fn bool QLatin1String::operator<=(const QString &other) const Returns \c true if this string is lexically less than or equal @@ -8046,6 +8121,19 @@ QString &QString::setRawData(const QChar *unicode, int size) go through QObject::tr(), for example. */ +/*! + \fn bool QLatin1String::operator<=(const QByteArray &other) const + \since 5.0 + \overload + + The \a other array is converted to a QString using + the QString::fromUtf8() function. + + You can disable this operator by defining \c + QT_NO_CAST_FROM_ASCII when you compile your applications. This + can be useful if you want to ensure that all user-visible strings + go through QObject::tr(), for example. +*/ /*! \fn bool operator==(QLatin1String s1, QLatin1String s2)