Commit 35bab343 authored by murata's avatar murata

QGC: Change NULL or 0 to nullptr

parent 397c66ce
......@@ -23,7 +23,7 @@ class QGCComboBox : public QComboBox {
Q_OBJECT
public:
QGCComboBox(QWidget* parent = NULL);
QGCComboBox(QWidget* parent = nullptr);
/// @brief Sets the current index on the combo. Signals activated, as well as currentIndexChanged.
void simulateUserSetCurrentIndex(int index);
......
......@@ -18,7 +18,7 @@ class QGCFileDownload : public QNetworkAccessManager
Q_OBJECT
public:
QGCFileDownload(QObject* parent = NULL);
QGCFileDownload(QObject* parent = nullptr);
/// Download the specified remote file.
/// @param remoteFile File to download. Can be http address or file system path.
......
......@@ -25,7 +25,7 @@ QGC_LOGGING_CATEGORY(GeotaggingLog, "GeotaggingLog")
QGC_LOGGING_CATEGORY(RTKGPSLog, "RTKGPSLog")
QGC_LOGGING_CATEGORY(GuidedActionsControllerLog, "GuidedActionsControllerLog")
QGCLoggingCategoryRegister* _instance = NULL;
QGCLoggingCategoryRegister* _instance = nullptr;
const char* QGCLoggingCategoryRegister::_filterRulesSettingsGroup = "LoggingFilters";
QGCLoggingCategoryRegister* QGCLoggingCategoryRegister::instance(void)
......
......@@ -47,7 +47,7 @@ class QGCMapPalette : public QObject
Q_PROPERTY(QColor thumbJoystick READ thumbJoystick NOTIFY paletteChanged)
public:
QGCMapPalette(QObject* parent = NULL);
QGCMapPalette(QObject* parent = nullptr);
/// Text color
QColor text(void) const { return _text[_lightColors ? 0 : 1]; }
......
......@@ -18,7 +18,7 @@ class QGCQGeoCoordinate : public QObject
Q_OBJECT
public:
QGCQGeoCoordinate(const QGeoCoordinate& coord, QObject* parent = NULL);
QGCQGeoCoordinate(const QGeoCoordinate& coord, QObject* parent = nullptr);
Q_PROPERTY(QGeoCoordinate coordinate READ coordinate WRITE setCoordinate NOTIFY coordinateChanged)
Q_PROPERTY(bool dirty READ dirty WRITE setDirty NOTIFY dirtyChanged)
......
......@@ -28,7 +28,7 @@ public:
// QStandardPaths::TempLocation directory.
// @param template Template for file name following QTemporaryFile rules. Template should NOT include
// directory path, only file name.
QGCTemporaryFile(const QString& fileTemplate, QObject* parent = NULL);
QGCTemporaryFile(const QString& fileTemplate, QObject* parent = nullptr);
/// @brief Opens the file in ReadWrite mode.
/// @returns false - open failed
......
......@@ -24,7 +24,7 @@ TerrainTile::TerrainTile()
: _minElevation(-1.0)
, _maxElevation(-1.0)
, _avgElevation(-1.0)
, _data(NULL)
, _data(nullptr)
, _gridSizeLat(-1)
, _gridSizeLon(-1)
, _isValid(false)
......@@ -39,7 +39,7 @@ TerrainTile::~TerrainTile()
delete _data[i];
}
delete _data;
_data = NULL;
_data = nullptr;
}
}
......@@ -48,7 +48,7 @@ TerrainTile::TerrainTile(QByteArray byteArray)
: _minElevation(-1.0)
, _maxElevation(-1.0)
, _avgElevation(-1.0)
, _data(NULL)
, _data(nullptr)
, _gridSizeLat(-1)
, _gridSizeLon(-1)
, _isValid(false)
......
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