From 49009f78ee14eb221e98b9c2d324a4c3c1cbe5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 17 Apr 2016 21:58:54 +0200 Subject: [PATCH] Use nullptr instead of NULL with selection model. --- YACReaderLibrary/grid_comics_view.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/YACReaderLibrary/grid_comics_view.cpp b/YACReaderLibrary/grid_comics_view.cpp index 2a05c997..d5045740 100644 --- a/YACReaderLibrary/grid_comics_view.cpp +++ b/YACReaderLibrary/grid_comics_view.cpp @@ -28,7 +28,7 @@ const unsigned int YACREADER_MIN_ITEM_WIDTH = YACREADER_MIN_COVER_WIDTH; GridComicsView::GridComicsView(QWidget *parent) : - ComicsView(parent),_selectionModel(NULL) + ComicsView(parent),_selectionModel(nullptr) { settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini", QSettings::IniFormat, this); settings->beginGroup("libraryConfig"); @@ -170,7 +170,7 @@ void GridComicsView::setModel(ComicModel *model) QQmlContext *ctxt = view->rootContext(); - if(_selectionModel != NULL) + if(_selectionModel != nullptr) delete _selectionModel; _selectionModel = new QItemSelectionModel(model); @@ -419,7 +419,7 @@ void GridComicsView::droppedComicsForResortingAt(const QString &data, int index) //helper void GridComicsView::selectIndex(int index) { - if(_selectionModel != NULL && model!=NULL) + if(_selectionModel != nullptr && model!=NULL) { _selectionModel->select(model->index(index,0),QItemSelectionModel::Select | QItemSelectionModel::Rows); view->rootContext()->setContextProperty("dummyValue", true); @@ -433,7 +433,7 @@ void GridComicsView::setCurrentIndex(int index) void GridComicsView::deselectIndex(int index) { - if(_selectionModel != NULL && model!=NULL) + if(_selectionModel != nullptr && model!=NULL) { _selectionModel->select(model->index(index,0),QItemSelectionModel::Deselect | QItemSelectionModel::Rows); view->rootContext()->setContextProperty("dummyValue", true); @@ -442,7 +442,7 @@ void GridComicsView::deselectIndex(int index) bool GridComicsView::isSelectedIndex(int index) { - if(_selectionModel != NULL && model!=NULL) + if(_selectionModel != nullptr && model!=NULL) { QModelIndex mi = model->index(index,0); return _selectionModel->isSelected(mi); @@ -452,7 +452,7 @@ bool GridComicsView::isSelectedIndex(int index) void GridComicsView::clear() { - if(_selectionModel != NULL) + if(_selectionModel != nullptr) { _selectionModel->clear(); @@ -469,7 +469,7 @@ void GridComicsView::selectedItem(int index) int GridComicsView::numItemsSelected() { - if(_selectionModel != NULL) + if(_selectionModel != nullptr) { return _selectionModel->selectedRows().length(); } @@ -479,7 +479,7 @@ int GridComicsView::numItemsSelected() int GridComicsView::lastSelectedIndex() { - if(_selectionModel != NULL) + if(_selectionModel != nullptr) { return _selectionModel->selectedRows().last().row(); }