diff options
Diffstat (limited to 'src/widgets/itemviews')
-rw-r--r-- | src/widgets/itemviews/qabstractitemdelegate.h | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qabstractitemview.h | 6 | ||||
-rw-r--r-- | src/widgets/itemviews/qcolumnview.h | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qdatawidgetmapper.h | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qdirmodel.h | 6 | ||||
-rw-r--r-- | src/widgets/itemviews/qheaderview.h | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qitemdelegate.h | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qlistview.h | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qlistwidget.h | 10 | ||||
-rw-r--r-- | src/widgets/itemviews/qstyleditemdelegate.h | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qtableview.h | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qtablewidget.h | 6 | ||||
-rw-r--r-- | src/widgets/itemviews/qtreeview.h | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qtreewidget.cpp | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qtreewidget.h | 6 |
15 files changed, 32 insertions, 32 deletions
diff --git a/src/widgets/itemviews/qabstractitemdelegate.h b/src/widgets/itemviews/qabstractitemdelegate.h index 9b6bde1c87..575728e806 100644 --- a/src/widgets/itemviews/qabstractitemdelegate.h +++ b/src/widgets/itemviews/qabstractitemdelegate.h @@ -69,7 +69,7 @@ public: RevertModelCache }; - explicit QAbstractItemDelegate(QObject *parent = Q_NULLPTR); + explicit QAbstractItemDelegate(QObject *parent = nullptr); virtual ~QAbstractItemDelegate(); // painting @@ -119,7 +119,7 @@ Q_SIGNALS: void sizeHintChanged(const QModelIndex &); protected: - QAbstractItemDelegate(QObjectPrivate &, QObject *parent = Q_NULLPTR); + QAbstractItemDelegate(QObjectPrivate &, QObject *parent = nullptr); private: Q_DECLARE_PRIVATE(QAbstractItemDelegate) Q_DISABLE_COPY(QAbstractItemDelegate) diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index 676b6cb21e..96745a84ea 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -124,7 +124,7 @@ public: }; Q_ENUM(ScrollMode) - explicit QAbstractItemView(QWidget *parent = Q_NULLPTR); + explicit QAbstractItemView(QWidget *parent = nullptr); ~QAbstractItemView(); virtual void setModel(QAbstractItemModel *model); @@ -270,7 +270,7 @@ Q_SIGNALS: void iconSizeChanged(const QSize &size); protected: - QAbstractItemView(QAbstractItemViewPrivate &, QWidget *parent = Q_NULLPTR); + QAbstractItemView(QAbstractItemViewPrivate &, QWidget *parent = nullptr); void setHorizontalStepsPerItem(int steps); int horizontalStepsPerItem() const; @@ -295,7 +295,7 @@ protected: virtual bool edit(const QModelIndex &index, EditTrigger trigger, QEvent *event); virtual QItemSelectionModel::SelectionFlags selectionCommand(const QModelIndex &index, - const QEvent *event = Q_NULLPTR) const; + const QEvent *event = nullptr) const; #ifndef QT_NO_DRAGANDDROP virtual void startDrag(Qt::DropActions supportedActions); diff --git a/src/widgets/itemviews/qcolumnview.h b/src/widgets/itemviews/qcolumnview.h index 4f34406b21..5c62f9c9af 100644 --- a/src/widgets/itemviews/qcolumnview.h +++ b/src/widgets/itemviews/qcolumnview.h @@ -58,7 +58,7 @@ Q_SIGNALS: void updatePreviewWidget(const QModelIndex &index); public: - explicit QColumnView(QWidget *parent = Q_NULLPTR); + explicit QColumnView(QWidget *parent = nullptr); ~QColumnView(); // QAbstractItemView overloads @@ -82,7 +82,7 @@ public: QList<int> columnWidths() const; protected: - QColumnView(QColumnViewPrivate &dd, QWidget *parent = Q_NULLPTR); + QColumnView(QColumnViewPrivate &dd, QWidget *parent = nullptr); // QAbstractItemView overloads bool isIndexHidden(const QModelIndex &index) const override; diff --git a/src/widgets/itemviews/qdatawidgetmapper.h b/src/widgets/itemviews/qdatawidgetmapper.h index 7d4d61378a..2d75b63a5e 100644 --- a/src/widgets/itemviews/qdatawidgetmapper.h +++ b/src/widgets/itemviews/qdatawidgetmapper.h @@ -61,7 +61,7 @@ class Q_WIDGETS_EXPORT QDataWidgetMapper: public QObject Q_PROPERTY(SubmitPolicy submitPolicy READ submitPolicy WRITE setSubmitPolicy) public: - explicit QDataWidgetMapper(QObject *parent = Q_NULLPTR); + explicit QDataWidgetMapper(QObject *parent = nullptr); ~QDataWidgetMapper(); void setModel(QAbstractItemModel *model); diff --git a/src/widgets/itemviews/qdirmodel.h b/src/widgets/itemviews/qdirmodel.h index 30486c2e67..ab91bbd763 100644 --- a/src/widgets/itemviews/qdirmodel.h +++ b/src/widgets/itemviews/qdirmodel.h @@ -66,8 +66,8 @@ public: }; QDirModel(const QStringList &nameFilters, QDir::Filters filters, - QDir::SortFlags sort, QObject *parent = Q_NULLPTR); - explicit QDirModel(QObject *parent = Q_NULLPTR); + QDir::SortFlags sort, QObject *parent = nullptr); + explicit QDirModel(QObject *parent = nullptr); ~QDirModel(); QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; @@ -133,7 +133,7 @@ public Q_SLOTS: void refresh(const QModelIndex &parent = QModelIndex()); protected: - QDirModel(QDirModelPrivate &, QObject *parent = Q_NULLPTR); + QDirModel(QDirModelPrivate &, QObject *parent = nullptr); friend class QFileDialogPrivate; private: diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h index 91217a69a3..b6554c0730 100644 --- a/src/widgets/itemviews/qheaderview.h +++ b/src/widgets/itemviews/qheaderview.h @@ -74,7 +74,7 @@ public: }; Q_ENUM(ResizeMode) - explicit QHeaderView(Qt::Orientation orientation, QWidget *parent = Q_NULLPTR); + explicit QHeaderView(Qt::Orientation orientation, QWidget *parent = nullptr); virtual ~QHeaderView(); void setModel(QAbstractItemModel *model) override; @@ -208,7 +208,7 @@ protected Q_SLOTS: void sectionsAboutToBeRemoved(const QModelIndex &parent, int logicalFirst, int logicalLast); protected: - QHeaderView(QHeaderViewPrivate &dd, Qt::Orientation orientation, QWidget *parent = Q_NULLPTR); + QHeaderView(QHeaderViewPrivate &dd, Qt::Orientation orientation, QWidget *parent = nullptr); void initialize(); void initializeSections(); diff --git a/src/widgets/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h index d15e15b5e4..539dec4374 100644 --- a/src/widgets/itemviews/qitemdelegate.h +++ b/src/widgets/itemviews/qitemdelegate.h @@ -59,7 +59,7 @@ class Q_WIDGETS_EXPORT QItemDelegate : public QAbstractItemDelegate Q_PROPERTY(bool clipping READ hasClipping WRITE setClipping) public: - explicit QItemDelegate(QObject *parent = Q_NULLPTR); + explicit QItemDelegate(QObject *parent = nullptr); ~QItemDelegate(); bool hasClipping() const; diff --git a/src/widgets/itemviews/qlistview.h b/src/widgets/itemviews/qlistview.h index 1a59b7b54a..2da510facf 100644 --- a/src/widgets/itemviews/qlistview.h +++ b/src/widgets/itemviews/qlistview.h @@ -78,7 +78,7 @@ public: enum ViewMode { ListMode, IconMode }; Q_ENUM(ViewMode) - explicit QListView(QWidget *parent = Q_NULLPTR); + explicit QListView(QWidget *parent = nullptr); ~QListView(); void setMovement(Movement movement); @@ -137,7 +137,7 @@ Q_SIGNALS: void indexesMoved(const QModelIndexList &indexes); protected: - QListView(QListViewPrivate &, QWidget *parent = Q_NULLPTR); + QListView(QListViewPrivate &, QWidget *parent = nullptr); bool event(QEvent *e) override; diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index 4fa542c8b8..3caa5ce6f2 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -61,10 +61,10 @@ class Q_WIDGETS_EXPORT QListWidgetItem friend class QListWidget; public: enum ItemType { Type = 0, UserType = 1000 }; - explicit QListWidgetItem(QListWidget *view = Q_NULLPTR, int type = Type); - explicit QListWidgetItem(const QString &text, QListWidget *view = Q_NULLPTR, int type = Type); + explicit QListWidgetItem(QListWidget *view = nullptr, int type = Type); + explicit QListWidgetItem(const QString &text, QListWidget *view = nullptr, int type = Type); explicit QListWidgetItem(const QIcon &icon, const QString &text, - QListWidget *view = Q_NULLPTR, int type = Type); + QListWidget *view = nullptr, int type = Type); QListWidgetItem(const QListWidgetItem &other); virtual ~QListWidgetItem(); @@ -204,7 +204,7 @@ class Q_WIDGETS_EXPORT QListWidget : public QListView friend class QListWidgetItem; friend class QListModel; public: - explicit QListWidget(QWidget *parent = Q_NULLPTR); + explicit QListWidget(QWidget *parent = nullptr); ~QListWidget(); void setSelectionModel(QItemSelectionModel *selectionModel) override; @@ -322,7 +322,7 @@ private: }; inline void QListWidget::removeItemWidget(QListWidgetItem *aItem) -{ setItemWidget(aItem, Q_NULLPTR); } +{ setItemWidget(aItem, nullptr); } inline void QListWidget::addItem(QListWidgetItem *aitem) { insertItem(count(), aitem); } diff --git a/src/widgets/itemviews/qstyleditemdelegate.h b/src/widgets/itemviews/qstyleditemdelegate.h index 7fd07b8a59..2df2450f07 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.h +++ b/src/widgets/itemviews/qstyleditemdelegate.h @@ -58,7 +58,7 @@ class Q_WIDGETS_EXPORT QStyledItemDelegate : public QAbstractItemDelegate Q_OBJECT public: - explicit QStyledItemDelegate(QObject *parent = Q_NULLPTR); + explicit QStyledItemDelegate(QObject *parent = nullptr); ~QStyledItemDelegate(); // painting diff --git a/src/widgets/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h index ac43ebd11a..60c2f34103 100644 --- a/src/widgets/itemviews/qtableview.h +++ b/src/widgets/itemviews/qtableview.h @@ -62,7 +62,7 @@ class Q_WIDGETS_EXPORT QTableView : public QAbstractItemView #endif public: - explicit QTableView(QWidget *parent = Q_NULLPTR); + explicit QTableView(QWidget *parent = nullptr); ~QTableView(); void setModel(QAbstractItemModel *model) override; diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index 3e713a68e1..7322e3aed7 100644 --- a/src/widgets/itemviews/qtablewidget.h +++ b/src/widgets/itemviews/qtablewidget.h @@ -219,8 +219,8 @@ class Q_WIDGETS_EXPORT QTableWidget : public QTableView friend class QTableModel; public: - explicit QTableWidget(QWidget *parent = Q_NULLPTR); - QTableWidget(int rows, int columns, QWidget *parent = Q_NULLPTR); + explicit QTableWidget(QWidget *parent = nullptr); + QTableWidget(int rows, int columns, QWidget *parent = nullptr); ~QTableWidget(); void setRowCount(int rows); @@ -363,7 +363,7 @@ private: }; inline void QTableWidget::removeCellWidget(int arow, int acolumn) -{ setCellWidget(arow, acolumn, Q_NULLPTR); } +{ setCellWidget(arow, acolumn, nullptr); } inline QTableWidgetItem *QTableWidget::itemAt(int ax, int ay) const { return itemAt(QPoint(ax, ay)); } diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h index c7b659839a..e7ee55aa2a 100644 --- a/src/widgets/itemviews/qtreeview.h +++ b/src/widgets/itemviews/qtreeview.h @@ -68,7 +68,7 @@ class Q_WIDGETS_EXPORT QTreeView : public QAbstractItemView Q_PROPERTY(bool expandsOnDoubleClick READ expandsOnDoubleClick WRITE setExpandsOnDoubleClick) public: - explicit QTreeView(QWidget *parent = Q_NULLPTR); + explicit QTreeView(QWidget *parent = nullptr); ~QTreeView(); void setModel(QAbstractItemModel *model) override; @@ -172,7 +172,7 @@ protected Q_SLOTS: void verticalScrollbarValueChanged(int value) override; protected: - QTreeView(QTreeViewPrivate &dd, QWidget *parent = Q_NULLPTR); + QTreeView(QTreeViewPrivate &dd, QWidget *parent = nullptr); void scrollContentsBy(int dx, int dy) override; void rowsInserted(const QModelIndex &parent, int start, int end) override; void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override; diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp index ca5c662a9e..601ed44b55 100644 --- a/src/widgets/itemviews/qtreewidget.cpp +++ b/src/widgets/itemviews/qtreewidget.cpp @@ -145,7 +145,7 @@ QTreeModel::QTreeModel(QTreeModelPrivate &dd, QTreeWidget *parent) QTreeModel::~QTreeModel() { clear(); - headerItem->view = Q_NULLPTR; + headerItem->view = nullptr; delete headerItem; rootItem->view = 0; delete rootItem; diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index 29ecf19e48..a31af0428a 100644 --- a/src/widgets/itemviews/qtreewidget.h +++ b/src/widgets/itemviews/qtreewidget.h @@ -178,7 +178,7 @@ public: inline QTreeWidgetItem *parent() const { return par; } inline QTreeWidgetItem *child(int index) const { if (index < 0 || index >= children.size()) - return Q_NULLPTR; + return nullptr; executePendingSort(); return children.at(index); } @@ -261,7 +261,7 @@ class Q_WIDGETS_EXPORT QTreeWidget : public QTreeView friend class QTreeModel; friend class QTreeWidgetItem; public: - explicit QTreeWidget(QWidget *parent = Q_NULLPTR); + explicit QTreeWidget(QWidget *parent = nullptr); ~QTreeWidget(); int columnCount() const; @@ -395,7 +395,7 @@ private: }; inline void QTreeWidget::removeItemWidget(QTreeWidgetItem *item, int column) -{ setItemWidget(item, column, Q_NULLPTR); } +{ setItemWidget(item, column, nullptr); } inline QTreeWidgetItem *QTreeWidget::itemAt(int ax, int ay) const { return itemAt(QPoint(ax, ay)); } |