From ff63d0f28c56af711b84967a5a4012f0359eb9e0 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Tue, 19 Jul 2011 14:42:08 +0200 Subject: Doc: Removed documentation for deleted code. Change-Id: Icdbc05decac3dfe3fc18ce073c494e1fce4ea347 Reviewed-on: http://codereview.qt.nokia.com/1824 Reviewed-by: Qt Sanity Bot Reviewed-by: David Boddie --- src/corelib/codecs/qtextcodec.cpp | 27 ---- src/corelib/global/qglobal.cpp | 120 ---------------- src/corelib/global/qnamespace.qdoc | 131 ----------------- src/corelib/io/qdatastream.cpp | 23 --- src/corelib/io/qfile.cpp | 22 --- src/corelib/io/qfileinfo.cpp | 58 -------- src/corelib/io/qiodevice.cpp | 140 ------------------ src/corelib/io/qurl.cpp | 152 -------------------- src/corelib/kernel/qcoreevent.cpp | 8 -- src/corelib/kernel/qobject.cpp | 61 -------- src/corelib/kernel/qvariant.cpp | 134 ----------------- src/corelib/tools/qbytearray.cpp | 129 ----------------- src/corelib/tools/qchar.cpp | 36 ----- src/corelib/tools/qdatetime.cpp | 68 --------- src/corelib/tools/qlinkedlist.cpp | 87 ------------ src/corelib/tools/qlist.cpp | 42 ------ src/corelib/tools/qmap.cpp | 48 ------- src/corelib/tools/qrect.cpp | 95 ------------- src/corelib/tools/qregexp.cpp | 67 --------- src/corelib/tools/qstring.cpp | 276 ------------------------------------ src/corelib/tools/qstringlist.cpp | 48 ------- src/gui/kernel/qapplication.cpp | 19 --- src/gui/kernel/qpalette.cpp | 127 ----------------- src/gui/kernel/qwidget.cpp | 26 ---- src/gui/widgets/qcheckbox.cpp | 30 ---- src/gui/widgets/qcombobox.cpp | 64 --------- src/gui/widgets/qmenubar.cpp | 10 -- src/gui/widgets/qslider.cpp | 14 -- src/gui/widgets/qsplashscreen.cpp | 15 -- src/gui/widgets/qsplitter.cpp | 15 -- src/gui/widgets/qtoolbutton.cpp | 13 -- src/network/kernel/qhostaddress.cpp | 24 ---- 32 files changed, 2129 deletions(-) diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 0f919fb401..944be3620f 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -1788,33 +1788,6 @@ bool QTextDecoder::hasFailure() const return state.invalidChars != 0; } -/*! - \fn QTextCodec *QTextCodec::codecForContent(const char *str, int size) - - This functionality is no longer provided by Qt. This - compatibility function always returns a null pointer. -*/ - -/*! - \fn QTextCodec *QTextCodec::codecForName(const char *hint, int accuracy) - - Use the codecForName(const QByteArray &) overload instead. -*/ - -/*! - \fn QTextCodec *QTextCodec::codecForIndex(int i) - - Use availableCodecs() or availableMibs() instead and iterate - through the resulting list. -*/ - - -/*! - \fn QByteArray QTextCodec::mimeName() const - - Use name() instead. -*/ - QT_END_NAMESPACE #endif // QT_NO_TEXTCODEC diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index bbc9a15e74..a59cbf9382 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -832,126 +832,6 @@ QT_BEGIN_NAMESPACE \sa qMin(), qMax() */ -/*! - \typedef Q_INT8 - \relates - \compat - - Use \l qint8 instead. -*/ - -/*! - \typedef Q_UINT8 - \relates - \compat - - Use \l quint8 instead. -*/ - -/*! - \typedef Q_INT16 - \relates - \compat - - Use \l qint16 instead. -*/ - -/*! - \typedef Q_UINT16 - \relates - \compat - - Use \l quint16 instead. -*/ - -/*! - \typedef Q_INT32 - \relates - \compat - - Use \l qint32 instead. -*/ - -/*! - \typedef Q_UINT32 - \relates - \compat - - Use \l quint32 instead. -*/ - -/*! - \typedef Q_INT64 - \relates - \compat - - Use \l qint64 instead. -*/ - -/*! - \typedef Q_UINT64 - \relates - \compat - - Use \l quint64 instead. -*/ - -/*! - \typedef Q_LLONG - \relates - \compat - - Use \l qint64 instead. -*/ - -/*! - \typedef Q_ULLONG - \relates - \compat - - Use \l quint64 instead. -*/ - -/*! - \typedef Q_LONG - \relates - \compat - - Use \c{void *} instead. -*/ - -/*! - \typedef Q_ULONG - \relates - \compat - - Use \c{void *} instead. -*/ - -/*! \fn bool qSysInfo(int *wordSize, bool *bigEndian) - \relates - - Use QSysInfo::WordSize and QSysInfo::ByteOrder instead. -*/ - -/*! - \fn bool qt_winUnicode() - \relates - - This function always returns true. - - \sa QSysInfo -*/ - -/*! - \fn int qWinVersion() - \relates - - Use QSysInfo::WindowsVersion instead. - - \sa QSysInfo -*/ - /*! \fn int qMacVersion() \relates diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 2d102e7ba1..9dd7cda24f 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -611,33 +611,6 @@ \omitvalue DockWidgetArea_Mask */ -/*! - \enum Qt::BackgroundMode - - \compat - - \value FixedColor - \value FixedPixmap - \value NoBackground - \value PaletteForeground - \value PaletteButton - \value PaletteLight - \value PaletteMidlight - \value PaletteDark - \value PaletteMid - \value PaletteText - \value PaletteBrightText - \value PaletteBase - \value PaletteBackground - \value PaletteShadow - \value PaletteHighlight - \value PaletteHighlightedText - \value PaletteButtonText - \value PaletteLink - \value PaletteLinkVisited - \value X11ParentRelative -*/ - /*! \enum Qt::ImageConversionFlag @@ -693,17 +666,6 @@ rendering operation for example. */ -/*! \enum Qt::GUIStyle - - \compat - - \value WindowsStyle - \value MotifStyle - \value MacStyle - \value Win3Style - \value PMStyle -*/ - /*! \enum Qt::UIEffect @@ -755,21 +717,6 @@ \sa QSize::scale(), QImage::scaled() */ -/*! \typedef Qt::ScaleMode - \compat - - Use Qt::AspectRatioMode instead. - - The enum values have been renamed as follows: - - \table - \row \i Old enum value \i New enum value - \row \i Qt::ScaleFree \i Qt::IgnoreAspectRatio - \row \i Qt::ScaleMin \i Qt::KeepAspectRatio - \row \i Qt::ScaleMax \i Qt::KeepAspectRatioByExpanding - \endtable -*/ - /*! \enum Qt::TransformationMode This enum type defines whether image transformations (e.g., @@ -1763,26 +1710,6 @@ This enum is defined in the \c header file. */ -/*! - \enum Qt::ButtonState_enum - \compat - \value ShiftButton - \value ControlButton - \value AltButton - \value MetaButton - \value Keypad - \value KeyButtonMask - - Use Qt::KeyboardModifier instead. -*/ - -/*! - \typedef Qt::ButtonState - \compat - - Use Qt::KeyboardModifier instead. -*/ - /*! \enum Qt::CheckState @@ -2201,44 +2128,6 @@ TargetMoveAction is not used on the Mac. */ -/*! \typedef Qt::ToolBarDock - \compat - - Use Qt::Dock instead. -*/ - -/*! - \enum Qt::Dock - \compat - - Each dock window can be in one of the following positions: - - \value DockUnmanaged not managed by a Q3MainWindow. - - \value DockTornOff the dock window floats as its own top level - window which always stays on top of the main window. - - \value DockTop above the central widget, below the menu bar. - - \value DockBottom below the central widget, above the status bar. - - \value DockRight to the right of the central widget. - - \value DockLeft to the left of the central widget. - - \value DockMinimized the dock window is not shown (this is - effectively a 'hidden' dock area); the handles of all minimized - dock windows are drawn in one row below the menu bar. - - \omitvalue Bottom - \omitvalue Left - \omitvalue Minimized - \omitvalue Right - \omitvalue Top - \omitvalue TornOff - \omitvalue Unmanaged -*/ - /*! \enum Qt::AnchorAttribute @@ -2338,19 +2227,6 @@ as the intersection of closed shapes. */ -/*! - \enum Qt::PaintUnit - - \compat - - \value PixelUnit - \value LoMetricUnit Obsolete - \value HiMetricUnit Obsolete - \value LoEnglishUnit Obsolete - \value HiEnglishUnit Obsolete - \value TwipsUnit Obsolete -*/ - /*! \enum Qt::TextFormat @@ -2478,13 +2354,6 @@ \omitvalue whatsThisCursor */ -/*! - \typedef Qt::TextFlags - \compat - - Use Qt::TextFlag instead. -*/ - /*! \enum Qt::LayoutDirection diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index af4ec3bc60..0e0a47267a 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/io/qdatastream.cpp @@ -487,11 +487,6 @@ void QDataStream::setStatus(Status status) q_status = status; } -/*!\fn bool QDataStream::eof() const - - Use atEnd() instead. -*/ - /*! \fn int QDataStream::byteOrder() const @@ -523,24 +518,6 @@ void QDataStream::setByteOrder(ByteOrder bo) } -/*! - \fn bool QDataStream::isPrintableData() const - - In Qt 4, this function always returns false. - - \sa setPrintableData() -*/ - -/*! - \fn void QDataStream::setPrintableData(bool enable) - - In Qt 3, this function enabled output in a human-readable - format if \a enable was false. - - In Qt 4, QDataStream no longer provides a human-readable output. - This function does nothing. -*/ - /*! \enum QDataStream::Version diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index 47f57f7fdb..684f360313 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -1036,11 +1036,6 @@ bool QFile::open(OpenMode mode) return false; } -/*! \fn QFile::open(OpenMode, FILE*) - - Use open(FILE *, OpenMode) instead. -*/ - /*! \overload @@ -1158,11 +1153,6 @@ bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags) return false; } -/*! \fn QFile::open(OpenMode, int) - - Use open(int, OpenMode) instead. -*/ - /*! \overload @@ -1399,18 +1389,6 @@ bool QFile::unmap(uchar *address) return false; } -/*! - \fn QString QFile::name() const - - Use fileName() instead. -*/ - -/*! - \fn void QFile::setName(const QString &name) - - Use setFileName() instead. -*/ - /*! Sets the file size (in bytes) \a sz. Returns true if the file if the resize succeeds; false otherwise. If \a sz is larger than the file diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index ee40c589a2..f54818e0a6 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -1318,64 +1318,6 @@ void QFileInfo::setCaching(bool enable) d->cache_enabled = enable; } -/*! - \fn QString QFileInfo::baseName(bool complete) - - Use completeBaseName() or the baseName() overload that takes no - parameters instead. -*/ - -/*! - \fn QString QFileInfo::extension(bool complete = true) const - - Use completeSuffix() or suffix() instead. -*/ - -/*! - \fn QString QFileInfo::absFilePath() const - - Use absoluteFilePath() instead. -*/ - -/*! - \fn QString QFileInfo::dirPath(bool absPath) const - - Use absolutePath() if the absolute path is wanted (\a absPath - is true) or path() if it's not necessary (\a absPath is false). -*/ - -/*! - \fn bool QFileInfo::convertToAbs() - - Use makeAbsolute() instead. -*/ - -/*! - \enum QFileInfo::Permission - - \compat - - \value ReadOwner - \value WriteOwner - \value ExeOwner - \value ReadUser - \value WriteUser - \value ExeUser - \value ReadGroup - \value WriteGroup - \value ExeGroup - \value ReadOther - \value WriteOther - \value ExeOther -*/ - -/*! - \fn bool QFileInfo::permission(PermissionSpec permissions) const - \compat - - Use permission() instead. -*/ - /*! \typedef QFileInfoList \relates QFileInfo diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index 4371d9cbef..89987bc64a 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -242,21 +242,6 @@ QIODevicePrivate::~QIODevicePrivate() \sa QBuffer QFile QTcpSocket */ -/*! - \typedef QIODevice::Offset - \compat - - Use \c qint64 instead. -*/ - -/*! - \typedef QIODevice::Status - \compat - - Use QIODevice::OpenMode instead, or see the documentation for - specific devices. -*/ - /*! \enum QIODevice::OpenModeFlag @@ -1664,131 +1649,6 @@ QString QIODevice::errorString() const \sa read() write() */ -/*! - \fn QIODevice::Offset QIODevice::status() const - - For device specific error handling, please refer to the - individual device documentation. - - \sa qobject_cast() -*/ - -/*! - \fn QIODevice::Offset QIODevice::at() const - - Use pos() instead. -*/ - -/*! - \fn bool QIODevice::at(Offset offset) - - Use seek(\a offset) instead. -*/ - -/*! \fn int QIODevice::flags() const - - Use openMode() instead. -*/ - -/*! \fn int QIODevice::getch() - - Use getChar() instead. -*/ - -/*! - \fn bool QIODevice::isAsynchronous() const - - This functionality is no longer available. This function always - returns true. -*/ - -/*! - \fn bool QIODevice::isBuffered() const - - Use !(openMode() & QIODevice::Unbuffered) instead. -*/ - -/*! - \fn bool QIODevice::isCombinedAccess() const - - Use openMode() instead. -*/ - -/*! - \fn bool QIODevice::isDirectAccess() const - - Use !isSequential() instead. -*/ - -/*! - \fn bool QIODevice::isInactive() const - - Use isOpen(), isReadable(), or isWritable() instead. -*/ - -/*! - \fn bool QIODevice::isRaw() const - - Use openMode() instead. -*/ - -/*! - \fn bool QIODevice::isSequentialAccess() const - - Use isSequential() instead. -*/ - -/*! - \fn bool QIODevice::isSynchronous() const - - This functionality is no longer available. This function always - returns false. -*/ - -/*! - \fn bool QIODevice::isTranslated() const - - Use openMode() instead. -*/ - -/*! - \fn bool QIODevice::mode() const - - Use openMode() instead. -*/ - -/*! \fn int QIODevice::putch(int ch) - - Use putChar(\a ch) instead. -*/ - -/*! \fn int QIODevice::ungetch(int ch) - - Use ungetChar(\a ch) instead. -*/ - -/*! - \fn quint64 QIODevice::readBlock(char *data, quint64 size) - - Use read(\a data, \a size) instead. -*/ - -/*! \fn int QIODevice::state() const - - Use isOpen() instead. -*/ - -/*! - \fn qint64 QIODevice::writeBlock(const char *data, quint64 size) - - Use write(\a data, \a size) instead. -*/ - -/*! - \fn qint64 QIODevice::writeBlock(const QByteArray &data) - - Use write(\a data) instead. -*/ #if !defined(QT_NO_DEBUG_STREAM) QDebug operator<<(QDebug debug, QIODevice::OpenMode modes) diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index b948a43080..8e3c98c739 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -6208,158 +6208,6 @@ bool QUrl::isParentOf(const QUrl &childUrl) const && childPath.length() > ourPath.length() && childPath.at(ourPath.length()) == QLatin1Char('/')))); } -/*! - \fn void QUrl::setProtocol(const QString &s) - - Use setScheme() instead. -*/ - -/*! - \fn void QUrl::setUser(const QString &s) - - Use setUserName() instead. -*/ - -/*! - \fn bool QUrl::hasUser() const - - Use !userName().isEmpty() instead. -*/ - -/*! - \fn bool QUrl::hasPassword() const - - Use !password().isEmpty() instead. -*/ - -/*! - \fn bool QUrl::hasHost() const - - Use !host().isEmpty() instead. -*/ - -/*! - \fn bool QUrl::hasPort() const - - Use port() != -1 instead. -*/ - -/*! - \fn bool QUrl::hasPath() const - - Use !path().isEmpty() instead. -*/ - -/*! - \fn void QUrl::setQuery(const QString &txt) - - Use setEncodedQuery() instead. -*/ - -/*! - \fn void QUrl::setRef(const QString &txt) - - Use setFragment() instead. -*/ - -/*! - \fn bool QUrl::hasRef() const - - Use !fragment().isEmpty() instead. -*/ - -/*! - \fn void QUrl::addPath(const QString &p) - - Use setPath() instead. -*/ - -/*! - \fn void QUrl::setFileName(const QString &txt) - - Use setPath() instead. -*/ - -/*! - \fn void QUrl::decode(QString &url) - - Use fromPercentEncoding() instead. -*/ - -/*! - \fn void QUrl::encode(QString &url) - - Use toPercentEncoding() instead. -*/ - -/*! - \fn bool QUrl::cdUp() - - Use resolved("..") instead. - - \oldcode - QUrl url("http://example.com/Developer/"); - url.cdUp(); - \newcode - QUrl url("http://example.com/Developer/"); - url = url.resolved(".."); - \endcode -*/ - -/*! - \fn bool QUrl::isRelativeUrl(const QString &url) - - Use isRelative() instead. -*/ - -/*! - \fn void QUrl::reset() - - Use clear() instead. -*/ - -/*! - \fn QUrl::operator QString() const - - Use toString() instead. -*/ - -/*! - \fn QString QUrl::protocol() const - - Use scheme() instead. -*/ - -/*! - \fn QString QUrl::user() const - - Use userName() instead. -*/ - -/*! - \fn QString QUrl::query() const - - Use encodedQuery() instead. -*/ - -/*! - \fn QString QUrl::ref() const - - Use fragment() instead. -*/ - -/*! - \fn QString QUrl::fileName() const - - Use QFileInfo(path()).fileName() instead. -*/ - -/*! - \fn QString QUrl::dirPath() const - - Use QFileInfo(path()).absolutePath() or QFileInfo(path()) instead. -*/ - #ifndef QT_NO_DATASTREAM /*! \relates QUrl diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index a355b0ad1a..20376b9fa4 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -505,14 +505,6 @@ QChildEvent::~QChildEvent() */ -/*! - \fn bool QChildEvent::inserted() const - - \compat - - A child has been inserted if the event's type() is ChildInserted. -*/ - /*! \class QDynamicPropertyChangeEvent \since 4.2 diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index c1ac70d8da..27edbdacac 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3773,67 +3773,6 @@ QDebug operator<<(QDebug dbg, const QObject *o) { } #endif -/*! - \fn void QObject::insertChild(QObject *object) - - Use setParent() instead, i.e., call object->setParent(this). -*/ - -/*! - \fn void QObject::removeChild(QObject *object) - - Use setParent() instead, i.e., call object->setParent(0). -*/ - -/*! - \fn bool QObject::isA(const char *className) const - - Compare \a className with the object's metaObject()->className() instead. -*/ - -/*! - \fn const char *QObject::className() const - - Use metaObject()->className() instead. -*/ - -/*! - \fn const char *QObject::name() const - - Use objectName() instead. -*/ - -/*! - \fn const char *QObject::name(const char *defaultName) const - - Use objectName() instead. -*/ - -/*! - \fn void QObject::setName(const char *name) - - Use setObjectName() instead. -*/ - -/*! - \fn bool QObject::checkConnectArgs(const char *signal, const - QObject *object, const char *method) - - Use QMetaObject::checkConnectArgs() instead. -*/ - -/*! - \fn QByteArray QObject::normalizeSignalSlot(const char *signalSlot) - - Use QMetaObject::normalizedSignature() instead. -*/ - -/*! - \fn const char *QMetaObject::superClassName() const - - \internal -*/ - /*! \macro Q_CLASSINFO(Name, Value) \relates QObject diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 01e12ee968..3144df00bb 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -2576,14 +2576,6 @@ QVariantList QVariant::toList() const return qVariantToHelper(d, List, handler); } -/*! \fn QVariant::canCast(Type t) const - Use canConvert() instead. -*/ - -/*! \fn QVariant::cast(Type t) - Use convert() instead. -*/ - static const quint32 qCanConvertMatrix[QVariant::LastCoreType + 1] = { @@ -2922,132 +2914,6 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p) } #endif -/*! - \fn int &QVariant::asInt() - - Use toInt() instead. -*/ - -/*! - \fn uint &QVariant::asUInt() - - Use toUInt() instead. -*/ - -/*! - \fn qlonglong &QVariant::asLongLong() - - Use toLongLong() instead. -*/ - -/*! - \fn qulonglong &QVariant::asULongLong() - - Use toULongLong() instead. -*/ - -/*! - \fn bool &QVariant::asBool() - - Use toBool() instead. -*/ - -/*! - \fn double &QVariant::asDouble() - - Use toDouble() instead. -*/ - -/*! - \fn QByteArray &QVariant::asByteArray() - - Use toByteArray() instead. -*/ - -/*! - \fn QBitArray &QVariant::asBitArray() - - Use toBitArray() instead. -*/ - -/*! - \fn QString &QVariant::asString() - - Use toString() instead. -*/ - -/*! - \fn QStringList &QVariant::asStringList() - - Use toStringList() instead. -*/ - -/*! - \fn QDate &QVariant::asDate() - - Use toDate() instead. -*/ - -/*! - \fn QTime &QVariant::asTime() - - Use toTime() instead. -*/ - -/*! - \fn QDateTime &QVariant::asDateTime() - - Use toDateTime() instead. -*/ - -/*! - \fn QList &QVariant::asList() - - Use toList() instead. -*/ - -/*! - \fn QMap &QVariant::asMap() - - Use toMap() instead. -*/ - -/*! - \fn QVariant::QVariant(bool b, int dummy) - - Use the QVariant(bool) constructor instead. - -*/ - -/*! - \fn const QByteArray QVariant::toCString() const - - Use toByteArray() instead. -*/ - -/*! - \fn QByteArray &QVariant::asCString() - - Use toByteArray() instead. -*/ - -/*! - \fn QPoint &QVariant::asPoint() - - Use toPoint() instead. - */ - -/*! - \fn QRect &QVariant::asRect() - - Use toRect() instead. - */ - -/*! - \fn QSize &QVariant::asSize() - - Use toSize() instead. - */ /*! \fn void QVariant::setValue(const T &value) 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 @@ -4269,135 +4269,6 @@ QByteArray QByteArray::toPercentEncoding(const QByteArray &exclude, const QByteA \internal */ -/*! - \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 @@ -1256,18 +1256,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 @@ -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 @@ -1053,93 +1053,6 @@ QLinkedListData QLinkedListData::shared_null = { \sa \link datastreamformat.html Format of the QDataStream operators \endlink */ -/*! - \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 QLinkedList::fromStdList(const std::list &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 QList::fromVector(const QVector &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 map; - ... - map.insert("delay", 30000, false); - \newcode - QMap 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 @@ -316,16 +316,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 @@ -366,42 +356,6 @@ QRect QRect::normalized() const \sa setBottom(), bottomLeft(), bottomRight() */ -/*! - \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 @@ -595,28 +549,6 @@ QRect QRect::normalized() const \sa setCoords(), getRect() */ -/*! - \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) @@ -718,23 +650,6 @@ void QRect::moveCenter(const QPoint &p) y2 = y1 + h; } -/*! - \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) @@ -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) { @@ -4547,14 +4524,6 @@ QString& QString::fill(QChar ch, int size) \sa operator==(), operator<(), operator>() */ -/*! - \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 @@ -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) diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 760fe789de..9cd1b7bb09 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -4953,13 +4953,6 @@ void QSessionManager::requestPhase2() #endif #endif // QT_NO_SESSIONMANAGER -/*! - \typedef QApplication::ColorMode - \compat - - Use ColorSpec instead. -*/ - /*! \fn Qt::MacintoshVersion QApplication::macVersion() @@ -5097,18 +5090,6 @@ void QApplicationPrivate::emitLastWindowClosed() } } -/*! \variable QApplication::NormalColors - \compat - - Use \l NormalColor instead. -*/ - -/*! \variable QApplication::CustomColors - \compat - - Use \l CustomColor instead. -*/ - #ifdef QT_KEYPAD_NAVIGATION /*! Sets the kind of focus navigation Qt should use to \a mode. diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 995a3618f2..ed483d95ff 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -1264,133 +1264,6 @@ void QPalette::setColorGroup(ColorGroup cg, const QBrush &foreground, const QBru \sa QColorGroup */ -/*! \class QColorGroup - \brief The QColorGroup class contains color groups for each widget state. - \compat -*/ - -/*! \fn QColorGroup::QColorGroup() - - Use QPalette() instead. -*/ - -/*! \fn QColorGroup::QColorGroup(const QBrush &foreground, const QBrush &button, \ - const QBrush &light, const QBrush &dark, const QBrush &mid, \ - const QBrush &text, const QBrush &bright_text, - const QBrush &base, const QBrush &background) - - Use QPalette(\a foreground, \a button, \a light, \a dark, \a mid, - \a text, \a bright_text, \a base, \a background) instead. -*/ - -/*! \fn QColorGroup::QColorGroup(const QColor &foreground, const QColor &background, \ - const QColor &light, const QColor &dark, const QColor &mid, \ - const QColor &text, const QColor &base) - - Use QColorGroup(\a foreground, \a background, \a light, \a dark, - \a mid, \a text, \a base) instead. -*/ - -/*! \fn QColorGroup::QColorGroup(const QColorGroup &other) - - Use QPalette(\a other) instead. -*/ - -/*! \fn QColorGroup::QColorGroup(const QPalette &pal) - - Use QPalette(\a pal) instead. -*/ - -/*! \fn const QColor &QColorGroup::foreground() const - - Use QPalette::windowText().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::button() const - - Use QPalette::button().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::light() const - - Use QPalette::light().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::dark() const - - Use QPalette::dark().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::mid() const - - Use QPalette::mid().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::text() const - - Use QPalette::text().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::base() const - - Use QPalette::base().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::background() const - - Use QPalette::window().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::midlight() const - - Use QPalette::midlight().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::brightText() const - - Use QPalette::brightText().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::buttonText() const - - Use QPalette::buttonText().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::shadow() const - - Use QPalette::shadow().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::highlight() const - - Use QPalette::highlight().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::highlightedText() const - - Use QPalette::highlightedText().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::link() const - - Use QPalette::link().color() instead. -*/ - -/*! \fn const QColor &QColorGroup::linkVisited() const - - Use QPalette::linkVisited().color() instead. -*/ - -/*! \fn QDataStream &operator<<(QDataStream &ds, const QColorGroup &colorGroup) - \relates QColorGroup - \compat -*/ - -/*! \fn QDataStream &operator>>(QDataStream &ds, QColorGroup &colorGroup) - \relates QColorGroup - \compat -*/ - /*! \fn bool QColorGroup::operator==(const QColorGroup &other) const Returns true if this color group is equal to \a other; otherwise diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index c1dc284008..60f20644c7 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -11540,18 +11540,6 @@ void QWidget::windowActivationChange(bool) { } // compat void QWidget::languageChange() { } // compat -/*! - \enum QWidget::BackgroundOrigin - - \compat - - \value WidgetOrigin - \value ParentOrigin - \value WindowOrigin - \value AncestorOrigin - -*/ - /*! \fn bool QWidget::isVisibleToTLW() const @@ -11958,20 +11946,6 @@ void QWidget::languageChange() { } // compat \endcode */ -/*! - \fn void QWidget::setSizePolicy(QSizePolicy::Policy hor, QSizePolicy::Policy ver, bool hfw) - \compat - - Use the \l sizePolicy property and heightForWidth() function instead. -*/ - -/*! - \fn bool QWidget::isUpdatesEnabled() const - \compat - - Use the \l updatesEnabled property instead. -*/ - /*! \macro QWIDGETSIZE_MAX \relates QWidget diff --git a/src/gui/widgets/qcheckbox.cpp b/src/gui/widgets/qcheckbox.cpp index 9904a15ac0..c6d1317147 100644 --- a/src/gui/widgets/qcheckbox.cpp +++ b/src/gui/widgets/qcheckbox.cpp @@ -134,15 +134,6 @@ public: \sa QAbstractButton, QRadioButton, {fowler}{GUI Design Handbook: Check Box} */ -/*! - \enum QCheckBox::ToggleState - \compat - - \value Off Use Qt::Unchecked instead. - \value NoChange Use Qt::PartiallyChecked instead. - \value On Use Qt::Checked instead. -*/ - /*! \fn void QCheckBox::stateChanged(int state) @@ -423,25 +414,4 @@ QCheckBox::QCheckBox(const QString &text, QWidget *parent, const char* name) #endif -/*! - \fn void QCheckBox::setNoChange() - \compat - - Use setCheckState() instead. -*/ - -/*! - \fn void QCheckBox::setState(ToggleState state) - \compat - - Use setCheckState() instead. -*/ - -/*! - \fn QCheckBox::ToggleState QCheckBox::state() const - \compat - - Use checkState() instead. -*/ - QT_END_NAMESPACE diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index 621cae92da..bf6730e9e3 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -3216,63 +3216,6 @@ QVariant QComboBox::inputMethodQuery(Qt::InputMethodQuery query) const widget is changed. The new text is specified by \a text. */ -/*! - \fn QComboBox::InsertPolicy QComboBox::insertionPolicy() const - \compat - - Use QComboBox::insertPolicy instead. -*/ - -/*! - \fn void QComboBox::setInsertionPolicy(InsertPolicy policy) - \compat - - Use QComboBox::insertPolicy instead. -*/ - -/*! - \fn void QComboBox::setCurrentText(const QString &text) - \compat - - Use setItemText() instead. - - \sa currentIndex() -*/ - -/*! - \fn QString QComboBox::text(int index) const - \compat - - Use itemText() instead. -*/ - -/*! - \fn QPixmap QComboBox::pixmap(int index) const - \compat - - Use itemIcon() instead. -*/ - -/*! - \fn void QComboBox::insertStringList(const QStringList &list, int index) - \compat - - Use insertItems() instead. -*/ - -/*! - \fn void QComboBox::insertItem(const QString &text, int index) - \compat -*/ - -/*! - \fn void QComboBox::clearEdit() - \compat - - Use clearEditText() instead. -*/ - - /*! \property QComboBox::frame \brief whether the combo box draws itself with a frame @@ -3351,13 +3294,6 @@ void QComboBox::setModelColumn(int visibleColumn) Use the editTextChanged(const QString &text) signal instead. */ -/*! - \typedef QComboBox::Policy - \compat - - Use QComboBox::InsertPolicy instead. -*/ - QT_END_NAMESPACE #include "moc_qcombobox.cpp" diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index 3ff98a4b90..56a1f04cc6 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -2131,16 +2131,6 @@ int QMenuBar::findIdForAction(QAction *act) const } #endif -/*! - \enum QMenuBar::Separator - - \compat - - \value Never - \value InWindowsStyle - -*/ - /*! \fn void QMenuBar::addAction(QAction *action) \overload diff --git a/src/gui/widgets/qslider.cpp b/src/gui/widgets/qslider.cpp index 7529c3c923..026926a8a3 100644 --- a/src/gui/widgets/qslider.cpp +++ b/src/gui/widgets/qslider.cpp @@ -602,20 +602,6 @@ QSlider::TickPosition QSlider::tickPosition() const return d_func()->tickPosition; } -/*! - \fn TickPosition QSlider::tickmarks() const - \compat - - Use tickPosition() instead. -*/ - -/*! - \fn QSlider::setTickmarks(TickPosition position) - \compat - - Use setTickPosition() instead. -*/ - /*! \property QSlider::tickInterval \brief the interval between tickmarks diff --git a/src/gui/widgets/qsplashscreen.cpp b/src/gui/widgets/qsplashscreen.cpp index 2da4a8b33d..e051878db9 100644 --- a/src/gui/widgets/qsplashscreen.cpp +++ b/src/gui/widgets/qsplashscreen.cpp @@ -297,21 +297,6 @@ void QSplashScreen::drawContents(QPainter *painter) } } -/*! - \fn void QSplashScreen::message(const QString &message, int alignment, - const QColor &color) - \compat - - Use showMessage() instead. -*/ - -/*! - \fn void QSplashScreen::clear() - \compat - - Use clearMessage() instead. -*/ - /*! \reimp */ bool QSplashScreen::event(QEvent *e) { diff --git a/src/gui/widgets/qsplitter.cpp b/src/gui/widgets/qsplitter.cpp index 1222b07354..5d5897311b 100644 --- a/src/gui/widgets/qsplitter.cpp +++ b/src/gui/widgets/qsplitter.cpp @@ -1531,21 +1531,6 @@ void QSplitter::setOpaqueResize(bool on) \endcode */ -/*! - \enum QSplitter::ResizeMode - \compat - - This enum describes the different resizing behaviors child - widgets can have: - - \value Auto The widget will be resized according to the stretch factors set in its sizePolicy(). - \value Stretch The widget will be resized when the splitter itself is resized. - \value KeepSize QSplitter will try to keep the widget's size unchanged. - \value FollowSizeHint QSplitter will resize the widget when the widget's size hint changes. - - Use setStretchFactor() instead. -*/ - /*! \fn void QSplitter::setCollapsible(QWidget *widget, bool collapsible) diff --git a/src/gui/widgets/qtoolbutton.cpp b/src/gui/widgets/qtoolbutton.cpp index 0d765d25cd..f023f8af0f 100644 --- a/src/gui/widgets/qtoolbutton.cpp +++ b/src/gui/widgets/qtoolbutton.cpp @@ -463,19 +463,6 @@ QSize QToolButton::minimumSizeHint() const return sizeHint(); } -/*! - \enum QToolButton::TextPosition - \compat - - This enum describes the position of the tool button's text label in - relation to the tool button's icon. - - \value BesideIcon The text appears beside the icon. - \value BelowIcon The text appears below the icon. - \omitvalue Right - \omitvalue Under -*/ - /*! \property QToolButton::toolButtonStyle \brief whether the tool button displays an icon only, text only, diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index 3dd7461a75..3b777f9a68 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -913,30 +913,6 @@ bool QHostAddress::isNull() const return d->protocol == QAbstractSocket::UnknownNetworkLayerProtocol; } -/*! - \fn quint32 QHostAddress::ip4Addr() const - - Use toIPv4Address() instead. -*/ - -/*! - \fn bool QHostAddress::isIp4Addr() const - - Use protocol() instead. -*/ - -/*! - \fn bool QHostAddress::isIPv4Address() const - - Use protocol() instead. -*/ - -/*! - \fn bool QHostAddress::isIPv6Address() const - - Use protocol() instead. -*/ - /*! \since 4.5 -- cgit v1.2.3