Commit 3405d7de authored by murata's avatar murata

QmlControls: Change NULL or 0 to nullptr

parent 7b70df8d
...@@ -19,8 +19,8 @@ class CoordinateVector : public QObject ...@@ -19,8 +19,8 @@ class CoordinateVector : public QObject
Q_OBJECT Q_OBJECT
public: public:
CoordinateVector(QObject* parent = NULL); CoordinateVector(QObject* parent = nullptr);
CoordinateVector(const QGeoCoordinate& coordinate1, const QGeoCoordinate& coordinate2, QObject* parent = NULL); CoordinateVector(const QGeoCoordinate& coordinate1, const QGeoCoordinate& coordinate2, QObject* parent = nullptr);
Q_PROPERTY(QGeoCoordinate coordinate1 MEMBER _coordinate1 NOTIFY coordinate1Changed) Q_PROPERTY(QGeoCoordinate coordinate1 MEMBER _coordinate1 NOTIFY coordinate1Changed)
Q_PROPERTY(QGeoCoordinate coordinate2 MEMBER _coordinate2 NOTIFY coordinate2Changed) Q_PROPERTY(QGeoCoordinate coordinate2 MEMBER _coordinate2 NOTIFY coordinate2Changed)
......
...@@ -29,7 +29,7 @@ EditPositionDialogController::EditPositionDialogController(void) ...@@ -29,7 +29,7 @@ EditPositionDialogController::EditPositionDialogController(void)
, _northingFact (0, _northingFactName, FactMetaData::valueTypeDouble) , _northingFact (0, _northingFactName, FactMetaData::valueTypeDouble)
{ {
if (_metaDataMap.isEmpty()) { if (_metaDataMap.isEmpty()) {
_metaDataMap = FactMetaData::createMapFromJsonFile(QStringLiteral(":/json/EditPositionDialog.FactMetaData.json"), NULL /* QObject parent */); _metaDataMap = FactMetaData::createMapFromJsonFile(QStringLiteral(":/json/EditPositionDialog.FactMetaData.json"), nullptr /* QObject parent */);
} }
_latitudeFact.setMetaData (_metaDataMap[_latitudeFactName]); _latitudeFact.setMetaData (_metaDataMap[_latitudeFactName]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment