summaryrefslogtreecommitdiffstats
path: root/src/localesettings
diff options
context:
space:
mode:
authorRainer Keller <Rainer.Keller@qt.io>2016-10-24 15:54:18 +0200
committerRainer Keller <Rainer.Keller@qt.io>2016-10-31 07:55:37 +0000
commitc3007c5ecc24c43bb37e909298c73a3780bde1f9 (patch)
treeab13c596103d59ca46a4abb44badcab3039d15e0 /src/localesettings
parent197bed092d8d88446d3708cd393c8f9c3a8d0491 (diff)
Fix compile error: No Qt keywords allowed in header files
Change-Id: I79dc9af286e6eca13524d29c478cac79e5d76707 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/localefiltermodel.h2
-rw-r--r--src/localesettings/localemodel.h4
-rw-r--r--src/localesettings/systemlocale.h4
3 files changed, 5 insertions, 5 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 fe4289a..4fb00a0 100644
--- a/src/localesettings/localemodel.h
+++ b/src/localesettings/localemodel.h
@@ -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 a0cccec..075d397 100644
--- a/src/localesettings/systemlocale.h
+++ b/src/localesettings/systemlocale.h
@@ -41,9 +41,9 @@ public:
explicit SystemLocale(QObject *parent = Q_NULLPTR);
QString locale() const;
void setLocale(const QString& aLocale);
-signals:
+Q_SIGNALS:
void localeChanged();
-public slots:
+public Q_SLOTS:
protected:
SystemLocalePrivate *d_ptr;