summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2021-05-25 15:04:48 +0200
committerPaul Wicking <paul.wicking@qt.io>2021-05-26 13:06:56 +0200
commita1dfe27955ab2da27551d19500c2d2a01d46e470 (patch)
treee1ebc6b2f9a255f5b0c3f2df0833f2f6f431fe74 /src/widgets
parentae021882330abc5f6fbaadca290e6e5670c89028 (diff)
Doc: Use \deprecated instead of \obsolete
Task-number: QTBUG-93990 Change-Id: I4e512354a49dde6678ca89cabc56bc76ba666bb3 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/dialogs/qmessagebox.cpp26
-rw-r--r--src/widgets/graphicsview/qgraphicsitem.cpp4
-rw-r--r--src/widgets/graphicsview/qgraphicsscene.cpp2
-rw-r--r--src/widgets/graphicsview/qgraphicsview.cpp2
-rw-r--r--src/widgets/itemviews/qabstractitemview.cpp2
-rw-r--r--src/widgets/kernel/qapplication.cpp2
-rw-r--r--src/widgets/kernel/qwidget.cpp8
-rw-r--r--src/widgets/styles/qstyle.cpp2
-rw-r--r--src/widgets/widgets/qlabel.cpp4
9 files changed, 26 insertions, 26 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index f3c3c487d7..9969a05da6 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -2051,7 +2051,7 @@ void QMessageBoxPrivate::retranslateStrings()
#if QT_DEPRECATED_SINCE(6,2)
/*!
- \obsolete
+ \deprecated
Constructs a message box with a \a title, a \a text, an \a icon,
and up to three buttons.
@@ -2115,7 +2115,7 @@ QMessageBox::QMessageBox(const QString &title, const QString &text, Icon icon,
}
/*!
- \obsolete
+ \deprecated
Opens an information message box with the given \a title and the
\a text. The dialog may have up to three buttons. Each of the
@@ -2161,7 +2161,7 @@ int QMessageBox::information(QWidget *parent, const QString &title, const QStrin
}
/*!
- \obsolete
+ \deprecated
\overload
Displays an information message box with the given \a title and
@@ -2201,7 +2201,7 @@ int QMessageBox::information(QWidget *parent, const QString &title, const QStrin
}
/*!
- \obsolete
+ \deprecated
Opens a question message box with the given \a title and \a text.
The dialog may have up to three buttons. Each of the buttons, \a
@@ -2247,7 +2247,7 @@ int QMessageBox::question(QWidget *parent, const QString &title, const QString&
}
/*!
- \obsolete
+ \deprecated
\overload
Displays a question message box with the given \a title and \a
@@ -2287,7 +2287,7 @@ int QMessageBox::question(QWidget *parent, const QString &title, const QString&
/*!
- \obsolete
+ \deprecated
Opens a warning message box with the given \a title and \a text.
The dialog may have up to three buttons. Each of the button
@@ -2333,7 +2333,7 @@ int QMessageBox::warning(QWidget *parent, const QString &title, const QString& t
}
/*!
- \obsolete
+ \deprecated
\overload
Displays a warning message box with the given \a title and \a
@@ -2372,7 +2372,7 @@ int QMessageBox::warning(QWidget *parent, const QString &title, const QString& t
}
/*!
- \obsolete
+ \deprecated
Opens a critical message box with the given \a title and \a text.
The dialog may have up to three buttons. Each of the button
@@ -2419,7 +2419,7 @@ int QMessageBox::critical(QWidget *parent, const QString &title, const QString&
}
/*!
- \obsolete
+ \deprecated
\overload
Displays a critical error message box with the given \a title and
@@ -2459,7 +2459,7 @@ int QMessageBox::critical(QWidget *parent, const QString &title, const QString&
/*!
- \obsolete
+ \deprecated
Returns the text of the message box button \a button, or
an empty string if the message box does not contain the button.
@@ -2480,7 +2480,7 @@ QString QMessageBox::buttonText(int button) const
}
/*!
- \obsolete
+ \deprecated
Sets the text of the message box button \a button to \a text.
Setting the text of a button that is not in the message box is
@@ -2729,7 +2729,7 @@ void QMessageBoxPrivate::helperDone(QDialog::DialogCode code, QPlatformDialogHel
#if QT_DEPRECATED_SINCE(6,2)
/*!
- \obsolete
+ \deprecated
Returns the pixmap used for a standard icon. This allows the
pixmaps to be used in more complex message boxes. \a icon
@@ -2749,7 +2749,7 @@ QPixmap QMessageBox::standardIcon(Icon icon)
/*!
\typedef QMessageBox::Button
- \obsolete
+ \deprecated
Use QMessageBox::StandardButton instead.
*/
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index 7dcfd47dc0..1b1d48d57d 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -3265,7 +3265,7 @@ void QGraphicsItem::setFiltersChildEvents(bool enabled)
}
/*!
- \obsolete
+ \deprecated
Returns \c true if this item handles child events (i.e., all events
intended for any of its children are instead sent to this item);
@@ -3287,7 +3287,7 @@ bool QGraphicsItem::handlesChildEvents() const
}
/*!
- \obsolete
+ \deprecated
If \a enabled is true, this item is set to handle all events for
all its children (i.e., all events intented for any of its
diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
index dd54a4bffa..4682ce2f27 100644
--- a/src/widgets/graphicsview/qgraphicsscene.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -5260,7 +5260,7 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
}
/*!
- \obsolete
+ \deprecated
Paints the given \a items using the provided \a painter, after the
background has been drawn, and before the foreground has been
diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp
index 847d5fd45c..dc62e59f12 100644
--- a/src/widgets/graphicsview/qgraphicsview.cpp
+++ b/src/widgets/graphicsview/qgraphicsview.cpp
@@ -3741,7 +3741,7 @@ void QGraphicsView::drawForeground(QPainter *painter, const QRectF &rect)
}
/*!
- \obsolete
+ \deprecated
Draws the items \a items in the scene using \a painter, after the
background and before the foreground are drawn. \a numItems is the number
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index bd89f43ca1..f388d628a7 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -1008,7 +1008,7 @@ QAbstractItemDelegate *QAbstractItemView::itemDelegateForColumn(int column) cons
/*!
\fn QAbstractItemDelegate *QAbstractItemView::itemDelegate(const QModelIndex &index) const
- \obsolete Use itemDelegateForIndex() instead.
+ \deprecated Use itemDelegateForIndex() instead.
Returns the item delegate used by this view and model for
the given \a index.
*/
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 0be8ac269c..430ccfe132 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -1563,7 +1563,7 @@ QWidget *QApplication::activeWindow()
#if QT_DEPRECATED_SINCE(6,0)
/*!
- \obsolete Use the QFontMetricsF constructor instead
+ \deprecated Use the QFontMetricsF constructor instead.
Returns display (screen) font metrics for the application font.
\sa font(), setFont(), QWidget::fontMetrics(), QPainter::fontMetrics()
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 21ec2b2a27..acc650e847 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -4182,7 +4182,7 @@ QWidget *QWidget::nativeParentWidget() const
}
/*! \fn QWidget *QWidget::topLevelWidget() const
- \obsolete
+ \deprecated
Use window() instead.
*/
@@ -5921,7 +5921,7 @@ void QWidgetPrivate::setWindowIconText_sys(const QString &iconText)
new \a iconText as an argument.
\since 5.2
- \obsolete
+ \deprecated
This signal is deprecated.
*/
@@ -6053,7 +6053,7 @@ void QWidgetPrivate::setWindowIcon_sys()
It is only implemented on the X11 platform, and only certain
window managers use this window property.
- \obsolete
+ \deprecated
This property is deprecated.
\sa windowIcon, windowTitle
@@ -11648,7 +11648,7 @@ void QWidgetPrivate::stackUnder_sys(QWidget*)
/*!
\fn bool QWidget::isTopLevel() const
- \obsolete
+ \deprecated
Use isWindow() instead.
*/
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index 9c4e66b0ba..857c894c00 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -2145,7 +2145,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
/*!
\fn QPixmap QStyle::standardPixmap(StandardPixmap standardPixmap, const QStyleOption *option, const QWidget *widget) const
- \obsolete
+ \deprecated
Returns a pixmap for the given \a standardPixmap.
A standard pixmap is a pixmap that can follow some existing GUI
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp
index 377f2967cf..d701cd7d57 100644
--- a/src/widgets/widgets/qlabel.cpp
+++ b/src/widgets/widgets/qlabel.cpp
@@ -190,7 +190,7 @@ QLabelPrivate::~QLabelPrivate()
#ifndef QT_NO_PICTURE
/*!
\fn QPicture QLabel::picture(Qt::ReturnByValueConstant) const
- \obsolete Use the overload without argument instead.
+ \deprecated Use the overload without argument instead.
\since 5.15
Returns the label's picture.
@@ -396,7 +396,7 @@ QPixmap QLabel::pixmap() const
/*!
\fn QPixmap QLabel::pixmap(Qt::ReturnByValueConstant) const
- \obsolete Use the overload without argument instead.
+ \deprecated Use the overload without argument instead.
\since 5.15
Returns the label's pixmap.