summaryrefslogtreecommitdiffstats
path: root/src/localesettings/localemodel.h
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2016-10-06 08:37:41 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2016-11-16 11:54:55 +0000
commit48af5733bcd959146ac157a3c4759c8d89ccc465 (patch)
tree435177130f0cb39290fc0e89bf2885624c24eb58 /src/localesettings/localemodel.h
parent2b6766f09ad53f1cf2ba7cfe95976b4322c2e8fd (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/localemodel.h')
-rw-r--r--src/localesettings/localemodel.h8
1 files changed, 4 insertions, 4 deletions
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();