diff options
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qbytearray.cpp | 129 | ||||
| -rw-r--r-- | src/corelib/tools/qchar.cpp | 36 | ||||
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 68 | ||||
| -rw-r--r-- | src/corelib/tools/qlinkedlist.cpp | 87 | ||||
| -rw-r--r-- | src/corelib/tools/qlist.cpp | 42 | ||||
| -rw-r--r-- | src/corelib/tools/qmap.cpp | 48 | ||||
| -rw-r--r-- | src/corelib/tools/qrect.cpp | 95 | ||||
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 67 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 276 | ||||
| -rw-r--r-- | src/corelib/tools/qstringlist.cpp | 48 |
10 files changed, 0 insertions, 896 deletions
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 0c5276f442..9f21b72bfd 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -4270,135 +4270,6 @@ QByteArray QByteArray::toPercentEncoding(const QByteArray &exclude, const QByteA */ /*! - \fn QByteArray::QByteArray(int size) - - Use QByteArray(int, char) instead. -*/ - - -/*! - \fn QByteArray QByteArray::leftJustify(uint width, char fill, bool truncate) const - - Use leftJustified() instead. -*/ - -/*! - \fn QByteArray QByteArray::rightJustify(uint width, char fill, bool truncate) const - - Use rightJustified() instead. -*/ - -/*! - \fn QByteArray& QByteArray::duplicate(const QByteArray& a) - - \oldcode - QByteArray bdata; - bdata.duplicate(original); - \newcode - QByteArray bdata; - bdata = original; - \endcode - - \note QByteArray uses implicit sharing so if you modify a copy, only the - copy is changed. -*/ - -/*! - \fn QByteArray& QByteArray::duplicate(const char *a, uint n) - - \overload - - \oldcode - QByteArray bdata; - bdata.duplicate(ptr, size); - \newcode - QByteArray bdata; - bdata = QByteArray(ptr, size); - \endcode - - \note QByteArray uses implicit sharing so if you modify a copy, only the - copy is changed. -*/ - -/*! - \fn void QByteArray::resetRawData(const char *data, uint n) - - Use clear() instead. -*/ - -/*! - \fn QByteArray QByteArray::lower() const - - Use toLower() instead. -*/ - -/*! - \fn QByteArray QByteArray::upper() const - - Use toUpper() instead. -*/ - -/*! - \fn QByteArray QByteArray::stripWhiteSpace() const - - Use trimmed() instead. -*/ - -/*! - \fn QByteArray QByteArray::simplifyWhiteSpace() const - - Use simplified() instead. -*/ - -/*! - \fn int QByteArray::find(char c, int from = 0) const - - Use indexOf() instead. -*/ - -/*! - \fn int QByteArray::find(const char *c, int from = 0) const - - Use indexOf() instead. -*/ - -/*! - \fn int QByteArray::find(const QByteArray &ba, int from = 0) const - - Use indexOf() instead. -*/ - -/*! - \fn int QByteArray::findRev(char c, int from = -1) const - - Use lastIndexOf() instead. -*/ - -/*! - \fn int QByteArray::findRev(const char *c, int from = -1) const - - Use lastIndexOf() instead. -*/ - -/*! - \fn int QByteArray::findRev(const QByteArray &ba, int from = -1) const - - Use lastIndexOf() instead. -*/ - -/*! - \fn int QByteArray::find(const QString &s, int from = 0) const - - Use indexOf() instead. -*/ - -/*! - \fn int QByteArray::findRev(const QString &s, int from = -1) const - - Use lastIndexOf() instead. -*/ - -/*! \fn DataPtr &QByteArray::data_ptr() \internal */ diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp index 373ea5ccc6..32a7ccac05 100644 --- a/src/corelib/tools/qchar.cpp +++ b/src/corelib/tools/qchar.cpp @@ -1257,18 +1257,6 @@ ushort QChar::toCaseFolded(ushort ucs2) /*! - \fn char QChar::latin1() const - - Use toLatin1() instead. -*/ - -/*! - \fn char QChar::ascii() const - - Use toAscii() instead. -*/ - -/*! \fn char QChar::toLatin1() const Returns the Latin-1 character equivalent to the QChar, or 0. This @@ -1428,30 +1416,6 @@ QDataStream &operator>>(QDataStream &in, QChar &chr) that of \a c2; otherwise returns false. */ -/*! - \fn bool QChar::mirrored() const - - Use hasMirrored() instead. -*/ - -/*! - \fn QChar QChar::lower() const - - Use toLower() instead. -*/ - -/*! - \fn QChar QChar::upper() const - - Use toUpper() instead. -*/ - -/*! - \fn bool QChar::networkOrdered() - - See if QSysInfo::ByteOrder == QSysInfo::BigEndian instead. -*/ - // --------------------------------------------------------------------------- diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 4303731e40..ac5d6c4a8e 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -3710,74 +3710,6 @@ QDataStream &operator>>(QDataStream &in, QDateTime &dateTime) #endif // QT_NO_DATASTREAM -/*! - \fn QString QDate::monthName(int month) - - Use shortMonthName() instead. -*/ - -/*! - \fn QString QDate::dayName(int weekday) - - Use shortDayName() instead. -*/ - -/*! - \fn bool QDate::leapYear(int year) - - Use isLeapYear() instead. -*/ - -/*! - \fn QDate QDate::currentDate(Qt::TimeSpec spec) - - If \a spec is Qt::LocalTime, use the currentDate() overload that - takes no parameters instead; otherwise, use - QDateTime::currentDateTime(). - - \oldcode - QDate localDate = QDate::currentDate(Qt::LocalTime); - QDate utcDate = QDate::currentDate(Qt::UTC); - \newcode - QDate localDate = QDate::currentDate(); - QDate utcDate = QDateTime::currentDateTime().toUTC().date(); - \endcode - - \sa QDateTime::toUTC() -*/ - -/*! - \fn QTime QTime::currentTime(Qt::TimeSpec specification) - - Returns the current time for the given \a specification. - - To replace uses of this function where the \a specification is Qt::LocalTime, - use the currentDate() overload that takes no parameters instead; otherwise, - use QDateTime::currentDateTime() and convert the result to a UTC measurement. - - \oldcode - QTime localTime = QTime::currentTime(Qt::LocalTime); - QTime utcTime = QTime::currentTime(Qt::UTC); - \newcode - QTime localTime = QTime::currentTime(); - QTime utcTime = QTimeTime::currentDateTime().toUTC().time(); - \endcode - - \sa QDateTime::toUTC() -*/ - -/*! - \fn void QDateTime::setTime_t(uint secsSince1Jan1970UTC, Qt::TimeSpec spec) - - Use the single-argument overload of setTime_t() instead. -*/ - -/*! - \fn QDateTime QDateTime::currentDateTime(Qt::TimeSpec spec) - - Use the currentDateTime() overload that takes no parameters - instead. -*/ // checks if there is an unqoted 'AP' or 'ap' in the string static bool hasUnquotedAP(const QString &f) diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp index 266fc7d3f1..97298dde3d 100644 --- a/src/corelib/tools/qlinkedlist.cpp +++ b/src/corelib/tools/qlinkedlist.cpp @@ -1054,93 +1054,6 @@ QLinkedListData QLinkedListData::shared_null = { */ /*! - \fn iterator QLinkedList::remove(iterator pos) - - Use erase() instead. -*/ - -/*! - \fn int QLinkedList::findIndex(const T& t) const - - If you need indexes then QList or QVector are better choices than - QLinkedList. - - \oldcode - int index = list->findIndex(value); - \newcode - int index = 0; - bool found = false; - for (const_iterator i = list->begin(); i != list->end(); ++i; ++index) - if (*i == value) { - found = true; - break; - } - if (!found) - index = -1; - \endcode -*/ - -/*! - \fn iterator QLinkedList::find(iterator from, const T& t) - - If you need random access to a data structure then QList, QVector, - QMap, or QHash, are all better choices than QLinkedList. - - \oldcode - QLinkedList::iterator i = list->find(from, value); - \newcode - QLinkedList::iterator i = from; - while (i != list->end() && *i != value) - ++i; - \endcode -*/ - -/*! - \fn iterator QLinkedList::find(const T& t) - - If you need random access to a data structure then QList, QVector, - QMap, or QHash, are all better choices than QLinkedList. - - \oldcode - QLinkedList::iterator i = list->find(value); - \newcode - QLinkedList::iterator i = list->begin(); - while (i != list->end() && *i != value) - ++i; - \endcode -*/ - -/*! - \fn const_iterator QLinkedList::find(const_iterator from, const T& t) const - - If you need random access to a data structure then QList, QVector, - QMap, or QHash, are all better choices than QLinkedList. - - \oldcode - QLinkedList::const_iterator i = list->find(from, value); - \newcode - QLinkedList::const_iterator i = from; - while (i != list->end() && *i != value) - ++i; - \endcode -*/ - -/*! - \fn const_iterator QLinkedList::find(const T& t) const - - If you need random access to a data structure then QList, QVector, - QMap, or QHash, are all better choices than QLinkedList. - - \oldcode - QLinkedList::const_iterator i = list->find(value); - \newcode - QLinkedList::const_iterator i = list->begin(); - while (i != list->end() && *i != value) - ++i; - \endcode -*/ - -/*! \since 4.1 \fn QLinkedList<T> QLinkedList<T>::fromStdList(const std::list<T> &list) diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp index 14dfc6a139..e0b69d4361 100644 --- a/src/corelib/tools/qlist.cpp +++ b/src/corelib/tools/qlist.cpp @@ -1714,48 +1714,6 @@ void **QListData::erase(void **xi) \sa \link datastreamformat.html Format of the QDataStream operators \endlink */ -/*! - \fn iterator QList::remove(iterator pos) - - Use erase() instead. -*/ - -/*! - \fn int QList::remove(const T &t) - - Use removeAll() instead. -*/ - -/*! - \fn int QList::findIndex(const T& t) const - - Use indexOf() instead. -*/ - -/*! - \fn iterator QList::find(const T& t) - - Use indexOf() instead. -*/ - -/*! - \fn const_iterator QList::find (const T& t) const - - Use indexOf() instead. -*/ - -/*! - \fn iterator QList::find(iterator from, const T& t) - - Use indexOf() instead. -*/ - -/*! - \fn const_iterator QList::find(const_iterator from, const T& t) const - - Use indexOf() instead. -*/ - /*! \fn QList<T> QList<T>::fromVector(const QVector<T> &vector) Returns a QList object with the data contained in \a vector. diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp index b2ca3ac37c..aecc73c8dd 100644 --- a/src/corelib/tools/qmap.cpp +++ b/src/corelib/tools/qmap.cpp @@ -1595,52 +1595,4 @@ void QMapData::dump() \sa QMap::constFind() */ -/*! - \fn T &QMap::iterator::data() const - - Use value() instead. -*/ - -/*! - \fn const T &QMap::const_iterator::data() const - - Use value() instead. -*/ - -/*! - \fn iterator QMap::remove(iterator it) - - Use erase(\a it) instead. -*/ - -/*! - \fn void QMap::erase(const Key &key) - - Use remove(\a key) instead. -*/ - -/*! - \fn iterator QMap::insert(const Key &key, const T &value, bool overwrite); - - Use the two-argument insert() overload instead. If you don't want - to overwrite, call contains() beforehand. - - \oldcode - QMap<QString, int> map; - ... - map.insert("delay", 30000, false); - \newcode - QMap<QString, int> map; - ... - if (!map.contains("delay")) - map.insert("delay", 30000); - \endcode -*/ - -/*! - \fn iterator QMap::replace(const Key &key, const T &value) - - Use remove() then insert(). -*/ - QT_END_NAMESPACE diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp index c0bb63d6b7..41ec816c46 100644 --- a/src/corelib/tools/qrect.cpp +++ b/src/corelib/tools/qrect.cpp @@ -317,16 +317,6 @@ QRect QRect::normalized() const /*! - \fn QRect QRect::normalize() const - \compat - - Returns a normalized rectangle; i.e., a rectangle that has a - non-negative width and height. - - Use the normalized() function instead -*/ - -/*! \fn int QRect::left() const Returns the x-coordinate of the rectangle's left edge. Equivalent @@ -367,42 +357,6 @@ QRect QRect::normalized() const */ /*! - \fn int &QRect::rLeft() - \compat - - Returns a reference to the left coordinate of the rectangle. - - Use the left() function instead. -*/ - -/*! - \fn int &QRect::rTop() - \compat - - Returns a reference to the top coordinate of the rectangle. - - Use the top() function instead. -*/ - -/*! - \fn int &QRect::rRight() - \compat - - Returns a reference to the right coordinate of the rectangle. - - Use the right() function instead. -*/ - -/*! - \fn int &QRect::rBottom() - \compat - - Returns a reference to the bottom coordinate of the rectangle. - - Use the bottom() function instead. -*/ - -/*! \fn int QRect::x() const Returns the x-coordinate of the rectangle's left edge. Equivalent to left(). @@ -596,28 +550,6 @@ QRect QRect::normalized() const */ /*! - \fn void QRect::rect(int *x, int *y, int *width, int *height) const - \compat - - Extracts the position of the rectangle's top-left corner to *\a x and - *\a y, and its dimensions to *\a width and * \a height. - - Use the getRect() function instead. -*/ - - -/*! - \fn void QRect::coords(int *x1, int *y1, int *x2, int *y2) const - \compat - - Extracts the position of the rectangle's top-left corner to *\a x1 - and *\a y1, and the position of the bottom-right corner to *\a x2 - and *\a y2. - - Use the getCoords() function instead. -*/ - -/*! \fn void QRect::moveLeft(int x) Moves the rectangle horizontally, leaving the rectangle's left @@ -719,23 +651,6 @@ void QRect::moveCenter(const QPoint &p) } /*! - \fn void QRect::moveBy(int dx, int dy) - \compat - - Moves the rectangle \a dx along the x axis and \a dy along the y - axis, relative to the current position. - - Use the translate() function instead. -*/ - -/*! - \fn void QRect::moveBy(const QPoint &) - \compat - - Use the translate() function instead. -*/ - -/*! \fn void QRect::moveTo(int x, int y) Moves the rectangle, leaving the top-left corner at the given @@ -818,16 +733,6 @@ void QRect::moveCenter(const QPoint &p) */ -/*! - \fn void QRect::addCoords(int dx1, int dy1, int dx2, int dy2) - \compat - - Adds \a dx1, \a dy1, \a dx2 and \a dy2 to the existing coordinates - of the rectangle respectively. - - Use the adjust() function instead. -*/ - /*! \fn QRect QRect::adjusted(int dx1, int dy1, int dx2, int dy2) const Returns a new rectangle with \a dx1, \a dy1, \a dx2 and \a dy2 diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index e56741b424..325320da12 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -4493,73 +4493,6 @@ QString QRegExp::escape(const QString &str) return quoted; } -/*! - \fn bool QRegExp::caseSensitive() const - - Use \l caseSensitivity() instead. -*/ - -/*! - \fn void QRegExp::setCaseSensitive(bool sensitive) - - Use \l setCaseSensitivity() instead. -*/ - -/*! - \fn bool QRegExp::wildcard() const - - Use \l patternSyntax() instead. - - \oldcode - bool wc = rx.wildcard(); - \newcode - bool wc = (rx.patternSyntax() == QRegExp::Wildcard); - \endcode -*/ - -/*! - \fn void QRegExp::setWildcard(bool wildcard) - - Use \l setPatternSyntax() instead. - - \oldcode - rx.setWildcard(wc); - \newcode - rx.setPatternSyntax(wc ? QRegExp::Wildcard : QRegExp::RegExp); - \endcode -*/ - -/*! - \fn bool QRegExp::minimal() const - - Use \l isMinimal() instead. -*/ - -/*! - \fn int QRegExp::search(const QString &str, int from = 0, - CaretMode caretMode = CaretAtZero) const - - Use \l indexIn() instead. -*/ - -/*! - \fn int QRegExp::searchRev(const QString &str, int from = -1, \ - CaretMode caretMode = CaretAtZero) const - - Use \l lastIndexIn() instead. -*/ - -/*! - \fn QRegExp::QRegExp(const QString &pattern, bool cs, bool wildcard = false) - - Use another constructor instead. - - \oldcode - QRegExp rx("*.txt", false, true); - \newcode - QRegExp rx("*.txt", Qt::CaseInsensitive, QRegExp::Wildcard); - \endcode -*/ #ifndef QT_NO_DATASTREAM /*! diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index b5efc85391..9e238193a3 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -3536,29 +3536,6 @@ bool QString::endsWith(const QChar &c, Qt::CaseSensitivity cs) const : foldCase(d->data()[d->size - 1]) == foldCase(c.unicode())); } -/*! \fn const char *QString::ascii() const - \nonreentrant - - Use toAscii() instead. -*/ - -/*! \fn const char *QString::latin1() const - \nonreentrant - - Use toLatin1() instead. -*/ - -/*! \fn const char *QString::utf8() const - \nonreentrant - - Use toUtf8() instead. -*/ - -/*! \fn const char *QString::local8Bit() const - \nonreentrant - - Use toLocal8Bit() instead. -*/ static QByteArray toLatin1_helper(const QChar *data, int length) { @@ -4548,14 +4525,6 @@ QString& QString::fill(QChar ch, int size) */ /*! - \fn int QString::compare(const QString & s1, const QString & s2) - - \overload compare() - - Performs a case sensitive compare of \a s1 and \a s2. -*/ - -/*! \fn int QString::compare(const QString &s1, const QLatin1String &s2, Qt::CaseSensitivity cs) \since 4.2 \overload compare() @@ -7206,13 +7175,6 @@ QString &QString::setRawData(const QChar *unicode, int size) \sa latin1() */ -/*! - \since 4.1 - \fn QLatin1String &QLatin1String::operator=(const QLatin1String &other) - - Constructs a copy of \a other. -*/ - /*! \fn const char *QLatin1String::latin1() const Returns the Latin-1 string stored in this object. @@ -7511,244 +7473,6 @@ QDataStream &operator>>(QDataStream &in, QString &str) } #endif // QT_NO_DATASTREAM -/*! - \fn void QString::setLength(int nl) - - Use resize() instead. -*/ - -/*! - \fn QString QString::copy() const - - Use simple assignment instead. QString is implicitly shared so if - a copy is modified only the copy is changed. -*/ - -/*! - \fn QString &QString::remove(QChar c, bool cs) - - Use the remove(QChar, Qt::CaseSensitive) overload instead. -*/ - -/*! - \fn QString &QString::remove(const QString &s, bool cs) - - Use the remove(QString, Qt::CaseSensitive) overload instead. -*/ - -/*! - \fn QString &QString::replace(QChar c, const QString &after, bool cs) - - Use the replace(QChar, QString, Qt::CaseSensitive) overload instead. -*/ - -/*! - \fn QString &QString::replace(const QString &before, const QString &after, bool cs) - - Use the replace(QString, QString, Qt::CaseSensitive) overload instead. -*/ - -/*! - \fn QString &QString::replace(char c, const QString &after, bool cs) - - Use the replace(QChar, QString, Qt::CaseSensitive) overload instead. -*/ - -/*! - \fn QString &QString::replace(char c, const QString &after, Qt::CaseSensitivity cs) - - Use the replace(QChar, QString, Qt::CaseSensitive) overload instead. -*/ - -/*! - \fn int QString::find(QChar c, int i = 0, bool cs = true) const - - Use indexOf() instead. -*/ - -/*! - \fn int QString::find(const QString &s, int i = 0, bool cs = true) const - - Use indexOf() instead. -*/ - -/*! - \fn int QString::findRev(QChar c, int i = -1, bool cs = true) const - - Use lastIndexOf() instead. -*/ - -/*! - \fn int QString::findRev(const QString &s, int i = -1, bool cs = true) const - - Use lastIndexOf() instead. -*/ - -/*! - \fn int QString::find(const QRegExp &rx, int i=0) const - - Use indexOf() instead. -*/ - -/*! - \fn int QString::find(QRegExp &rx, int i=0) const - \internal - \since 4.5 - - Use indexOf() instead. -*/ - -/*! - \fn int QString::findRev(const QRegExp &rx, int i=-1) const - - Use lastIndexOf() instead. -*/ - -/*! - \fn int QString::findRev(QRegExp &rx, int i=0) const - \internal - \since 4.5 - - Use lastIndexOf() instead. -*/ - -/*! - \fn QBool QString::contains(QChar c, bool cs) const - - Use the contains(QChar, Qt::CaseSensitive) overload instead. -*/ - -/*! - \fn QBool QString::contains(const QString &s, bool cs) const - - Use the contains(QString, Qt::CaseSensitive) overload instead. -*/ - -/*! - \fn bool QString::startsWith(const QString &s, bool cs) const - - Use the startsWith(QString, Qt::CaseSensitive) overload instead. -*/ - - -/*! - \fn bool QString::endsWith(const QString &s, bool cs) const - - Use the endsWith(QString, Qt::CaseSensitive) overload instead. -*/ - -/*! - \fn QString QString::leftJustify(int width, QChar fill = QLatin1Char(' '), bool trunc=false) const - - Use leftJustified() instead. -*/ - -/*! - \fn QString QString::rightJustify(int width, QChar fill = QLatin1Char(' '), bool trunc=false) const - - Use rightJustified() instead. -*/ - -/*! - \fn QString QString::lower() const - - Use toLower() instead. -*/ - -/*! - \fn QString QString::upper() const - - Use toUpper() instead. -*/ - -/*! - \fn QString QString::stripWhiteSpace() const - - Use trimmed() instead. -*/ - -/*! - \fn QString QString::simplifyWhiteSpace() const - - Use simplified() instead. -*/ - -/*! - \fn QString &QString::setUnicodeCodes(const ushort *unicode_as_ushorts, int size) - - Use setUtf16() instead. -*/ - -/*! - \fn ushort *QString::ucs2() const - - Use utf16() instead. -*/ - -/*! - \fn QString QString::fromUcs2(const ushort *unicode, int size = -1) - - Use fromUtf16() instead. -*/ - -/*! - \fn QString &QString::setAscii(const char *str, int len = -1) - - Use fromAscii() instead. -*/ - -/*! - \fn QString &QString::setLatin1(const char *str, int len = -1) - - Use fromLatin1() instead. -*/ - -/*! - \fn QChar QString::constref(uint i) const - - Use at() instead. -*/ - -/*! - \fn QChar &QString::ref(uint i); - - Use operator[]() instead. -*/ - -/*! - \fn QString::operator const char *() const - - Use toAscii().constData() instead. -*/ - -/*! - \class QConstString - \brief The QConstString class is a wrapper for constant Unicode string data. - \compat - - In Qt 4, QConstString is replaced by QString::fromRawData(), a - static function that constructs a QString object based on Unicode - string data. - - Because QString::fromRawData() has slightly more stringent - constraints than QConstString had in Qt 3, the new QConstString - class takes a deep copy of the string data. - - \sa QString::fromRawData() -*/ - -/*! - \fn QConstString::QConstString(const QChar *unicode, int size) - - Use QString(\a unicode, \a size) or - QString::fromRawData(\a unicode, \a size) instead. -*/ - -/*! - \fn const QString &QConstString::string() const - - Returns \c *this. Not necessary in Qt 4. -*/ diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp index 44cc692b2f..bab7d42215 100644 --- a/src/corelib/tools/qstringlist.cpp +++ b/src/corelib/tools/qstringlist.cpp @@ -437,54 +437,6 @@ QString QtPrivate::QStringList_join(const QStringList *that, const QString &sep) */ #endif // QT_NO_DATASTREAM -/*! - \fn QStringList QStringList::grep(const QString &str, bool cs = true) const - - Use filter() instead. -*/ - -/*! - \fn QStringList QStringList::grep(const QRegExp &rx) const - - Use filter() instead. -*/ - -/*! - \fn QStringList &QStringList::gres(const QString &before, const QString &after, bool cs = true) - - Use replaceInStrings() instead. -*/ - -/*! - \fn QStringList &QStringList::gres(const QRegExp &rx, const QString &after) - - Use replaceInStrings() instead. -*/ - -/*! - \fn Iterator QStringList::fromLast() - - Use end() instead. - - \oldcode - QStringList::Iterator i = list.fromLast(); - \newcode - QStringList::Iterator i = list.isEmpty() ? list.end() : --list.end(); - \endcode -*/ - -/*! - \fn ConstIterator QStringList::fromLast() const - - Use end() instead. - - \oldcode - QStringList::ConstIterator i = list.fromLast(); - \newcode - QStringList::ConstIterator i = list.isEmpty() ? list.end() : --list.end(); - \endcode -*/ - #ifndef QT_NO_REGEXP static int indexOfMutating(const QStringList *that, QRegExp &rx, int from) |