summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@qt.io>2016-06-21 13:12:04 +0200
committerMaurice Kalinowski <maurice.kalinowski@qt.io>2016-06-27 10:12:51 +0000
commit0ca3e47d81684e720939db5ff9340ab6702d4611 (patch)
tree32cb998d7185745deb6377b3357477494ccfd757
parent6735a9d1458822b65e482522c705cbe1b7b03cda (diff)
Replace Q_NULLPTR with nullptr
We're depending on C++11 these days, so no need to use deprecated macros. Change-Id: I4f2fd223a042b42b96740d957ac22b444d19631b Reviewed-by: Jeremy Whiting <jpwhiting@kde.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
-rw-r--r--src/tts/qtexttospeech.h4
-rw-r--r--src/tts/qtexttospeechengine.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/tts/qtexttospeech.h b/src/tts/qtexttospeech.h
index b6737ce..0f43fa0 100644
--- a/src/tts/qtexttospeech.h
+++ b/src/tts/qtexttospeech.h
@@ -70,8 +70,8 @@ public:
BackendError
};
- explicit QTextToSpeech(QObject *parent = Q_NULLPTR);
- explicit QTextToSpeech(const QString &engine, QObject *parent = Q_NULLPTR);
+ explicit QTextToSpeech(QObject *parent = nullptr);
+ explicit QTextToSpeech(const QString &engine, QObject *parent = nullptr);
State state() const;
QVector<QLocale> availableLocales() const;
diff --git a/src/tts/qtexttospeechengine.h b/src/tts/qtexttospeechengine.h
index 8635842..aef7f71 100644
--- a/src/tts/qtexttospeechengine.h
+++ b/src/tts/qtexttospeechengine.h
@@ -50,7 +50,7 @@ class QTEXTTOSPEECH_EXPORT QTextToSpeechEngine : public QObject
Q_OBJECT
public:
- explicit QTextToSpeechEngine(QObject *parent = Q_NULLPTR);
+ explicit QTextToSpeechEngine(QObject *parent = nullptr);
~QTextToSpeechEngine();
virtual QVector<QLocale> availableLocales() const = 0;