whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Q_NO_USING_KEYWORD 

There's a lot of code now requiring it. Any compiler that doesn't
support the keyword is too old for Qt now. The last time anyone asked
about this macro was for QTBUG-27393 and we don't know which compiler
that was.

As a necessity, this patch contains a reversal of
a0c3a57aed

[ChangeLog][Compiler Specific Changes] Qt 5.5 now unconditionally uses
the "using" keyword. Compilers that do not support this keyword are
deprecated and will not be able to build Qt. Previous versions of Qt may
or may not compile, as no testing was done to ensure it worked.

Change-Id: Ief042f34aba555a095d1f342a0ee7ee9feadf42d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
bb10
Thiago Macieira 2014-12-16 17:27:31 -08:00
parent 5d366f7e42
commit 2e4b1a8334
50 changed files with 4 additions and 437 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/global/qcompilerdetection.h
View File

@ -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/"

5
src/corelib/itemmodels/qabstractitemmodel.cpp
View File

@ -1263,11 +1263,6 @@ void QAbstractItemModel::resetInternalData()
\sa insertRows(), insertColumn(), removeRow()
*/
/*!
\fn QObject *QAbstractItemModel::parent() const
\internal
*/
/*!
\fn QModelIndex QAbstractItemModel::parent(const QModelIndex &index) const = 0

16
src/corelib/itemmodels/qabstractitemmodel.h
View File

@ -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);

5
src/corelib/itemmodels/qsortfilterproxymodel.cpp
View File

@ -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"

4
src/corelib/itemmodels/qsortfilterproxymodel.h
View File

@ -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;

42
src/corelib/tools/qhash.cpp
View File

@ -2224,12 +2224,6 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW
\sa QHash::contains()
*/
/*!
\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
@ -2240,12 +2234,6 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW
\sa QHash::remove()
*/
/*!
\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
@ -2255,18 +2243,6 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW
\sa QHash::count()
*/
/*!
\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
@ -2280,24 +2256,12 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW
\sa QHash::find()
*/
/*!
\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

2
src/corelib/tools/qhash.h
View File

@ -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;

43
src/corelib/tools/qmap.cpp
View File

@ -1797,12 +1797,6 @@ void QMapDataBase::freeData(QMapDataBase *d)
\sa QMap::contains()
*/
/*!
\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
@ -1813,12 +1807,6 @@ void QMapDataBase::freeData(QMapDataBase *d)
\sa QMap::remove()
*/
/*!
\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
@ -1828,18 +1816,6 @@ void QMapDataBase::freeData(QMapDataBase *d)
\sa QMap::count()
*/
/*!
\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
@ -1856,12 +1832,6 @@ void QMapDataBase::freeData(QMapDataBase *d)
\sa QMap::find()
*/
/*!
\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
@ -1879,13 +1849,6 @@ void QMapDataBase::freeData(QMapDataBase *d)
\sa QMap::find()
*/
/*!
\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

2
src/corelib/tools/qmap.h
View File

@ -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;

23
src/corelib/tools/qstringlist.cpp
View File

@ -703,29 +703,6 @@ int QtPrivate::QStringList_lastIndexOf(const QStringList *that, const QRegularEx
#endif // QT_NO_REGULAREXPRESSION
#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()

7
src/corelib/tools/qstringlist.h
View File

@ -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);

9
src/corelib/xml/qxmlstream.cpp
View File

@ -2392,15 +2392,6 @@ QXmlStreamAttribute& QXmlStreamAttribute::operator=(const QXmlStreamAttribute &o
\ingroup xml-tools
*/
/*!
\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

5
src/corelib/xml/qxmlstream.h
View File

@ -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 {

5
src/dbus/qdbuspendingreply.h
View File

@ -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

5
src/gui/image/qpaintengine_pic_p.h
View File

@ -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;

6
src/gui/itemmodels/qstandarditemmodel.cpp
View File

@ -2908,12 +2908,6 @@ void QStandardItemModel::sort(int column, Qt::SortOrder order)
d->root->sortChildren(column, order);
}
/*!
\fn QObject *QStandardItemModel::parent() const
\internal
*/
/*!
\reimp
*/

