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>
This commit is contained in:
Berthold Stoeger 2019-04-01 23:11:19 +02:00 committed by Dirk Hohndel
parent 30746e5d3f
commit 30230dce10
4 changed files with 6 additions and 6 deletions

View file

@ -24,8 +24,8 @@ MapWidget *MapWidget::m_instance = NULL;
MapWidget::MapWidget(QWidget *parent) : QQuickWidget(parent) MapWidget::MapWidget(QWidget *parent) : QQuickWidget(parent)
{ {
m_rootItem = Q_NULLPTR; m_rootItem = nullptr;
m_mapHelper = Q_NULLPTR; m_mapHelper = nullptr;
setResizeMode(QQuickWidget::SizeRootObjectToView); setResizeMode(QQuickWidget::SizeRootObjectToView);
connect(this, &QQuickWidget::statusChanged, this, &MapWidget::doneLoading); connect(this, &QQuickWidget::statusChanged, this, &MapWidget::doneLoading);
setSource(urlMapWidget); setSource(urlMapWidget);

View file

@ -69,8 +69,8 @@ public:
private: private:
Ui::PrintOptions ui; Ui::PrintOptions ui;
struct print_options *printOptions = Q_NULLPTR; struct print_options *printOptions = nullptr;
struct template_options *templateOptions = Q_NULLPTR; struct template_options *templateOptions = nullptr;
bool hasSetupSlots; bool hasSetupSlots;
QString lastImportExportTemplate; QString lastImportExportTemplate;
void setupTemplates(); void setupTemplates();

View file

@ -259,7 +259,7 @@ void TemplateLayout::writeTemplate(QString template_name, QString grantlee_templ
YearInfo::YearInfo() YearInfo::YearInfo()
{ {
year = Q_NULLPTR; year = nullptr;
} }
YearInfo::~YearInfo() YearInfo::~YearInfo()

View file

@ -31,7 +31,7 @@ TankItem::TankItem(QObject *parent) :
trimixGradient.setColorAt(1.0, red); trimixGradient.setColorAt(1.0, red);
trimix = trimixGradient; trimix = trimixGradient;
air = blue; air = blue;
hAxis = Q_NULLPTR; hAxis = nullptr;
memset(&diveCylinderStore, 0, sizeof(diveCylinderStore)); memset(&diveCylinderStore, 0, sizeof(diveCylinderStore));
} }