summaryrefslogtreecommitdiff
path: root/src/location/places
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-02 15:38:05 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-03 16:17:00 +0000
commit0f60554207e5f7b17177875108d4de6fe73f2b7e (patch)
treebd800b8d63edd0806a13a322ae5ab99268b9685b /src/location/places
parent3d8a8799cc97aedb28f5046f096d4d35da6ef8ef (diff)
downloadqtlocation-0f60554207e5f7b17177875108d4de6fe73f2b7e.tar.gz
Add explicit and 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. Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Task-number: QTBUG-45291 Change-Id: I279fd100b61d3e2b2e46e7cbd30cc6b4bfb4d10e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/location/places')
-rw-r--r--src/location/places/qplacecontentreply.h2
-rw-r--r--src/location/places/qplacedetailsreply.h2
-rw-r--r--src/location/places/qplaceidreply.h2
-rw-r--r--src/location/places/qplacemanager.h2
-rw-r--r--src/location/places/qplacemanagerengine.h2
-rw-r--r--src/location/places/qplacematchreply.h2
-rw-r--r--src/location/places/qplacereply.h4
-rw-r--r--src/location/places/qplacesearchreply.h2
-rw-r--r--src/location/places/qplacesearchsuggestionreply.h2
9 files changed, 10 insertions, 10 deletions
diff --git a/src/location/places/qplacecontentreply.h b/src/location/places/qplacecontentreply.h
index 1d824485..fa96a0e2 100644
--- a/src/location/places/qplacecontentreply.h
+++ b/src/location/places/qplacecontentreply.h
@@ -49,7 +49,7 @@ class Q_LOCATION_EXPORT QPlaceContentReply : public QPlaceReply
Q_OBJECT
public:
- explicit QPlaceContentReply(QObject *parent = 0);
+ explicit QPlaceContentReply(QObject *parent = Q_NULLPTR);
virtual ~QPlaceContentReply();
QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h
index c9530c34..09593a1e 100644
--- a/src/location/places/qplacedetailsreply.h
+++ b/src/location/places/qplacedetailsreply.h
@@ -47,7 +47,7 @@ class Q_LOCATION_EXPORT QPlaceDetailsReply : public QPlaceReply
{
Q_OBJECT
public:
- explicit QPlaceDetailsReply(QObject *parent = 0);
+ explicit QPlaceDetailsReply(QObject *parent = Q_NULLPTR);
virtual ~QPlaceDetailsReply();
QPlaceReply::Type type() const;
diff --git a/src/location/places/qplaceidreply.h b/src/location/places/qplaceidreply.h
index abdab7aa..ea44828b 100644
--- a/src/location/places/qplaceidreply.h
+++ b/src/location/places/qplaceidreply.h
@@ -55,7 +55,7 @@ public:
RemoveCategory
};
- explicit QPlaceIdReply(OperationType operationType, QObject *parent = 0);
+ explicit QPlaceIdReply(OperationType operationType, QObject *parent = Q_NULLPTR);
virtual ~QPlaceIdReply();
QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index 37e7c053..bd4b1676 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -112,7 +112,7 @@ Q_SIGNALS:
void dataChanged();
private:
- QPlaceManager(QPlaceManagerEngine *engine, QObject *parent = 0);
+ explicit QPlaceManager(QPlaceManagerEngine *engine, QObject *parent = Q_NULLPTR);
Q_DISABLE_COPY(QPlaceManager)
QPlaceManagerEngine *d;
diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h
index aca0a875..0c11278f 100644
--- a/src/location/places/qplacemanagerengine.h
+++ b/src/location/places/qplacemanagerengine.h
@@ -53,7 +53,7 @@ class Q_LOCATION_EXPORT QPlaceManagerEngine : public QObject
Q_OBJECT
public:
- QPlaceManagerEngine(const QVariantMap &parameters, QObject *parent = 0);
+ explicit QPlaceManagerEngine(const QVariantMap &parameters, QObject *parent = Q_NULLPTR);
virtual ~QPlaceManagerEngine();
QString managerName() const;
diff --git a/src/location/places/qplacematchreply.h b/src/location/places/qplacematchreply.h
index e5935e33..df4b3fda 100644
--- a/src/location/places/qplacematchreply.h
+++ b/src/location/places/qplacematchreply.h
@@ -47,7 +47,7 @@ class Q_LOCATION_EXPORT QPlaceMatchReply : public QPlaceReply
{
Q_OBJECT
public:
- explicit QPlaceMatchReply(QObject *parent = 0);
+ explicit QPlaceMatchReply(QObject *parent = Q_NULLPTR);
~QPlaceMatchReply();
QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacereply.h b/src/location/places/qplacereply.h
index 987ab446..374c68b3 100644
--- a/src/location/places/qplacereply.h
+++ b/src/location/places/qplacereply.h
@@ -71,7 +71,7 @@ public:
MatchReply
};
- explicit QPlaceReply(QObject *parent = 0);
+ explicit QPlaceReply(QObject *parent = Q_NULLPTR);
~QPlaceReply();
bool isFinished() const;
@@ -89,7 +89,7 @@ Q_SIGNALS:
void error(QPlaceReply::Error error, const QString &errorString = QString());
protected:
- QPlaceReply(QPlaceReplyPrivate *, QObject *parent = 0);
+ explicit QPlaceReply(QPlaceReplyPrivate *, QObject *parent = Q_NULLPTR);
void setFinished(bool finished);
void setError(QPlaceReply::Error error, const QString &errorString);
QPlaceReplyPrivate *d_ptr;
diff --git a/src/location/places/qplacesearchreply.h b/src/location/places/qplacesearchreply.h
index ddf850bc..52c88899 100644
--- a/src/location/places/qplacesearchreply.h
+++ b/src/location/places/qplacesearchreply.h
@@ -49,7 +49,7 @@ class Q_LOCATION_EXPORT QPlaceSearchReply : public QPlaceReply
{
Q_OBJECT
public:
- explicit QPlaceSearchReply(QObject *parent = 0);
+ explicit QPlaceSearchReply(QObject *parent = Q_NULLPTR);
~QPlaceSearchReply();
QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacesearchsuggestionreply.h b/src/location/places/qplacesearchsuggestionreply.h
index 6aee36cb..3909b14f 100644
--- a/src/location/places/qplacesearchsuggestionreply.h
+++ b/src/location/places/qplacesearchsuggestionreply.h
@@ -49,7 +49,7 @@ class Q_LOCATION_EXPORT QPlaceSearchSuggestionReply : public QPlaceReply
{
Q_OBJECT
public:
- explicit QPlaceSearchSuggestionReply(QObject *parent = 0);
+ explicit QPlaceSearchSuggestionReply(QObject *parent = Q_NULLPTR);
~QPlaceSearchSuggestionReply();
QStringList suggestions() const;