diff options
50 files changed, 4 insertions, 437 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index e0fa45b45e..89006eea7c 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -75,7 +75,6 @@ # if defined(__SC__) && __SC__ < 0x750 # error "Compiler not supported" # endif -# define Q_NO_USING_KEYWORD #elif defined(_MSC_VER) # define Q_CC_MSVC (_MSC_VER) @@ -113,7 +112,6 @@ # if __BORLANDC__ < 0x502 # error "Compiler not supported" # endif -# define Q_NO_USING_KEYWORD #elif defined(__WATCOMC__) # define Q_CC_WAT @@ -278,7 +276,6 @@ # error "Compiler not supported" # endif /* Spurious (?) error messages observed on Compaq C++ V6.5-014. */ -# define Q_NO_USING_KEYWORD /* Apply to all versions prior to Compaq C++ V6.0-000 - observed on DEC C++ V5.5-004. */ # if __DECCXX_VER < 60060000 @@ -323,7 +320,6 @@ compiler is using its own set of rules. Forget it. */ # elif defined(__KCC) # define Q_CC_KAI -# define Q_NO_USING_KEYWORD /* Using the `using' keyword avoids Intel C++ for Linux warnings */ # elif defined(__INTEL_COMPILER) @@ -346,23 +342,19 @@ # if !defined(__SCO_VERSION__) || (__SCO_VERSION__ < 302200010) # define Q_OUTOFLINE_TEMPLATE inline # endif -# define Q_NO_USING_KEYWORD /* ### check "using" status */ /* Never tested! */ # elif defined(CENTERLINE_CLPP) || defined(OBJECTCENTER) # define Q_CC_OC -# define Q_NO_USING_KEYWORD /* CDS++ defines __EDG__ although this is not documented in the Reliant documentation. It also follows conventions like _BOOL and this documented */ # elif defined(sinix) # define Q_CC_CDS -# define Q_NO_USING_KEYWORD /* The MIPSpro compiler defines __EDG */ # elif defined(__sgi) # define Q_CC_MIPS -# define Q_NO_USING_KEYWORD /* ### check "using" status */ # define Q_NO_TEMPLATE_FRIENDS # if defined(_COMPILER_VERSION) && (_COMPILER_VERSION >= 740) # define Q_OUTOFLINE_TEMPLATE inline @@ -404,9 +396,6 @@ # if !defined(_BOOL) # error "Compiler not supported" # endif -# if defined(__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT <= 4) -# define Q_NO_USING_KEYWORD -# endif # define Q_C_CALLBACKS /* 4.2 compiler or older */ # else @@ -445,7 +434,6 @@ # else # error "Compiler not supported" # endif -# define Q_NO_USING_KEYWORD /* ### check "using" status */ #else # error "Qt has not been tested with this compiler - see http://www.qt-project.org/" diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index 915b845c6b..88e39f9441 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -1264,11 +1264,6 @@ void QAbstractItemModel::resetInternalData() */ /*! - \fn QObject *QAbstractItemModel::parent() const - \internal -*/ - -/*! \fn QModelIndex QAbstractItemModel::parent(const QModelIndex &index) const = 0 Returns the parent of the model item with the given \a index. If the item diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h index e8b6e9cf98..5761084055 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.h +++ b/src/corelib/itemmodels/qabstractitemmodel.h @@ -230,11 +230,7 @@ public: virtual QHash<int,QByteArray> roleNames() const; -#ifdef Q_NO_USING_KEYWORD - inline QObject *parent() const { return QObject::parent(); } -#else using QObject::parent; -#endif enum LayoutChangeHint { @@ -425,13 +421,7 @@ public: Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - inline QObject *parent() const { return QAbstractItemModel::parent(); } -#endif -#else using QObject::parent; -#endif protected: QAbstractTableModel(QAbstractItemModelPrivate &dd, QObject *parent); @@ -456,13 +446,7 @@ public: Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - inline QObject *parent() const { return QAbstractItemModel::parent(); } -#endif -#else using QObject::parent; -#endif protected: QAbstractListModel(QAbstractItemModelPrivate &dd, QObject *parent); diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index 90dd984b83..e64d588432 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -2742,11 +2742,6 @@ QItemSelection QSortFilterProxyModel::mapSelectionFromSource(const QItemSelectio return QAbstractProxyModel::mapSelectionFromSource(sourceSelection); } -/*! - \fn QObject *QSortFilterProxyModel::parent() const - \internal -*/ - QT_END_NAMESPACE #include "moc_qsortfilterproxymodel.cpp" diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h index f2debb9bdf..9df785756c 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.h +++ b/src/corelib/itemmodels/qsortfilterproxymodel.h @@ -117,11 +117,7 @@ protected: void invalidateFilter(); public: -#ifdef Q_NO_USING_KEYWORD - inline QObject *parent() const { return QObject::parent(); } -#else using QObject::parent; -#endif QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index 0f741a2f7e..6a08576f7e 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -2225,12 +2225,6 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW */ /*! - \fn bool QMultiHash::contains(const Key &key) const - \overload - \sa QHash::contains() -*/ - -/*! \fn int QMultiHash::remove(const Key &key, const T &value) \since 4.3 @@ -2241,12 +2235,6 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW */ /*! - \fn int QMultiHash::remove(const Key &key) - \overload - \sa QHash::remove() -*/ - -/*! \fn int QMultiHash::count(const Key &key, const T &value) const \since 4.3 @@ -2256,18 +2244,6 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW */ /*! - \fn int QMultiHash::count(const Key &key) const - \overload - \sa QHash::count() -*/ - -/*! - \fn int QMultiHash::count() const - \overload - \sa QHash::count() -*/ - -/*! \fn typename QHash<Key, T>::iterator QMultiHash::find(const Key &key, const T &value) \since 4.3 @@ -2281,24 +2257,12 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW */ /*! - \fn typename QHash<Key, T>::iterator QMultiHash::find(const Key &key) - \overload - \sa QHash::find() -*/ - -/*! \fn typename QHash<Key, T>::const_iterator QMultiHash::find(const Key &key, const T &value) const \since 4.3 \overload */ /*! - \fn typename QHash<Key, T>::const_iterator QMultiHash::find(const Key &key) const - \overload - \sa QHash::find() -*/ - -/*! \fn typename QHash<Key, T>::const_iterator QMultiHash::constFind(const Key &key, const T &value) const \since 4.3 @@ -2311,10 +2275,4 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW \sa QHash::constFind() */ -/*! - \fn typename QHash<Key, T>::const_iterator QMultiHash::constFind(const Key &key) const - \overload - \sa QHash::constFind() -*/ - QT_END_NAMESPACE diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 59a5251c50..771e81c8f4 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -977,7 +977,7 @@ public: inline QMultiHash operator+(const QMultiHash &other) const { QMultiHash result = *this; result += other; return result; } -#if !defined(Q_NO_USING_KEYWORD) && !defined(Q_CC_RVCT) +#if !defined(Q_CC_RVCT) // RVCT compiler doesn't handle using-keyword right when used functions are overloaded in child class using QHash<Key, T>::contains; using QHash<Key, T>::remove; diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp index 38b4c0ad7e..ef5fbac377 100644 --- a/src/corelib/tools/qmap.cpp +++ b/src/corelib/tools/qmap.cpp @@ -1798,12 +1798,6 @@ void QMapDataBase::freeData(QMapDataBase *d) */ /*! - \fn bool QMultiMap::contains(const Key &key) const - \overload - \sa QMap::contains() -*/ - -/*! \fn int QMultiMap::remove(const Key &key, const T &value) \since 4.3 @@ -1814,12 +1808,6 @@ void QMapDataBase::freeData(QMapDataBase *d) */ /*! - \fn int QMultiMap::remove(const Key &key) - \overload - \sa QMap::remove() -*/ - -/*! \fn int QMultiMap::count(const Key &key, const T &value) const \since 4.3 @@ -1829,18 +1817,6 @@ void QMapDataBase::freeData(QMapDataBase *d) */ /*! - \fn int QMultiMap::count(const Key &key) const - \overload - \sa QMap::count() -*/ - -/*! - \fn int QMultiMap::count() const - \overload - \sa QMap::count() -*/ - -/*! \fn typename QMap<Key, T>::iterator QMultiMap::find(const Key &key, const T &value) \since 4.3 @@ -1857,12 +1833,6 @@ void QMapDataBase::freeData(QMapDataBase *d) */ /*! - \fn typename QMap<Key, T>::iterator QMultiMap::find(const Key &key) - \overload - \sa QMap::find() -*/ - -/*! \fn typename QMap<Key, T>::const_iterator QMultiMap::find(const Key &key, const T &value) const \since 4.3 \overload @@ -1880,13 +1850,6 @@ void QMapDataBase::freeData(QMapDataBase *d) */ /*! - \fn typename QMap<Key, T>::const_iterator QMultiMap::find(const Key &key) const - \since 4.3 - \overload - \sa QMap::find() -*/ - -/*! \fn typename QMap<Key, T>::const_iterator QMultiMap::constFind(const Key &key, const T &value) const \since 4.3 @@ -1899,10 +1862,4 @@ void QMapDataBase::freeData(QMapDataBase *d) \sa QMap::constFind() */ -/*! - \fn typename QMap<Key, T>::const_iterator QMultiMap::constFind(const Key &key) const - \overload - \sa QMap::constFind() -*/ - QT_END_NAMESPACE diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index a776e2eb4d..ce550c540b 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -1157,7 +1157,7 @@ public: inline QMultiMap operator+(const QMultiMap &other) const { QMultiMap result = *this; result += other; return result; } -#if !defined(Q_NO_USING_KEYWORD) && !defined(Q_CC_RVCT) +#if !defined(Q_CC_RVCT) // RVCT compiler doesn't handle using-keyword right when used functions are overloaded in child class using QMap<Key, T>::contains; using QMap<Key, T>::remove; diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp index 4e5393e0b0..5b2eb1de09 100644 --- a/src/corelib/tools/qstringlist.cpp +++ b/src/corelib/tools/qstringlist.cpp @@ -704,29 +704,6 @@ int QtPrivate::QStringList_lastIndexOf(const QStringList *that, const QRegularEx #endif // QT_BOOTSTRAPPED /*! - \fn int QStringList::indexOf(const QString &value, int from = 0) const - - Returns the index position of the first occurrence of \a value in - the list, searching forward from index position \a from. Returns - -1 if no item matched. - - \sa lastIndexOf(), contains(), QList::indexOf() -*/ - -/*! - \fn int QStringList::lastIndexOf(const QString &value, int from = -1) const - - Returns the index position of the last occurrence of \a value in - the list, searching backward from index position \a from. If \a - from is -1 (the default), the search starts at the last item. - Returns -1 if no item matched. - - By default, this function is case sensitive. - - \sa indexOf(), QList::lastIndexOf() -*/ - -/*! \fn int QStringList::removeDuplicates() \since 4.5 diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h index b24a261a7c..fc86b196d7 100644 --- a/src/corelib/tools/qstringlist.h +++ b/src/corelib/tools/qstringlist.h @@ -108,15 +108,8 @@ public: #endif // QT_NO_REGULAREXPRESSION #endif // QT_BOOTSTRAPPED -#if !defined(Q_NO_USING_KEYWORD) using QList<QString>::indexOf; using QList<QString>::lastIndexOf; -#else - inline int indexOf(const QString &str, int from = 0) const - { return QList<QString>::indexOf(str, from); } - inline int lastIndexOf(const QString &str, int from = -1) const - { return QList<QString>::lastIndexOf(str, from); } -#endif }; Q_DECLARE_TYPEINFO(QStringList, Q_MOVABLE_TYPE); diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp index 94f6a8bcde..9928098a33 100644 --- a/src/corelib/xml/qxmlstream.cpp +++ b/src/corelib/xml/qxmlstream.cpp @@ -2393,15 +2393,6 @@ QXmlStreamAttribute& QXmlStreamAttribute::operator=(const QXmlStreamAttribute &o */ /*! - \fn void QXmlStreamAttributes::append(const QXmlStreamAttribute &attribute) - - Appends the given \a attribute to the end of the vector. - - \sa QVector::append() -*/ - - -/*! \typedef QXmlStreamNotationDeclarations \relates QXmlStreamNotationDeclaration diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/xml/qxmlstream.h index 77f99c5d16..9a5756a431 100644 --- a/src/corelib/xml/qxmlstream.h +++ b/src/corelib/xml/qxmlstream.h @@ -125,12 +125,7 @@ public: return !value(namespaceUri, name).isNull(); } -#if !defined(Q_NO_USING_KEYWORD) using QVector<QXmlStreamAttribute>::append; -#else - inline void append(const QXmlStreamAttribute &attribute) - { QVector<QXmlStreamAttribute>::append(attribute); } -#endif }; class Q_CORE_EXPORT QXmlStreamNamespaceDeclaration { diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index 2f7932af2f..8558c0a51d 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -139,9 +139,8 @@ public: inline int count() const { return Count; } -#if defined(Q_QDOC) || defined(Q_NO_USING_KEYWORD) - inline QVariant argumentAt(int index) const - { return QDBusPendingReplyData::argumentAt(index); } +#if defined(Q_QDOC) + QVariant argumentAt(int index) const; #else using QDBusPendingReplyData::argumentAt; #endif diff --git a/src/gui/image/qpaintengine_pic_p.h b/src/gui/image/qpaintengine_pic_p.h index 5d47f6e88c..168be55927 100644 --- a/src/gui/image/qpaintengine_pic_p.h +++ b/src/gui/image/qpaintengine_pic_p.h @@ -83,12 +83,7 @@ public: void drawEllipse(const QRectF &rect) Q_DECL_OVERRIDE; void drawPath(const QPainterPath &path) Q_DECL_OVERRIDE; void drawPolygon(const QPointF *points, int numPoints, PolygonDrawMode mode) Q_DECL_OVERRIDE; -#ifdef Q_NO_USING_KEYWORD - inline void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) - { QPaintEngine::drawPolygon(points, pointCount, mode); } -#else using QPaintEngine::drawPolygon; -#endif void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) Q_DECL_OVERRIDE; diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 44ee710268..4102230e1b 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -2909,12 +2909,6 @@ void QStandardItemModel::sort(int column, Qt::SortOrder order) } /*! - \fn QObject *QStandardItemModel::parent() const - \internal -*/ - - -/*! \reimp */ QStringList QStandardItemModel::mimeTypes() const diff --git a/src/gui/itemmodels/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h index 509d21263d..75e6a71a6c 100644 --- a/src/gui/itemmodels/qstandarditemmodel.h +++ b/src/gui/itemmodels/qstandarditemmodel.h @@ -346,11 +346,7 @@ public: void clear(); -#ifdef Q_NO_USING_KEYWORD - inline QObject *parent() const { return QObject::parent(); } -#else using QObject::parent; -#endif void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_OVERRIDE; diff --git a/src/printsupport/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h index 5952952623..96d26c6d44 100644 --- a/src/printsupport/dialogs/qpagesetupdialog.h +++ b/src/printsupport/dialogs/qpagesetupdialog.h @@ -60,13 +60,7 @@ public: #endif virtual int exec() Q_DECL_OVERRIDE; -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); void done(int result) Q_DECL_OVERRIDE; diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h index 768951ae17..c243121054 100644 --- a/src/printsupport/dialogs/qprintdialog.h +++ b/src/printsupport/dialogs/qprintdialog.h @@ -72,26 +72,14 @@ public: void setVisible(bool visible) Q_DECL_OVERRIDE; #endif -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); #ifdef Q_QDOC QPrinter *printer(); #endif -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void accepted() { QDialog::accepted(); } -#endif -#else using QDialog::accepted; -#endif Q_SIGNALS: void accepted(QPrinter *printer); diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h index 83d0fe15a6..3ec462b901 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.h +++ b/src/printsupport/dialogs/qprintpreviewdialog.h @@ -56,13 +56,7 @@ public: explicit QPrintPreviewDialog(QPrinter *printer, QWidget *parent = 0, Qt::WindowFlags flags = 0); ~QPrintPreviewDialog(); -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); QPrinter *printer(); diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index d0040c0afe..7799c3202d 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -2103,16 +2103,6 @@ void QColorDialog::open(QObject *receiver, const char *member) } /*! - \fn QColorDialog::open() - - \since 4.5 - Shows the dialog as a \l{QDialog#Modal Dialogs}{window modal dialog}, - returning immediately. - - \sa QDialog::open() -*/ - -/*! \since 4.5 Pops up a modal color dialog with the given window \a title (or "Select Color" if none is diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h index 0f97cdd8c0..22ff907e7a 100644 --- a/src/widgets/dialogs/qcolordialog.h +++ b/src/widgets/dialogs/qcolordialog.h @@ -75,11 +75,7 @@ public: void setOptions(ColorDialogOptions options); ColorDialogOptions options() const; -#ifdef Q_NO_USING_KEYWORD - void open() { QDialog::open(); } -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); void setVisible(bool visible) Q_DECL_OVERRIDE; diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index 12434ad944..c991256eef 100644 --- a/src/widgets/dialogs/qfiledialog.h +++ b/src/widgets/dialogs/qfiledialog.h @@ -172,13 +172,7 @@ public: void setOptions(Options options); Options options() const; -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); void setVisible(bool visible) Q_DECL_OVERRIDE; diff --git a/src/widgets/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h index b07655a3da..a065f8bebf 100644 --- a/src/widgets/dialogs/qfontdialog.h +++ b/src/widgets/dialogs/qfontdialog.h @@ -79,13 +79,7 @@ public: void setOptions(FontDialogOptions options); FontDialogOptions options() const; -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); void setVisible(bool visible) Q_DECL_OVERRIDE; diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index d1aa478e79..a56bd6d78b 100644 --- a/src/widgets/dialogs/qinputdialog.h +++ b/src/widgets/dialogs/qinputdialog.h @@ -143,13 +143,7 @@ public: void setCancelButtonText(const QString &text); QString cancelButtonText() const; -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); QSize minimumSizeHint() const Q_DECL_OVERRIDE; diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index 6cd3085cf9..f75331c967 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -140,13 +140,7 @@ public: void setVisible(bool visible); #endif -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); QList<QAbstractButton *> buttons() const; diff --git a/src/widgets/dialogs/qprogressdialog.h b/src/widgets/dialogs/qprogressdialog.h index 84a5f9e234..2b7a14aed3 100644 --- a/src/widgets/dialogs/qprogressdialog.h +++ b/src/widgets/dialogs/qprogressdialog.h @@ -87,13 +87,7 @@ public: void setAutoClose(bool close); bool autoClose() const; -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); public Q_SLOTS: diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index a543445244..3e9294343e 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -8034,16 +8034,6 @@ void QGraphicsItemPrivate::resetHeight() */ /*! - \fn const QObjectList &QGraphicsObject::children() const - \internal - - This function returns the same value as QObject::children(). It's - provided to differentiate between the obsolete member - QGraphicsItem::children() and QObject::children(). QGraphicsItem now - provides childItems() instead. -*/ - -/*! \property QGraphicsObject::transformOriginPoint \brief the transformation origin diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index 783c15eeee..4435840e22 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -556,11 +556,7 @@ public: explicit QGraphicsObject(QGraphicsItem *parent = 0); ~QGraphicsObject(); -#ifdef Q_NO_USING_KEYWORD - const QObjectList &children() const { return QObject::children(); } -#else using QObject::children; -#endif #ifndef QT_NO_GESTURES void grabGesture(Qt::GestureType type, Qt::GestureFlags flags = Qt::GestureFlags()); diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp index 5bd563e535..fd4f66e3a8 100644 --- a/src/widgets/graphicsview/qgraphicswidget.cpp +++ b/src/widgets/graphicsview/qgraphicswidget.cpp @@ -2390,18 +2390,6 @@ bool QGraphicsWidget::close() return true; } -#ifdef Q_NO_USING_KEYWORD -/*! - \fn const QObjectList &QGraphicsWidget::children() const - \internal - - This function returns the same value as QObject::children(). It's - provided to differentiate between the obsolete member - QGraphicsItem::children() and QObject::children(). QGraphicsItem now - provides childItems() instead. -*/ -#endif - #if 0 void QGraphicsWidget::dumpFocusChain() { diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h index 8c347672d5..7999add64e 100644 --- a/src/widgets/graphicsview/qgraphicswidget.h +++ b/src/widgets/graphicsview/qgraphicswidget.h @@ -161,11 +161,7 @@ public: void dumpFocusChain(); #endif -#ifdef Q_NO_USING_KEYWORD - const QObjectList &children() const { return QObject::children(); } -#else using QObject::children; -#endif Q_SIGNALS: void geometryChanged(); diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 68f43aa750..2460955eb4 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -594,11 +594,6 @@ void QAbstractItemViewPrivate::_q_scrollerStateChanged() */ /*! - \fn void QAbstractItemView::update() - \internal -*/ - -/*! Constructs an abstract item view with the given \a parent. */ QAbstractItemView::QAbstractItemView(QWidget *parent) diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index 18b024a0e8..28c43633ea 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -211,11 +211,7 @@ public: virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; -#ifdef Q_NO_USING_KEYWORD - inline void update() { QAbstractScrollArea::update(); } -#else using QAbstractScrollArea::update; -#endif public Q_SLOTS: virtual void reset(); diff --git a/src/widgets/itemviews/qdirmodel.cpp b/src/widgets/itemviews/qdirmodel.cpp index 6bb8cd29c5..bff50fae0a 100644 --- a/src/widgets/itemviews/qdirmodel.cpp +++ b/src/widgets/itemviews/qdirmodel.cpp @@ -1146,11 +1146,6 @@ QFileInfo QDirModel::fileInfo(const QModelIndex &index) const return node->info; } -/*! - \fn QObject *QDirModel::parent() const - \internal -*/ - /* The root node is never seen outside the model. */ diff --git a/src/widgets/itemviews/qdirmodel.h b/src/widgets/itemviews/qdirmodel.h index 68d6f56152..56b5a247d4 100644 --- a/src/widgets/itemviews/qdirmodel.h +++ b/src/widgets/itemviews/qdirmodel.h @@ -121,11 +121,7 @@ public: QIcon fileIcon(const QModelIndex &index) const; QFileInfo fileInfo(const QModelIndex &index) const; -#ifdef Q_NO_USING_KEYWORD - inline QObject *parent() const { return QObject::parent(); } -#else using QObject::parent; -#endif public Q_SLOTS: void refresh(const QModelIndex &parent = QModelIndex()); diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 560a619549..6762889b73 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -42,9 +42,6 @@ #ifdef QT_INCLUDE_COMPAT # include <QtWidgets/qdesktopwidget.h> #endif -#ifdef Q_NO_USING_KEYWORD -#include <QtGui/qpalette.h> -#endif #include <QtGui/qguiapplication.h> QT_BEGIN_NAMESPACE @@ -104,11 +101,7 @@ public: QT_DEPRECATED static inline void setGraphicsSystem(const QString &) {} #endif -#if defined(Q_NO_USING_KEYWORD) && !defined(Q_QDOC) - static QPalette palette() { return QGuiApplication::palette(); } -#else using QGuiApplication::palette; -#endif static QPalette palette(const QWidget *); static QPalette palette(const char *className); static void setPalette(const QPalette &, const char* className = 0); diff --git a/src/widgets/kernel/qgesture.cpp b/src/widgets/kernel/qgesture.cpp index 72faedf24e..902f1fbcb1 100644 --- a/src/widgets/kernel/qgesture.cpp +++ b/src/widgets/kernel/qgesture.cpp @@ -1087,46 +1087,6 @@ QPointF QGestureEvent::mapToGraphicsScene(const QPointF &gesturePoint) const } #endif //QT_NO_GRAPHICSVIEW -#ifdef Q_NO_USING_KEYWORD -/*! - \fn void QGestureEvent::setAccepted(bool accepted) - - Sets or clears the event's internal flag that determines whether it should - be delivered to other objects. - - Calling this function with a value of true for \a accepted indicates that the - caller has accepted the event and that it should not be propagated further. - Calling this function with a value of false indicates that the caller has - ignored the event and that it should be delivered to other objects. - - For convenience, the accept flag can also be set with accept(), and cleared - with ignore(). - - \sa QEvent::accepted -*/ -/*! - \fn bool QGestureEvent::isAccepted() const - - Returns \c true is the event has been accepted; otherwise returns \c false. - - \sa QEvent::accepted -*/ -/*! - \fn void QGestureEvent::accept() - - Accepts the event, the equivalent of calling setAccepted(true). - - \sa QEvent::accept() -*/ -/*! - \fn void QGestureEvent::ignore() - - Ignores the event, the equivalent of calling setAccepted(false). - - \sa QEvent::ignore() -*/ -#endif // Q_NO_USING_KEYWORD - #ifndef QT_NO_DEBUG_STREAM static void formatGestureHeader(QDebug d, const char *className, const QGesture *gesture) @@ -1200,7 +1160,6 @@ Q_WIDGETS_EXPORT QDebug operator<<(QDebug d, const QGestureEvent *gestureEvent) } #endif // !QT_NO_DEBUG_STREAM - QT_END_NAMESPACE #include <moc_qgesture.cpp> diff --git a/src/widgets/kernel/qgesture.h b/src/widgets/kernel/qgesture.h index 70b1faf735..a66132566b 100644 --- a/src/widgets/kernel/qgesture.h +++ b/src/widgets/kernel/qgesture.h @@ -275,18 +275,10 @@ public: QList<QGesture *> activeGestures() const; QList<QGesture *> canceledGestures() const; -#ifdef Q_NO_USING_KEYWORD - inline void setAccepted(bool accepted) { QEvent::setAccepted(accepted); } - inline bool isAccepted() const { return QEvent::isAccepted(); } - - inline void accept() { QEvent::accept(); } - inline void ignore() { QEvent::ignore(); } -#else using QEvent::setAccepted; using QEvent::isAccepted; using QEvent::accept; using QEvent::ignore; -#endif void setAccepted(QGesture *, bool); void accept(QGesture *); diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp index f124f1ed8e..d2bc8f8347 100644 --- a/src/widgets/kernel/qlayout.cpp +++ b/src/widgets/kernel/qlayout.cpp @@ -268,14 +268,6 @@ bool QLayout::setAlignment(QLayout *l, Qt::Alignment alignment) } /*! - \fn void QLayout::setAlignment(Qt::Alignment alignment) - - Sets the alignment of this item to \a alignment. - - \sa QLayoutItem::setAlignment() -*/ - -/*! \property QLayout::margin \brief the width of the outside border of the layout \obsolete diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index 79cb7a7d14..8bcbb700f4 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -88,11 +88,7 @@ public: bool setAlignment(QWidget *w, Qt::Alignment alignment); bool setAlignment(QLayout *l, Qt::Alignment alignment); -#ifdef Q_NO_USING_KEYWORD - inline void setAlignment(Qt::Alignment alignment) { QLayoutItem::setAlignment(alignment); } -#else using QLayoutItem::setAlignment; -#endif void setSizeConstraint(SizeConstraint); SizeConstraint sizeConstraint() const; diff --git a/src/widgets/kernel/qstackedlayout.cpp b/src/widgets/kernel/qstackedlayout.cpp index d9a7745686..94ac97e1f8 100644 --- a/src/widgets/kernel/qstackedlayout.cpp +++ b/src/widgets/kernel/qstackedlayout.cpp @@ -140,11 +140,6 @@ QLayoutItem* QStackedLayoutPrivate::replaceAt(int idx, QLayoutItem *newitem) */ /*! - \fn QWidget *QStackedLayout::widget() - \internal -*/ - -/*! Constructs a QStackedLayout with no parent. This QStackedLayout must be installed on a widget later on to diff --git a/src/widgets/kernel/qstackedlayout.h b/src/widgets/kernel/qstackedlayout.h index 24d11597c9..afa45afc68 100644 --- a/src/widgets/kernel/qstackedlayout.h +++ b/src/widgets/kernel/qstackedlayout.h @@ -66,11 +66,7 @@ public: QWidget *currentWidget() const; int currentIndex() const; -#ifdef Q_NO_USING_KEYWORD - inline QWidget *widget() { return QLayout::widget(); } -#else using QLayout::widget; -#endif QWidget *widget(int) const; int count() const Q_DECL_OVERRIDE; diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 5a504a880c..f10608a8be 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -434,12 +434,6 @@ bool QLineEdit::hasFrame() const */ /*! - \fn void QLineEdit::addAction(QAction *action) - \overload - \internal -*/ - -/*! \overload Adds the \a action to the list of actions at the \a position. diff --git a/src/widgets/widgets/qlineedit.h b/src/widgets/widgets/qlineedit.h index f1c92b48c7..bfbf9fe670 100644 --- a/src/widgets/widgets/qlineedit.h +++ b/src/widgets/widgets/qlineedit.h @@ -166,13 +166,7 @@ public: void getTextMargins(int *left, int *top, int *right, int *bottom) const; QMargins textMargins() const; -#ifdef Q_NO_USING_KEYWORD - inline void addAction(QAction *action) - { QWidget::addAction(action); } -#else using QWidget::addAction; -#endif - void addAction(QAction *action, ActionPosition position); QAction *addAction(const QIcon &icon, ActionPosition position); diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 7e70be0aed..7e446fd087 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -3249,15 +3249,6 @@ void QMenu::internalDelayedPopup() } /*! - \fn void QMenu::addAction(QAction *action) - \overload - - Appends the action \a action to the menu's list of actions. - - \sa QMenuBar::addAction(), QWidget::addAction() -*/ - -/*! \fn void QMenu::aboutToHide() \since 4.2 diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index 8fd93a5a0f..6bc14c7c78 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -72,11 +72,7 @@ public: explicit QMenu(const QString &title, QWidget *parent = 0); ~QMenu(); -#ifdef Q_NO_USING_KEYWORD - inline void addAction(QAction *action) { QWidget::addAction(action); } -#else using QWidget::addAction; -#endif QAction *addAction(const QString &text); QAction *addAction(const QIcon &icon, const QString &text); QAction *addAction(const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut = 0); diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index 5f40e4b1d9..54d403fa21 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -1922,15 +1922,6 @@ QAction *QMenuBar::defaultAction() const \sa triggered(), QAction::hovered() */ -/*! - \fn void QMenuBar::addAction(QAction *action) - \overload - - Appends the action \a action to the menu bar's list of actions. - - \sa QMenu::addAction(), QWidget::addAction(), QWidget::actions() -*/ - // for private slots diff --git a/src/widgets/widgets/qmenubar.h b/src/widgets/widgets/qmenubar.h index cd2d2cd7aa..936cb22880 100644 --- a/src/widgets/widgets/qmenubar.h +++ b/src/widgets/widgets/qmenubar.h @@ -57,11 +57,7 @@ public: explicit QMenuBar(QWidget *parent = 0); ~QMenuBar(); -#ifdef Q_NO_USING_KEYWORD - void addAction(QAction *action) { QWidget::addAction(action); } -#else using QWidget::addAction; -#endif QAction *addAction(const QString &text); QAction *addAction(const QString &text, const QObject *receiver, const char* member); diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp index 77119a0d7d..c07c3dac8c 100644 --- a/src/widgets/widgets/qtoolbar.cpp +++ b/src/widgets/widgets/qtoolbar.cpp @@ -418,15 +418,6 @@ void QToolBarPrivate::plug(const QRect &r) */ /*! - \fn void QToolBar::addAction(QAction *action) - \overload - - Appends the \a action to the toolbar's list of actions. - - \sa QMenu::addAction(), QWidget::addAction() -*/ - -/*! \fn void QToolBar::actionTriggered(QAction *action) This signal is emitted when an action in this toolbar is triggered. diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h index 68d4215a70..57a69afb74 100644 --- a/src/widgets/widgets/qtoolbar.h +++ b/src/widgets/widgets/qtoolbar.h @@ -86,13 +86,7 @@ public: void clear(); -#ifdef Q_NO_USING_KEYWORD - inline void addAction(QAction *action) - { QWidget::addAction(action); } -#else using QWidget::addAction; -#endif - QAction *addAction(const QString &text); QAction *addAction(const QIcon &icon, const QString &text); QAction *addAction(const QString &text, const QObject *receiver, const char* member); |