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
a0c3a57aed5cde37017733e7cf5e41cc6a1174aa

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

7 files changed, 0 insertions, 77 deletions

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;