diff options
| author | Chris Adams <chris.adams@qinetic.com.au> | 2018-07-13 16:31:31 +1000 |
|---|---|---|
| committer | Christopher Adams <chris.adams@jollamobile.com> | 2018-07-19 01:03:26 +0000 |
| commit | 7f21dc3ef4f7bed203357e13ee75013d67e151b4 (patch) | |
| tree | 1025cddba3fc6a594d00dc94d59e8eda5c1b6848 /src/libraries/qmfclient/qmailmessage.cpp | |
| parent | 7e2579c1fbfc077f3d95eceed5c79236752acb87 (diff) | |
Compile with GCC 6 -Werror=zero-as-null-pointer-constant
Change-Id: I67eb29e13c5e643ee2f58a0696400e085999c01c
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Diffstat (limited to 'src/libraries/qmfclient/qmailmessage.cpp')
| -rw-r--r-- | src/libraries/qmfclient/qmailmessage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libraries/qmfclient/qmailmessage.cpp b/src/libraries/qmfclient/qmailmessage.cpp index de4717bf..1e86138d 100644 --- a/src/libraries/qmfclient/qmailmessage.cpp +++ b/src/libraries/qmfclient/qmailmessage.cpp @@ -1597,7 +1597,7 @@ QMailMessageHeaderFieldPrivate::QMailMessageHeaderFieldPrivate(const QByteArray& parse(text, structured); } -static bool validExtension(const QByteArray& trailer, int* number = 0, bool* encoded = 0) +static bool validExtension(const QByteArray& trailer, int* number = Q_NULLPTR, bool* encoded = Q_NULLPTR) { // Extensions according to RFC 2231: QRegExp extensionFormat("(?:\\*(\\d+))?(\\*?)"); @@ -1614,7 +1614,7 @@ static bool validExtension(const QByteArray& trailer, int* number = 0, bool* enc return false; } -static bool matchingParameter(const QByteArray& name, const QByteArray& other, bool* encoded = 0) +static bool matchingParameter(const QByteArray& name, const QByteArray& other, bool* encoded = Q_NULLPTR) { QByteArray match(name.trimmed()); @@ -1930,7 +1930,7 @@ static QByteArray protectedParameter(const QByteArray& value) return value; } -static bool extendedParameter(const QByteArray& name, QByteArray* truncated = 0, int* number = 0, bool* encoded = 0) +static bool extendedParameter(const QByteArray& name, QByteArray* truncated = 0, int* number = Q_NULLPTR, bool* encoded = Q_NULLPTR) { QByteArray param(name.trimmed()); |