Provide overload for Qt::AlignmentFlags in item widget items
Amends 53ee4c8b1f7ae72e7005166e1c0dbc4659f2ab32, which deprecated QListWidgetItem::setTextAlignment(int) etc and provided a typesafe Qt::Alignment overload instead. However, Qt::AlignLeft by itself is of type Qt::AlignmentFlag, it only becomes a Qt::Alignment when or'ed with another alignment flag. So the deprecated int-overload was taken by the compiler, resulting in a deprecation warning. Add a Qt::AlignmentFlag overload in addition, and document it as \internal since it is just a C++ technicality that we need both. Pick-to: 6.4 Change-Id: Ide97eed7f6d1f89a5f955b2ed45167e771bd8c81 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
parent
99c8ffb9f2
commit
fa814fcfea
@ -1086,6 +1086,11 @@ void QListWidgetItem::setFlags(Qt::ItemFlags aflags)
|
||||
Sets the list item's text alignment to \a alignment.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn void QListWidgetItem::setTextAlignment(Qt::AlignmentFlag alignment)
|
||||
\internal
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn void QListWidgetItem::setBackground(const QBrush &brush)
|
||||
\since 4.2
|
||||
|
@ -84,6 +84,8 @@ public:
|
||||
QT_DEPRECATED_VERSION_X_6_4("Use the overload taking Qt::Alignment")
|
||||
inline void setTextAlignment(int alignment)
|
||||
{ setData(Qt::TextAlignmentRole, alignment); }
|
||||
inline void setTextAlignment(Qt::AlignmentFlag alignment)
|
||||
{ setData(Qt::TextAlignmentRole, QVariant::fromValue(Qt::Alignment(alignment))); }
|
||||
#endif
|
||||
inline void setTextAlignment(Qt::Alignment alignment)
|
||||
{ setData(Qt::TextAlignmentRole, QVariant::fromValue(alignment)); }
|
||||
|
@ -1293,6 +1293,11 @@ void QTableWidgetItem::setFlags(Qt::ItemFlags aflags)
|
||||
specified.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn void QTableWidgetItem::setTextAlignment(Qt::AlignmentFlag alignment)
|
||||
\internal
|
||||
*/
|
||||
|
||||
/*!
|
||||
Constructs a table item of the specified \a type that does not belong
|
||||
to any table.
|
||||
|
@ -108,6 +108,8 @@ public:
|
||||
QT_DEPRECATED_VERSION_X_6_4("Use the overload taking Qt::Alignment")
|
||||
inline void setTextAlignment(int alignment)
|
||||
{ setData(Qt::TextAlignmentRole, alignment); }
|
||||
inline void setTextAlignment(Qt::AlignmentFlag alignment)
|
||||
{ setData(Qt::TextAlignmentRole, QVariant::fromValue(Qt::Alignment(alignment))); }
|
||||
#endif
|
||||
inline void setTextAlignment(Qt::Alignment alignment)
|
||||
{ setData(Qt::TextAlignmentRole, QVariant::fromValue(alignment)); }
|
||||
|
@ -1366,6 +1366,11 @@ bool QTreeWidgetItem::isFirstColumnSpanned() const
|
||||
the \a alignment specified.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn void QTreeWidgetItem::setTextAlignment(int column, Qt::AlignmentFlag alignment)
|
||||
\internal
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn int QTreeWidgetItem::indexOfChild(QTreeWidgetItem *child) const
|
||||
|
||||
|
@ -104,6 +104,8 @@ public:
|
||||
QT_DEPRECATED_VERSION_X_6_4("Use the overload taking Qt::Alignment")
|
||||
inline void setTextAlignment(int column, int alignment)
|
||||
{ setData(column, Qt::TextAlignmentRole, alignment); }
|
||||
inline void setTextAlignment(int column, Qt::AlignmentFlag alignment)
|
||||
{ setData(column, Qt::TextAlignmentRole, QVariant::fromValue(Qt::Alignment(alignment))); }
|
||||
#endif
|
||||
inline void setTextAlignment(int column, Qt::Alignment alignment)
|
||||
{ setData(column, Qt::TextAlignmentRole, QVariant::fromValue(alignment)); }
|
||||
|
Loading…
x
Reference in New Issue
Block a user