diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-10-06 08:37:41 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-11-16 11:54:55 +0000 |
| commit | 48af5733bcd959146ac157a3c4759c8d89ccc465 (patch) | |
| tree | 435177130f0cb39290fc0e89bf2885624c24eb58 /src/localesettings | |
| parent | 2b6766f09ad53f1cf2ba7cfe95976b4322c2e8fd (diff) | |
clean up public headers
If this project is treated as a Qt module, it didn't build without these
fixes because QT_NO_KEYWORDS and -Werror=zero-as-null-pointer-constant
are enforced.
Change-Id: Ie3ab8597b338478a5a34ed49d176ce9a647b1e0e
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/localesettings')
| -rw-r--r-- | src/localesettings/localefiltermodel.h | 2 | ||||
| -rw-r--r-- | src/localesettings/localemodel.h | 8 | ||||
| -rw-r--r-- | src/localesettings/systemlocale.h | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/localesettings/localefiltermodel.h b/src/localesettings/localefiltermodel.h index c885dd3..6c839e4 100644 --- a/src/localesettings/localefiltermodel.h +++ b/src/localesettings/localefiltermodel.h @@ -42,7 +42,7 @@ public: QString filter() const; void setFilter(const QString& aFilter); Q_INVOKABLE QVariant itemFromRow(const int row) const; -signals: +Q_SIGNALS: void filterChanged(); private: QString m_filter; diff --git a/src/localesettings/localemodel.h b/src/localesettings/localemodel.h index b77bea6..61a42c4 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 = 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 = nullptr); virtual ~LocaleModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; @@ -74,10 +74,10 @@ public: static void generateModel(LocaleModel* model); -signals: +Q_SIGNALS: void addItem(LocaleItem* item); -private slots: +private Q_SLOTS: void addNewItem(QObject* item); void modelReady(); diff --git a/src/localesettings/systemlocale.h b/src/localesettings/systemlocale.h index bc2e9cd..e942974 100644 --- a/src/localesettings/systemlocale.h +++ b/src/localesettings/systemlocale.h @@ -38,12 +38,11 @@ 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 = nullptr); QString locale() const; void setLocale(const QString& aLocale); -signals: +Q_SIGNALS: void localeChanged(); -public slots: protected: SystemLocalePrivate *d_ptr; |