4
src/gui/itemmodels/qstandarditemmodel.h
View File

@ -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;

6
src/printsupport/dialogs/qpagesetupdialog.h
View File

@ -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;

12
src/printsupport/dialogs/qprintdialog.h
View File

@ -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);

6
src/printsupport/dialogs/qprintpreviewdialog.h
View File

@ -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();

10
src/widgets/dialogs/qcolordialog.cpp
View File

@ -2102,16 +2102,6 @@ void QColorDialog::open(QObject *receiver, const char *member)
QDialog::open();
}
/*!
\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

4
src/widgets/dialogs/qcolordialog.h
View File

@ -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;

6
src/widgets/dialogs/qfiledialog.h
View File

@ -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;

6
src/widgets/dialogs/qfontdialog.h
View File

@ -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;

6
src/widgets/dialogs/qinputdialog.h
View File

@ -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;

6
src/widgets/dialogs/qmessagebox.h
View File

@ -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;

6
src/widgets/dialogs/qprogressdialog.h
View File

@ -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:

10
src/widgets/graphicsview/qgraphicsitem.cpp
View File

@ -8033,16 +8033,6 @@ void QGraphicsItemPrivate::resetHeight()
\sa visible
*/
/*!
\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

4
src/widgets/graphicsview/qgraphicsitem.h
View File

@ -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());

12
src/widgets/graphicsview/qgraphicswidget.cpp
View File

@ -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()
{

4
src/widgets/graphicsview/qgraphicswidget.h
View File

@ -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();

5
src/widgets/itemviews/qabstractitemview.cpp
View File

@ -593,11 +593,6 @@ void QAbstractItemViewPrivate::_q_scrollerStateChanged()
\sa visualRect(), selectedIndexes()
*/
/*!
\fn void QAbstractItemView::update()
\internal
*/
/*!
Constructs an abstract item view with the given \a parent.
*/

4
src/widgets/itemviews/qabstractitemview.h
View File

@ -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();

5
src/widgets/itemviews/qdirmodel.cpp
View File

@ -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.
*/

4
src/widgets/itemviews/qdirmodel.h
View File

@ -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());

7
src/widgets/kernel/qapplication.h
View File

@ -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);

41
src/widgets/kernel/qgesture.cpp
View File

@ -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>

8
src/widgets/kernel/qgesture.h
View File

@ -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 *);

8
src/widgets/kernel/qlayout.cpp
View File

@ -267,14 +267,6 @@ bool QLayout::setAlignment(QLayout *l, Qt::Alignment alignment)
return false;
}
/*!
\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

4
src/widgets/kernel/qlayout.h
View File

@ -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;

5
src/widgets/kernel/qstackedlayout.cpp
View File

@ -139,11 +139,6 @@ QLayoutItem* QStackedLayoutPrivate::replaceAt(int idx, QLayoutItem *newitem)
\sa removeWidget()
*/
/*!
\fn QWidget *QStackedLayout::widget()
\internal
*/
/*!
Constructs a QStackedLayout with no parent.

4
src/widgets/kernel/qstackedlayout.h
View File

@ -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;

6
src/widgets/widgets/qlineedit.cpp
View File

@ -433,12 +433,6 @@ bool QLineEdit::hasFrame() const
\since 5.2
*/
/*!
\fn void QLineEdit::addAction(QAction *action)
\overload
\internal
*/
/*!
\overload

6
src/widgets/widgets/qlineedit.h
View File

@ -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);

9
src/widgets/widgets/qmenu.cpp
View File

@ -3248,15 +3248,6 @@ void QMenu::internalDelayedPopup()
d->sloppyState.setSubMenuPopup(actionRect, d->currentAction, d->activeMenu);
}
/*!
\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

4
src/widgets/widgets/qmenu.h
View File

@ -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);

9
src/widgets/widgets/qmenubar.cpp
View File

@ -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

4
src/widgets/widgets/qmenubar.h
View File

@ -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);

9
src/widgets/widgets/qtoolbar.cpp
View File

@ -417,15 +417,6 @@ void QToolBarPrivate::plug(const QRect &r)
otherwise returns \c false.
*/
/*!
\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)

6
src/widgets/widgets/qtoolbar.h
View File

@ -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);