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/localesettings | |
| 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/localesettings')
| -rw-r--r-- | src/localesettings/localemodel.h | 4 | ||||
| -rw-r--r-- | src/localesettings/systemlocale.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/localesettings/localemodel.h b/src/localesettings/localemodel.h index b77bea6..fe4289a 100644 --- a/src/localesettings/localemodel.h +++ b/src/localesettings/localemodel.h @@ -41,7 +41,7 @@ class LocaleItem : public QObject Q_PROPERTY(QString country READ country CONSTANT) Q_PROPERTY(QString language READ language CONSTANT) public: - explicit LocaleItem(const QLocale &locale, QObject *parent=0); + explicit LocaleItem(const QLocale &locale, QObject *parent = Q_NULLPTR); QString country() const; QString language() const; QString code() const; @@ -57,7 +57,7 @@ class Q_DECL_EXPORT LocaleModel : public QAbstractListModel Q_OBJECT public: - explicit LocaleModel(QObject *parent=0); + explicit LocaleModel(QObject *parent = Q_NULLPTR); virtual ~LocaleModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; diff --git a/src/localesettings/systemlocale.h b/src/localesettings/systemlocale.h index bc2e9cd..a0cccec 100644 --- a/src/localesettings/systemlocale.h +++ b/src/localesettings/systemlocale.h @@ -38,7 +38,7 @@ class Q_DECL_EXPORT SystemLocale : public QObject Q_OBJECT Q_PROPERTY(QString locale READ locale WRITE setLocale NOTIFY localeChanged) public: - explicit SystemLocale(QObject *parent = 0); + explicit SystemLocale(QObject *parent = Q_NULLPTR); QString locale() const; void setLocale(const QString& aLocale); signals: |