Remove deprecated members from several QtGui classes

Those can be trivially removed as they have direct replacements, or
are completely unused.

The migration path for QCursor::bitmap and QCursor::mask is

QBitmap *pb = c.bitmap(); // up to 5.15, warns in 5.15
QBitmap vb = c.bitmap(Qt::ReturnByValue); // from 5.15, works in 6
QBitmap b = c.bitmap(); // from 6.0 on

Change-Id: I3b3acd1c7f09c4c8414e98b3ce11986f1ecd5eda
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

2 files changed, 0 insertions, 30 deletions

diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp
index d0325a7f9e..bc76d0ea60 100644
--- a/src/gui/itemmodels/qstandarditemmodel.cpp
+++ b/src/gui/itemmodels/qstandarditemmodel.cpp
@@ -1371,24 +1371,6 @@ void QStandardItem::setCheckable(bool checkable)
 */
 
 /*!
-  \fn void QStandardItem::setTristate(bool tristate)
-  \obsolete
-
-  Use QStandardItem::setAutoTristate(bool tristate) instead.
-  For a tristate checkbox that the user can change between all three
-  states, use QStandardItem::setUserTristate(bool tristate) instead.
-*/
-
-/*!
-  \fn void QStandardItem::isTristate() const
-  \obsolete
-
-  Use QStandardItem::isAutoTristate() instead.
-  For a tristate checkbox that the user can change between all three
-  states, use QStandardItem::isUserTristate() instead.
-*/
-
-/*!
   Determines that the item is tristate and controlled by QTreeWidget if \a tristate
   is \c true.
   This enables automatic management of the state of parent items in QTreeWidget
@@ -1442,13 +1424,6 @@ void QStandardItem::setUserTristate(bool tristate)
   \sa setUserTristate(), isCheckable(), checkState()
 */
 
-#if QT_DEPRECATED_SINCE(5, 6)
-void QStandardItem::setTristate(bool tristate)
-{
-    setAutoTristate(tristate);
-}
-#endif
-
 #if QT_CONFIG(draganddrop)
 
 /*!
diff --git a/src/gui/itemmodels/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h
index a66054a04f..405f72d519 100644
--- a/src/gui/itemmodels/qstandarditemmodel.h
+++ b/src/gui/itemmodels/qstandarditemmodel.h
@@ -171,11 +171,6 @@ public:
     }
     void setUserTristate(bool tristate);
 
-#if QT_DEPRECATED_SINCE(5, 6)
-    QT_DEPRECATED bool isTristate() const { return isAutoTristate(); }
-    QT_DEPRECATED void setTristate(bool tristate);
-#endif
-
 #if QT_CONFIG(draganddrop)
     inline bool isDragEnabled() const {
         return (flags() & Qt::ItemIsDragEnabled) != 0;