diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-12-02 14:11:13 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-23 15:13:45 +0000 |
commit | aa32510430d6a5e58cb456faeb072d9f189872fe (patch) | |
tree | 449096e9edff2056d186e0b0d1ae19d52d21652b /examples/widgets/mainwindows | |
parent | c590aa678d5c27162b0ca7191fa76b1d3a112767 (diff) |
Cleanup Widgets examples - nullptr
Cleanup the widgets examples - replace 0 with nullptr
Change-Id: Id4bf119b9a41f6d10117f3a613a6e604128fa196
Reviewed-by: Konstantin Shegunov <kshegunov@gmail.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'examples/widgets/mainwindows')
4 files changed, 11 insertions, 11 deletions
diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp index 720f9a2085..240a04c897 100644 --- a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp +++ b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp @@ -584,7 +584,7 @@ void ColorSwatch::changeVerticalTitleBar(bool on) QSize BlueTitleBar::minimumSizeHint() const { QDockWidget *dw = qobject_cast<QDockWidget*>(parentWidget()); - Q_ASSERT(dw != 0); + Q_ASSERT(dw); QSize result(leftPm.width() + rightPm.width(), centerPm.height()); if (dw->features() & QDockWidget::DockWidgetVerticalTitleBar) result.transpose(); @@ -605,7 +605,7 @@ void BlueTitleBar::paintEvent(QPaintEvent*) QRect rect = this->rect(); QDockWidget *dw = qobject_cast<QDockWidget*>(parentWidget()); - Q_ASSERT(dw != 0); + Q_ASSERT(dw); if (dw->features() & QDockWidget::DockWidgetVerticalTitleBar) { QSize s = rect.size(); @@ -632,7 +632,7 @@ void BlueTitleBar::mouseReleaseEvent(QMouseEvent *event) QRect rect = this->rect(); QDockWidget *dw = qobject_cast<QDockWidget*>(parentWidget()); - Q_ASSERT(dw != 0); + Q_ASSERT(dw); if (dw->features() & QDockWidget::DockWidgetVerticalTitleBar) { QPoint p = pos; @@ -676,7 +676,7 @@ void BlueTitleBar::mouseReleaseEvent(QMouseEvent *event) void BlueTitleBar::updateMask() { QDockWidget *dw = qobject_cast<QDockWidget*>(parent()); - Q_ASSERT(dw != 0); + Q_ASSERT(dw); QRect rect = dw->rect(); QPixmap bitmap(dw->size()); diff --git a/examples/widgets/mainwindows/mainwindow/toolbar.cpp b/examples/widgets/mainwindows/mainwindow/toolbar.cpp index 7c96f5b1be..096d3df5a8 100644 --- a/examples/widgets/mainwindows/mainwindow/toolbar.cpp +++ b/examples/widgets/mainwindows/mainwindow/toolbar.cpp @@ -208,7 +208,7 @@ ToolBar::ToolBar(const QString &title, QWidget *parent) void ToolBar::updateMenu() { QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget()); - Q_ASSERT(mainWindow != 0); + Q_ASSERT(mainWindow); const Qt::ToolBarArea area = mainWindow->toolBarArea(this); const Qt::ToolBarAreas areas = allowedAreas(); @@ -313,7 +313,7 @@ void ToolBar::place(Qt::ToolBarArea area, bool p) return; QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget()); - Q_ASSERT(mainWindow != 0); + Q_ASSERT(mainWindow); mainWindow->addToolBar(area, this); @@ -355,7 +355,7 @@ void ToolBar::placeBottom(bool p) void ToolBar::insertToolBarBreak() { QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget()); - Q_ASSERT(mainWindow != 0); + Q_ASSERT(mainWindow); mainWindow->insertToolBarBreak(this); } diff --git a/examples/widgets/mainwindows/mdi/mainwindow.cpp b/examples/widgets/mainwindows/mdi/mainwindow.cpp index 188de1893e..1e87c5a747 100644 --- a/examples/widgets/mainwindows/mdi/mainwindow.cpp +++ b/examples/widgets/mainwindows/mdi/mainwindow.cpp @@ -242,7 +242,7 @@ void MainWindow::about() void MainWindow::updateMenus() { - bool hasMdiChild = (activeMdiChild() != 0); + bool hasMdiChild = (activeMdiChild() != nullptr); saveAct->setEnabled(hasMdiChild); saveAsAct->setEnabled(hasMdiChild); #ifndef QT_NO_CLIPBOARD @@ -483,7 +483,7 @@ MdiChild *MainWindow::activeMdiChild() const { if (QMdiSubWindow *activeSubWindow = mdiArea->activeSubWindow()) return qobject_cast<MdiChild *>(activeSubWindow->widget()); - return 0; + return nullptr; } QMdiSubWindow *MainWindow::findMdiChild(const QString &fileName) const @@ -495,7 +495,7 @@ QMdiSubWindow *MainWindow::findMdiChild(const QString &fileName) const if (mdiChild->currentFile() == canonicalFilePath) return window; } - return 0; + return nullptr; } void MainWindow::switchLayoutDirection() diff --git a/examples/widgets/mainwindows/sdi/mainwindow.cpp b/examples/widgets/mainwindows/sdi/mainwindow.cpp index d44f7c918d..f3e3af8a1b 100644 --- a/examples/widgets/mainwindows/sdi/mainwindow.cpp +++ b/examples/widgets/mainwindows/sdi/mainwindow.cpp @@ -478,5 +478,5 @@ MainWindow *MainWindow::findMainWindow(const QString &fileName) const return mainWin; } - return 0; + return nullptr; } |