diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-04-01 23:11:19 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-02 07:34:46 -0700 |
| commit | 30230dce1027a6a0d0bad5e09581e6130cc78a62 (patch) | |
| tree | a6549df68f71e55f9a91505b1a0c053e306e63db | |
| parent | 30746e5d3f6b20a0603359f55f232fb082362f39 (diff) | |
| download | subsurface-30230dce1027a6a0d0bad5e09581e6130cc78a62.tar.gz | |
Cleanup: remove all Q_NULLPTR instances
It expands to nullptr anyway and is inconsitent with the rest of the
code. Let's remove this anachronism.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
| -rw-r--r-- | desktop-widgets/mapwidget.cpp | 4 | ||||
| -rw-r--r-- | desktop-widgets/printoptions.h | 4 | ||||
| -rw-r--r-- | desktop-widgets/templatelayout.cpp | 2 | ||||
| -rw-r--r-- | profile-widget/tankitem.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp index ac90c577d..3d2abf0b2 100644 --- a/desktop-widgets/mapwidget.cpp +++ b/desktop-widgets/mapwidget.cpp @@ -24,8 +24,8 @@ MapWidget *MapWidget::m_instance = NULL; MapWidget::MapWidget(QWidget *parent) : QQuickWidget(parent) { - m_rootItem = Q_NULLPTR; - m_mapHelper = Q_NULLPTR; + m_rootItem = nullptr; + m_mapHelper = nullptr; setResizeMode(QQuickWidget::SizeRootObjectToView); connect(this, &QQuickWidget::statusChanged, this, &MapWidget::doneLoading); setSource(urlMapWidget); diff --git a/desktop-widgets/printoptions.h b/desktop-widgets/printoptions.h index 29f3fa42a..0290f1a3e 100644 --- a/desktop-widgets/printoptions.h +++ b/desktop-widgets/printoptions.h @@ -69,8 +69,8 @@ public: private: Ui::PrintOptions ui; - struct print_options *printOptions = Q_NULLPTR; - struct template_options *templateOptions = Q_NULLPTR; + struct print_options *printOptions = nullptr; + struct template_options *templateOptions = nullptr; bool hasSetupSlots; QString lastImportExportTemplate; void setupTemplates(); diff --git a/desktop-widgets/templatelayout.cpp b/desktop-widgets/templatelayout.cpp index e91441d18..f451250d6 100644 --- a/desktop-widgets/templatelayout.cpp +++ b/desktop-widgets/templatelayout.cpp @@ -259,7 +259,7 @@ void TemplateLayout::writeTemplate(QString template_name, QString grantlee_templ YearInfo::YearInfo() { - year = Q_NULLPTR; + year = nullptr; } YearInfo::~YearInfo() diff --git a/profile-widget/tankitem.cpp b/profile-widget/tankitem.cpp index 2bbcdc1a7..ff05ec1d0 100644 --- a/profile-widget/tankitem.cpp +++ b/profile-widget/tankitem.cpp @@ -31,7 +31,7 @@ TankItem::TankItem(QObject *parent) : trimixGradient.setColorAt(1.0, red); trimix = trimixGradient; air = blue; - hAxis = Q_NULLPTR; + hAxis = nullptr; memset(&diveCylinderStore, 0, sizeof(diveCylinderStore)); } |