summaryrefslogtreecommitdiffstats
path: root/src/serviceframework/qservicereply.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-03 10:27:41 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-03 11:40:20 +0000
commit065bd535d890b27433ef9113ea104ed49da893f5 (patch)
tree2fbbdab7ce71cf9e9f4823f5d30b8568630c6669 /src/serviceframework/qservicereply.h
parentcc2077700bd5503d1fcf53aef83cbb76975e745a (diff)
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Required to change one misuse of reinterpret_cast into static_cast. Task-number: QTBUG-45291 Change-Id: I8212182c7cd87302aeb16b0cca7e6b0e3ef6c0c6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/serviceframework/qservicereply.h')
-rw-r--r--src/serviceframework/qservicereply.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/serviceframework/qservicereply.h b/src/serviceframework/qservicereply.h
index 7c609437..4e45bed6 100644
--- a/src/serviceframework/qservicereply.h
+++ b/src/serviceframework/qservicereply.h
@@ -48,7 +48,7 @@ class Q_SERVICEFW_EXPORT QServiceReplyBase : public QObject
{
Q_OBJECT
public:
- explicit QServiceReplyBase(QObject *parent = 0);
+ explicit QServiceReplyBase(QObject *parent = Q_NULLPTR);
virtual ~QServiceReplyBase();
bool isFinished() const;
@@ -83,9 +83,9 @@ class Q_SERVICEFW_EXPORT QServiceReply : public QServiceReplyBase
{
Q_OBJECT
public:
- QServiceReply(QObject *p = 0)
+ QServiceReply(QObject *p = Q_NULLPTR)
: QServiceReplyBase(p),
- m_proxyObject(0)
+ m_proxyObject(Q_NULLPTR)
{
// nothing to do
}