diff options
Diffstat (limited to 'src/widgets')
30 files changed, 0 insertions, 222 deletions
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); |