From 283f19924d427dc4a3841199c06aefde8b41ad2d Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 30 Jun 2015 22:11:15 +0200 Subject: QtWidgets: Use Q_NULLPTR instead of 0 in all public headers This is in preparation of adding -Wzero-as-null-pointer-constant (or similar) to the headers check. Task-number: QTBUG-45291 Change-Id: Ie67d235151ca8d4ef5e721c9cf4a6fd32bd167a0 Reviewed-by: Friedemann Kleint --- src/widgets/itemviews/qabstractitemdelegate.h | 4 ++-- src/widgets/itemviews/qabstractitemview.h | 6 +++--- src/widgets/itemviews/qcolumnview.h | 4 ++-- src/widgets/itemviews/qdatawidgetmapper.h | 2 +- src/widgets/itemviews/qdirmodel.h | 6 +++--- src/widgets/itemviews/qheaderview.h | 4 ++-- src/widgets/itemviews/qitemdelegate.h | 2 +- src/widgets/itemviews/qlistview.h | 4 ++-- src/widgets/itemviews/qlistwidget.h | 10 +++++----- src/widgets/itemviews/qstyleditemdelegate.h | 2 +- src/widgets/itemviews/qtableview.h | 2 +- src/widgets/itemviews/qtablewidget.h | 6 +++--- src/widgets/itemviews/qtreeview.h | 4 ++-- src/widgets/itemviews/qtreewidget.h | 6 +++--- 14 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src/widgets/itemviews') diff --git a/src/widgets/itemviews/qabstractitemdelegate.h b/src/widgets/itemviews/qabstractitemdelegate.h index c250179087..b29717d1e1 100644 --- a/src/widgets/itemviews/qabstractitemdelegate.h +++ b/src/widgets/itemviews/qabstractitemdelegate.h @@ -63,7 +63,7 @@ public: RevertModelCache }; - explicit QAbstractItemDelegate(QObject *parent = 0); + explicit QAbstractItemDelegate(QObject *parent = Q_NULLPTR); virtual ~QAbstractItemDelegate(); // painting @@ -113,7 +113,7 @@ Q_SIGNALS: void sizeHintChanged(const QModelIndex &); protected: - QAbstractItemDelegate(QObjectPrivate &, QObject *parent = 0); + QAbstractItemDelegate(QObjectPrivate &, QObject *parent = Q_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 1be17b6c0e..ff1848b149 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -115,7 +115,7 @@ public: }; Q_ENUM(ScrollMode) - explicit QAbstractItemView(QWidget *parent = 0); + explicit QAbstractItemView(QWidget *parent = Q_NULLPTR); ~QAbstractItemView(); virtual void setModel(QAbstractItemModel *model); @@ -258,7 +258,7 @@ Q_SIGNALS: void iconSizeChanged(const QSize &size); protected: - QAbstractItemView(QAbstractItemViewPrivate &, QWidget *parent = 0); + QAbstractItemView(QAbstractItemViewPrivate &, QWidget *parent = Q_NULLPTR); void setHorizontalStepsPerItem(int steps); int horizontalStepsPerItem() const; @@ -283,7 +283,7 @@ protected: virtual bool edit(const QModelIndex &index, EditTrigger trigger, QEvent *event); virtual QItemSelectionModel::SelectionFlags selectionCommand(const QModelIndex &index, - const QEvent *event = 0) const; + const QEvent *event = Q_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 792ae04eb6..58472ddd8e 100644 --- a/src/widgets/itemviews/qcolumnview.h +++ b/src/widgets/itemviews/qcolumnview.h @@ -52,7 +52,7 @@ Q_SIGNALS: void updatePreviewWidget(const QModelIndex &index); public: - explicit QColumnView(QWidget *parent = 0); + explicit QColumnView(QWidget *parent = Q_NULLPTR); ~QColumnView(); // QAbstractItemView overloads @@ -76,7 +76,7 @@ public: QList columnWidths() const; protected: - QColumnView(QColumnViewPrivate &dd, QWidget *parent = 0); + QColumnView(QColumnViewPrivate &dd, QWidget *parent = Q_NULLPTR); // QAbstractItemView overloads bool isIndexHidden(const QModelIndex &index) const Q_DECL_OVERRIDE; diff --git a/src/widgets/itemviews/qdatawidgetmapper.h b/src/widgets/itemviews/qdatawidgetmapper.h index 5ccbee4d68..4dd5e0e14c 100644 --- a/src/widgets/itemviews/qdatawidgetmapper.h +++ b/src/widgets/itemviews/qdatawidgetmapper.h @@ -55,7 +55,7 @@ class Q_WIDGETS_EXPORT QDataWidgetMapper: public QObject Q_PROPERTY(SubmitPolicy submitPolicy READ submitPolicy WRITE setSubmitPolicy) public: - explicit QDataWidgetMapper(QObject *parent = 0); + explicit QDataWidgetMapper(QObject *parent = Q_NULLPTR); ~QDataWidgetMapper(); void setModel(QAbstractItemModel *model); diff --git a/src/widgets/itemviews/qdirmodel.h b/src/widgets/itemviews/qdirmodel.h index dcc337244c..536e5299a2 100644 --- a/src/widgets/itemviews/qdirmodel.h +++ b/src/widgets/itemviews/qdirmodel.h @@ -60,8 +60,8 @@ public: }; QDirModel(const QStringList &nameFilters, QDir::Filters filters, - QDir::SortFlags sort, QObject *parent = 0); - explicit QDirModel(QObject *parent = 0); + QDir::SortFlags sort, QObject *parent = Q_NULLPTR); + explicit QDirModel(QObject *parent = Q_NULLPTR); ~QDirModel(); QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; @@ -127,7 +127,7 @@ public Q_SLOTS: void refresh(const QModelIndex &parent = QModelIndex()); protected: - QDirModel(QDirModelPrivate &, QObject *parent = 0); + QDirModel(QDirModelPrivate &, QObject *parent = Q_NULLPTR); friend class QFileDialogPrivate; private: diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h index e0f57130c0..d892614a39 100644 --- a/src/widgets/itemviews/qheaderview.h +++ b/src/widgets/itemviews/qheaderview.h @@ -68,7 +68,7 @@ public: }; Q_ENUM(ResizeMode) - explicit QHeaderView(Qt::Orientation orientation, QWidget *parent = 0); + explicit QHeaderView(Qt::Orientation orientation, QWidget *parent = Q_NULLPTR); virtual ~QHeaderView(); void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; @@ -202,7 +202,7 @@ protected Q_SLOTS: void sectionsAboutToBeRemoved(const QModelIndex &parent, int logicalFirst, int logicalLast); protected: - QHeaderView(QHeaderViewPrivate &dd, Qt::Orientation orientation, QWidget *parent = 0); + QHeaderView(QHeaderViewPrivate &dd, Qt::Orientation orientation, QWidget *parent = Q_NULLPTR); void initialize(); void initializeSections(); diff --git a/src/widgets/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h index edc224b0f3..beba6b90fb 100644 --- a/src/widgets/itemviews/qitemdelegate.h +++ b/src/widgets/itemviews/qitemdelegate.h @@ -53,7 +53,7 @@ class Q_WIDGETS_EXPORT QItemDelegate : public QAbstractItemDelegate Q_PROPERTY(bool clipping READ hasClipping WRITE setClipping) public: - explicit QItemDelegate(QObject *parent = 0); + explicit QItemDelegate(QObject *parent = Q_NULLPTR); ~QItemDelegate(); bool hasClipping() const; diff --git a/src/widgets/itemviews/qlistview.h b/src/widgets/itemviews/qlistview.h index ac65a47d9f..433933b500 100644 --- a/src/widgets/itemviews/qlistview.h +++ b/src/widgets/itemviews/qlistview.h @@ -72,7 +72,7 @@ public: enum ViewMode { ListMode, IconMode }; Q_ENUM(ViewMode) - explicit QListView(QWidget *parent = 0); + explicit QListView(QWidget *parent = Q_NULLPTR); ~QListView(); void setMovement(Movement movement); @@ -131,7 +131,7 @@ Q_SIGNALS: void indexesMoved(const QModelIndexList &indexes); protected: - QListView(QListViewPrivate &, QWidget *parent = 0); + QListView(QListViewPrivate &, QWidget *parent = Q_NULLPTR); bool event(QEvent *e) Q_DECL_OVERRIDE; diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index 8ab864c930..1fbdc472db 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -55,10 +55,10 @@ class Q_WIDGETS_EXPORT QListWidgetItem friend class QListWidget; public: enum ItemType { Type = 0, UserType = 1000 }; - explicit QListWidgetItem(QListWidget *view = 0, int type = Type); - explicit QListWidgetItem(const QString &text, QListWidget *view = 0, int type = Type); + explicit QListWidgetItem(QListWidget *view = Q_NULLPTR, int type = Type); + explicit QListWidgetItem(const QString &text, QListWidget *view = Q_NULLPTR, int type = Type); explicit QListWidgetItem(const QIcon &icon, const QString &text, - QListWidget *view = 0, int type = Type); + QListWidget *view = Q_NULLPTR, int type = Type); QListWidgetItem(const QListWidgetItem &other); virtual ~QListWidgetItem(); @@ -198,7 +198,7 @@ class Q_WIDGETS_EXPORT QListWidget : public QListView friend class QListWidgetItem; friend class QListModel; public: - explicit QListWidget(QWidget *parent = 0); + explicit QListWidget(QWidget *parent = Q_NULLPTR); ~QListWidget(); QListWidgetItem *item(int row) const; @@ -299,7 +299,7 @@ private: }; inline void QListWidget::removeItemWidget(QListWidgetItem *aItem) -{ setItemWidget(aItem, 0); } +{ setItemWidget(aItem, Q_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 590ddf6614..541830239a 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.h +++ b/src/widgets/itemviews/qstyleditemdelegate.h @@ -52,7 +52,7 @@ class Q_WIDGETS_EXPORT QStyledItemDelegate : public QAbstractItemDelegate Q_OBJECT public: - explicit QStyledItemDelegate(QObject *parent = 0); + explicit QStyledItemDelegate(QObject *parent = Q_NULLPTR); ~QStyledItemDelegate(); // painting diff --git a/src/widgets/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h index d69b78c6fe..1bb23844cc 100644 --- a/src/widgets/itemviews/qtableview.h +++ b/src/widgets/itemviews/qtableview.h @@ -54,7 +54,7 @@ class Q_WIDGETS_EXPORT QTableView : public QAbstractItemView Q_PROPERTY(bool cornerButtonEnabled READ isCornerButtonEnabled WRITE setCornerButtonEnabled) public: - explicit QTableView(QWidget *parent = 0); + explicit QTableView(QWidget *parent = Q_NULLPTR); ~QTableView(); void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index 93639f0753..9acdc19863 100644 --- a/src/widgets/itemviews/qtablewidget.h +++ b/src/widgets/itemviews/qtablewidget.h @@ -214,8 +214,8 @@ class Q_WIDGETS_EXPORT QTableWidget : public QTableView friend class QTableModel; public: - explicit QTableWidget(QWidget *parent = 0); - QTableWidget(int rows, int columns, QWidget *parent = 0); + explicit QTableWidget(QWidget *parent = Q_NULLPTR); + QTableWidget(int rows, int columns, QWidget *parent = Q_NULLPTR); ~QTableWidget(); void setRowCount(int rows); @@ -344,7 +344,7 @@ private: }; inline void QTableWidget::removeCellWidget(int arow, int acolumn) -{ setCellWidget(arow, acolumn, 0); } +{ setCellWidget(arow, acolumn, Q_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 e9e2e78e17..546cc488cb 100644 --- a/src/widgets/itemviews/qtreeview.h +++ b/src/widgets/itemviews/qtreeview.h @@ -60,7 +60,7 @@ class Q_WIDGETS_EXPORT QTreeView : public QAbstractItemView Q_PROPERTY(bool expandsOnDoubleClick READ expandsOnDoubleClick WRITE setExpandsOnDoubleClick) public: - explicit QTreeView(QWidget *parent = 0); + explicit QTreeView(QWidget *parent = Q_NULLPTR); ~QTreeView(); void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; @@ -163,7 +163,7 @@ protected Q_SLOTS: void rowsRemoved(const QModelIndex &parent, int first, int last); protected: - QTreeView(QTreeViewPrivate &dd, QWidget *parent = 0); + QTreeView(QTreeViewPrivate &dd, QWidget *parent = Q_NULLPTR); void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; void rowsInserted(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index 564e10ac1a..995528fe37 100644 --- a/src/widgets/itemviews/qtreewidget.h +++ b/src/widgets/itemviews/qtreewidget.h @@ -172,7 +172,7 @@ public: inline QTreeWidgetItem *parent() const { return par; } inline QTreeWidgetItem *child(int index) const { if (index < 0 || index >= children.size()) - return 0; + return Q_NULLPTR; executePendingSort(); return children.at(index); } @@ -255,7 +255,7 @@ class Q_WIDGETS_EXPORT QTreeWidget : public QTreeView friend class QTreeModel; friend class QTreeWidgetItem; public: - explicit QTreeWidget(QWidget *parent = 0); + explicit QTreeWidget(QWidget *parent = Q_NULLPTR); ~QTreeWidget(); int columnCount() const; @@ -375,7 +375,7 @@ private: }; inline void QTreeWidget::removeItemWidget(QTreeWidgetItem *item, int column) -{ setItemWidget(item, column, 0); } +{ setItemWidget(item, column, Q_NULLPTR); } inline QTreeWidgetItem *QTreeWidget::itemAt(int ax, int ay) const { return itemAt(QPoint(ax, ay)); } -- cgit v1.2.3