diff options
| author | Rainer Keller <Rainer.Keller@qt.io> | 2016-10-24 15:52:03 +0200 |
|---|---|---|
| committer | Rainer Keller <Rainer.Keller@qt.io> | 2016-10-31 07:55:17 +0000 |
| commit | 197bed092d8d88446d3708cd393c8f9c3a8d0491 (patch) | |
| tree | 48cebb3d757f10bc90f89b881003e98392afce90 /src/timedatesettings | |
| parent | 57b15814c8865e517c43fe173c0ffcadf8557ade (diff) | |
Fix compile error: 0 is not allowed for pointer initialization anymore
Change-Id: Ic8b789a46dafd379fdd48279d6eb138f978e80a5
Reviewed-by: Risto Avila <risto.avila@qt.io>
Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src/timedatesettings')
| -rw-r--r-- | src/timedatesettings/systemtime.h | 2 | ||||
| -rw-r--r-- | src/timedatesettings/timezonemodel.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/timedatesettings/systemtime.h b/src/timedatesettings/systemtime.h index 178e6a6..8ccd52e 100644 --- a/src/timedatesettings/systemtime.h +++ b/src/timedatesettings/systemtime.h @@ -41,7 +41,7 @@ class Q_DECL_EXPORT SystemTime : public QObject Q_PROPERTY(bool ntp READ ntp WRITE setNtp NOTIFY ntpChanged) Q_PROPERTY(QDateTime time READ time WRITE setTime NOTIFY timeChanged) public: - explicit SystemTime(QObject *parent = 0); + explicit SystemTime(QObject *parent = Q_NULLPTR); bool ntp() const; void setNtp(const bool aNtp); void setTime(const QDateTime& aTime); diff --git a/src/timedatesettings/timezonemodel.h b/src/timedatesettings/timezonemodel.h index efa0e22..0714317 100644 --- a/src/timedatesettings/timezonemodel.h +++ b/src/timedatesettings/timezonemodel.h @@ -41,7 +41,7 @@ class TimezoneItem : public QObject Q_PROPERTY(QString name READ name CONSTANT) Q_PROPERTY(QString country READ country CONSTANT) public: - explicit TimezoneItem(const QByteArray& id, QObject *parent=0); + explicit TimezoneItem(const QByteArray& id, QObject *parent = Q_NULLPTR); QString name() const; QString country() const; QString id() const; @@ -57,7 +57,7 @@ class Q_DECL_EXPORT TimezoneModel : public QAbstractListModel Q_OBJECT public: - explicit TimezoneModel(QObject *parent=0); + explicit TimezoneModel(QObject *parent = Q_NULLPTR); virtual ~TimezoneModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; |