diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-20 17:31:18 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-21 12:26:21 +0000 |
commit | f4f5e857447d42738b1b60b5c4184f39df2f1593 (patch) | |
tree | cae2e6a223cb48350b9634c0a04b39847ebc4299 /src/imports/calendar/qquickdayofweekmodel_p.h | |
parent | 7cad85c2f0930e4f8531a0508c28abdae0f3e0de (diff) |
C++11 keywords
- Q_NULLPTR -> nullptr
- Q_DECL_OVERRIDE -> override
Change-Id: I8ee65caafd43ab41b6de43835200cac6c8ffa278
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/calendar/qquickdayofweekmodel_p.h')
-rw-r--r-- | src/imports/calendar/qquickdayofweekmodel_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/calendar/qquickdayofweekmodel_p.h b/src/imports/calendar/qquickdayofweekmodel_p.h index 90ebdc6c..9e76b961 100644 --- a/src/imports/calendar/qquickdayofweekmodel_p.h +++ b/src/imports/calendar/qquickdayofweekmodel_p.h @@ -63,7 +63,7 @@ class QQuickDayOfWeekModel : public QAbstractListModel Q_PROPERTY(int count READ rowCount CONSTANT FINAL) public: - explicit QQuickDayOfWeekModel(QObject *parent = Q_NULLPTR); + explicit QQuickDayOfWeekModel(QObject *parent = nullptr); QLocale locale() const; void setLocale(const QLocale &locale); @@ -77,9 +77,9 @@ public: NarrowNameRole }; - QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QHash<int, QByteArray> roleNames() const override; + QVariant data(const QModelIndex &index, int role) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; Q_SIGNALS: void localeChanged(); |