diff options
Diffstat (limited to 'src/widgets/itemviews/qtreewidget.h')
-rw-r--r-- | src/widgets/itemviews/qtreewidget.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index 09adfe138a..992f6cdb1c 100644 --- a/src/widgets/itemviews/qtreewidget.h +++ b/src/widgets/itemviews/qtreewidget.h @@ -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)); } @@ -146,8 +148,8 @@ public: executePendingSort(); return children.at(index); } - inline int childCount() const { return children.count(); } - inline int columnCount() const { return values.count(); } + inline int childCount() const { return int(children.size()); } + inline int columnCount() const { return int(values.size()); } inline int indexOfChild(QTreeWidgetItem *child) const; void addChild(QTreeWidgetItem *child); @@ -211,7 +213,7 @@ inline void QTreeWidgetItem::setFont(int column, const QFont &afont) { setData(column, Qt::FontRole, afont); } inline int QTreeWidgetItem::indexOfChild(QTreeWidgetItem *achild) const -{ executePendingSort(); return children.indexOf(achild); } +{ executePendingSort(); return int(children.indexOf(achild)); } #ifndef QT_NO_DATASTREAM Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &out, const QTreeWidgetItem &item); @@ -321,19 +323,6 @@ private: Q_DECLARE_PRIVATE(QTreeWidget) Q_DISABLE_COPY(QTreeWidget) - - Q_PRIVATE_SLOT(d_func(), void _q_emitItemPressed(const QModelIndex &index)) - Q_PRIVATE_SLOT(d_func(), void _q_emitItemClicked(const QModelIndex &index)) - Q_PRIVATE_SLOT(d_func(), void _q_emitItemDoubleClicked(const QModelIndex &index)) - Q_PRIVATE_SLOT(d_func(), void _q_emitItemActivated(const QModelIndex &index)) - Q_PRIVATE_SLOT(d_func(), void _q_emitItemEntered(const QModelIndex &index)) - Q_PRIVATE_SLOT(d_func(), void _q_emitItemChanged(const QModelIndex &index)) - Q_PRIVATE_SLOT(d_func(), void _q_emitItemExpanded(const QModelIndex &index)) - Q_PRIVATE_SLOT(d_func(), void _q_emitItemCollapsed(const QModelIndex &index)) - Q_PRIVATE_SLOT(d_func(), void _q_emitCurrentItemChanged(const QModelIndex &previous, const QModelIndex ¤t)) - Q_PRIVATE_SLOT(d_func(), void _q_sort()) - Q_PRIVATE_SLOT(d_func(), void _q_dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)) - Q_PRIVATE_SLOT(d_func(), void _q_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected)) }; inline void QTreeWidget::removeItemWidget(QTreeWidgetItem *item, int column) |