diff options
Diffstat (limited to 'src/location/places')
34 files changed, 53 insertions, 373 deletions
diff --git a/src/location/places/qplace.cpp b/src/location/places/qplace.cpp index 1991639d..f73ca971 100644 --- a/src/location/places/qplace.cpp +++ b/src/location/places/qplace.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -129,7 +129,7 @@ QT_DEFINE_QSDP_SPECIALIZATION_DTOR(QPlacePrivate) Constructs an empty place object. */ QPlace::QPlace() - : d_ptr(new QPlacePrivateDefault()) + : d_ptr(new QPlacePrivateDefault()) { } diff --git a/src/location/places/qplaceattribute_p.h b/src/location/places/qplaceattribute_p.h index 54b203ac..b1d576c0 100644 --- a/src/location/places/qplaceattribute_p.h +++ b/src/location/places/qplaceattribute_p.h @@ -64,8 +64,6 @@ public: QPlaceAttributePrivate(){} QPlaceAttributePrivate(const QPlaceAttributePrivate &other); virtual ~QPlaceAttributePrivate(){} - - virtual bool operator== (const QPlaceAttributePrivate &other) const; virtual QPlaceAttributePrivate *clone() const { return new QPlaceAttributePrivate(*this); } diff --git a/src/location/places/qplacecontent.cpp b/src/location/places/qplacecontent.cpp index 30b9d3e7..3999e0d7 100644 --- a/src/location/places/qplacecontent.cpp +++ b/src/location/places/qplacecontent.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -133,7 +133,7 @@ bool QPlaceContentPrivate::compare(const QPlaceContentPrivate *other) const Constructs an default content object which has no type. */ QPlaceContent::QPlaceContent() - :d_ptr(0) + : d_ptr(nullptr) { } @@ -141,7 +141,7 @@ QPlaceContent::QPlaceContent() Constructs a new copy of \a other. */ QPlaceContent::QPlaceContent(const QPlaceContent &other) - :d_ptr(other.d_ptr) + : d_ptr(other.d_ptr) { } @@ -265,6 +265,6 @@ void QPlaceContent::setAttribution(const QString &attribution) Constructs a new content object from the given pointer \a d. */ QPlaceContent::QPlaceContent(QPlaceContentPrivate *d) - :d_ptr(d) + : d_ptr(d) { } diff --git a/src/location/places/qplacecontentreply.cpp b/src/location/places/qplacecontentreply.cpp index 6c774fed..d327ba27 100644 --- a/src/location/places/qplacecontentreply.cpp +++ b/src/location/places/qplacecontentreply.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -46,12 +46,8 @@ QT_BEGIN_NAMESPACE class QPlaceContentReplyPrivate : public QPlaceReplyPrivate { public: - QPlaceContentReplyPrivate() - : totalCount(0) - { } - QPlaceContent::Collection contentCollection; - int totalCount; + int totalCount = 0; QPlaceContentRequest contentRequest; QPlaceContentRequest previousPageRequest; QPlaceContentRequest nextPageRequest; diff --git a/src/location/places/qplacecontentrequest.cpp b/src/location/places/qplacecontentrequest.cpp index d0ce72a5..7479f06c 100644 --- a/src/location/places/qplacecontentrequest.cpp +++ b/src/location/places/qplacecontentrequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -45,21 +45,6 @@ QT_BEGIN_NAMESPACE QT_DEFINE_QSDP_SPECIALIZATION_DTOR(QPlaceContentRequestPrivate) -QPlaceContentRequestPrivate::QPlaceContentRequestPrivate() -: QSharedData(), contentType(QPlaceContent::NoType), limit(-1) -{ -} - -QPlaceContentRequestPrivate::QPlaceContentRequestPrivate(const QPlaceContentRequestPrivate &other) -: QSharedData(other), contentType(other.contentType), placeId(other.placeId), - contentContext(other.contentContext), limit(other.limit) -{ -} - -QPlaceContentRequestPrivate::~QPlaceContentRequestPrivate() -{ -} - bool QPlaceContentRequestPrivate::operator==(const QPlaceContentRequestPrivate &other) const { return contentType == other.contentType diff --git a/src/location/places/qplacecontentrequest_p.h b/src/location/places/qplacecontentrequest_p.h index 6ea4c664..3fec2685 100644 --- a/src/location/places/qplacecontentrequest_p.h +++ b/src/location/places/qplacecontentrequest_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -61,19 +61,14 @@ QT_BEGIN_NAMESPACE class QPlaceContentRequestPrivate : public QSharedData { public: - QPlaceContentRequestPrivate(); - QPlaceContentRequestPrivate(const QPlaceContentRequestPrivate &other); - ~QPlaceContentRequestPrivate(); - - QPlaceContentRequestPrivate &operator=(const QPlaceContentRequestPrivate &other); bool operator==(const QPlaceContentRequestPrivate &other) const; void clear(); - QPlaceContent::Type contentType; + QPlaceContent::Type contentType = QPlaceContent::NoType; QString placeId; QVariant contentContext; - int limit; + int limit = -1; }; QT_END_NAMESPACE diff --git a/src/location/places/qplacedetailsreply.cpp b/src/location/places/qplacedetailsreply.cpp index 746001a1..5b76e82d 100644 --- a/src/location/places/qplacedetailsreply.cpp +++ b/src/location/places/qplacedetailsreply.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -46,8 +46,6 @@ QT_BEGIN_NAMESPACE class QPlaceDetailsReplyPrivate : public QPlaceReplyPrivate { public: - QPlaceDetailsReplyPrivate() {} - ~QPlaceDetailsReplyPrivate() {} QPlace result; }; diff --git a/src/location/places/qplaceeditorial.cpp b/src/location/places/qplaceeditorial.cpp index 2961da27..bcf27353 100644 --- a/src/location/places/qplaceeditorial.cpp +++ b/src/location/places/qplaceeditorial.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -42,21 +42,6 @@ QT_USE_NAMESPACE -QPlaceEditorialPrivate::QPlaceEditorialPrivate() -: QPlaceContentPrivate() -{ -} - -QPlaceEditorialPrivate::QPlaceEditorialPrivate(const QPlaceEditorialPrivate &other) -: QPlaceContentPrivate(other), text(other.text), contentTitle(other.contentTitle), - language(other.language) -{ -} - -QPlaceEditorialPrivate::~QPlaceEditorialPrivate() -{ -} - bool QPlaceEditorialPrivate::compare(const QPlaceContentPrivate *other) const { const QPlaceEditorialPrivate *od = static_cast<const QPlaceEditorialPrivate *>(other); diff --git a/src/location/places/qplaceeditorial_p.h b/src/location/places/qplaceeditorial_p.h index e8c5fe71..afcab4d9 100644 --- a/src/location/places/qplaceeditorial_p.h +++ b/src/location/places/qplaceeditorial_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -61,11 +61,6 @@ QT_BEGIN_NAMESPACE class QPlaceEditorialPrivate : public QPlaceContentPrivate { public: - QPlaceEditorialPrivate(); - QPlaceEditorialPrivate(const QPlaceEditorialPrivate &other); - - ~QPlaceEditorialPrivate(); - bool compare(const QPlaceContentPrivate *other) const override; Q_DEFINE_CONTENT_PRIVATE_HELPER(QPlaceEditorial, QPlaceContent::EditorialType) diff --git a/src/location/places/qplaceicon.cpp b/src/location/places/qplaceicon.cpp index e58b6d7c..50bbef6c 100644 --- a/src/location/places/qplaceicon.cpp +++ b/src/location/places/qplaceicon.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -48,33 +48,6 @@ QT_USE_NAMESPACE QT_DEFINE_QSDP_SPECIALIZATION_DTOR(QPlaceIconPrivate) -QPlaceIconPrivate::QPlaceIconPrivate() - : QSharedData(), manager(0) -{ -} - -QPlaceIconPrivate::QPlaceIconPrivate(const QPlaceIconPrivate &other) - : QSharedData(other), - manager(other.manager), - parameters(other.parameters) -{ -} - -QPlaceIconPrivate::~QPlaceIconPrivate() -{ -} - -QPlaceIconPrivate &QPlaceIconPrivate::operator=(const QPlaceIconPrivate &other) -{ - if (this == &other) - return *this; - - manager = other.manager; - parameters = other.parameters; - - return *this; -} - bool QPlaceIconPrivate::operator == (const QPlaceIconPrivate &other) const { return manager == other.manager diff --git a/src/location/places/qplaceicon_p.h b/src/location/places/qplaceicon_p.h index 5292b1bd..889a1369 100644 --- a/src/location/places/qplaceicon_p.h +++ b/src/location/places/qplaceicon_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -62,14 +62,9 @@ class QPlaceManager; class QPlaceIconPrivate: public QSharedData { public: - QPlaceIconPrivate(); - QPlaceIconPrivate(const QPlaceIconPrivate &other); - ~QPlaceIconPrivate(); - - QPlaceIconPrivate &operator=(const QPlaceIconPrivate &other); bool operator == (const QPlaceIconPrivate &other) const; - QPlaceManager *manager; + QPlaceManager *manager = nullptr; QVariantMap parameters; }; diff --git a/src/location/places/qplaceimage.cpp b/src/location/places/qplaceimage.cpp index bfdf18b7..fc87bfef 100644 --- a/src/location/places/qplaceimage.cpp +++ b/src/location/places/qplaceimage.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -42,22 +42,6 @@ QT_USE_NAMESPACE -QPlaceImagePrivate::QPlaceImagePrivate() : QPlaceContentPrivate() -{ -} - -QPlaceImagePrivate::QPlaceImagePrivate(const QPlaceImagePrivate &other) - : QPlaceContentPrivate(other) -{ - url = other.url; - id = other.id; - mimeType = other.mimeType; -} - -QPlaceImagePrivate::~QPlaceImagePrivate() -{ -} - bool QPlaceImagePrivate::compare(const QPlaceContentPrivate *other) const { const QPlaceImagePrivate *od = static_cast<const QPlaceImagePrivate *>(other); diff --git a/src/location/places/qplaceimage_p.h b/src/location/places/qplaceimage_p.h index d81afd96..c790ee76 100644 --- a/src/location/places/qplaceimage_p.h +++ b/src/location/places/qplaceimage_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -62,11 +62,6 @@ QT_BEGIN_NAMESPACE class QPlaceImagePrivate : public QPlaceContentPrivate { public: - QPlaceImagePrivate(); - QPlaceImagePrivate(const QPlaceImagePrivate &other); - - ~QPlaceImagePrivate(); - bool compare(const QPlaceContentPrivate *other) const override; Q_DEFINE_CONTENT_PRIVATE_HELPER(QPlaceImage, QPlaceContent::ImageType) diff --git a/src/location/places/qplacemanagerengine.cpp b/src/location/places/qplacemanagerengine.cpp index 302e029b..cab5603d 100644 --- a/src/location/places/qplacemanagerengine.cpp +++ b/src/location/places/qplacemanagerengine.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -356,15 +356,6 @@ QUrl QPlaceManagerEngine::constructIconUrl(const QPlaceIcon &icon, const QSize & return QUrl(); } -QPlaceManagerEnginePrivate::QPlaceManagerEnginePrivate() - : managerVersion(-1), manager(0) -{ -} - -QPlaceManagerEnginePrivate::~QPlaceManagerEnginePrivate() -{ -} - /*! \fn void QPlaceManagerEngine::finished(QPlaceReply *reply) diff --git a/src/location/places/qplacemanagerengine_p.h b/src/location/places/qplacemanagerengine_p.h index b93cbd53..7cd58e5c 100644 --- a/src/location/places/qplacemanagerengine_p.h +++ b/src/location/places/qplacemanagerengine_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -60,12 +60,11 @@ QT_BEGIN_NAMESPACE class QPlaceManagerEnginePrivate { public: - QPlaceManagerEnginePrivate(); - ~QPlaceManagerEnginePrivate(); + QPlaceManagerEnginePrivate() = default; QString managerName; - int managerVersion; - QPlaceManager *manager; + int managerVersion = -1; + QPlaceManager *manager = nullptr; private: Q_DISABLE_COPY(QPlaceManagerEnginePrivate) diff --git a/src/location/places/qplacematchreply.cpp b/src/location/places/qplacematchreply.cpp index 73059053..239db759 100644 --- a/src/location/places/qplacematchreply.cpp +++ b/src/location/places/qplacematchreply.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -47,7 +47,6 @@ QT_BEGIN_NAMESPACE class QPlaceMatchReplyPrivate : public QPlaceReplyPrivate { public: - QPlaceMatchReplyPrivate(){} QList<QPlace> places; QPlaceMatchRequest request; }; diff --git a/src/location/places/qplacematchrequest.cpp b/src/location/places/qplacematchrequest.cpp index 1356b1d7..85beaebe 100644 --- a/src/location/places/qplacematchrequest.cpp +++ b/src/location/places/qplacematchrequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -49,11 +49,6 @@ QT_BEGIN_NAMESPACE class QPlaceMatchRequestPrivate : public QSharedData { public: - QPlaceMatchRequestPrivate(); - QPlaceMatchRequestPrivate(const QPlaceMatchRequestPrivate &other); - ~QPlaceMatchRequestPrivate(); - - QPlaceMatchRequestPrivate &operator=(const QPlaceMatchRequestPrivate &other); bool operator==(const QPlaceMatchRequestPrivate &other) const; void clear(); @@ -64,32 +59,6 @@ public: QT_DEFINE_QSDP_SPECIALIZATION_DTOR(QPlaceMatchRequestPrivate) -QPlaceMatchRequestPrivate::QPlaceMatchRequestPrivate() - : QSharedData() -{ -} - -QPlaceMatchRequestPrivate::QPlaceMatchRequestPrivate(const QPlaceMatchRequestPrivate &other) - : QSharedData(other), - places(other.places), - parameters(other.parameters) -{ -} - -QPlaceMatchRequestPrivate::~QPlaceMatchRequestPrivate() -{ -} - -QPlaceMatchRequestPrivate &QPlaceMatchRequestPrivate::operator=(const QPlaceMatchRequestPrivate &other) -{ - if (this != &other) { - places = other.places; - parameters = other.parameters; - } - - return *this; -} - bool QPlaceMatchRequestPrivate::operator==(const QPlaceMatchRequestPrivate &other) const { return (places == other.places diff --git a/src/location/places/qplaceproposedsearchresult.cpp b/src/location/places/qplaceproposedsearchresult.cpp index 671a2714..f64fce49 100644 --- a/src/location/places/qplaceproposedsearchresult.cpp +++ b/src/location/places/qplaceproposedsearchresult.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Aaron McCarthy <mccarthy.aaron@gmail.com> +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -42,19 +43,6 @@ QT_BEGIN_NAMESPACE -QPlaceProposedSearchResultPrivate::QPlaceProposedSearchResultPrivate() -{ -} - -QPlaceProposedSearchResultPrivate::QPlaceProposedSearchResultPrivate(const QPlaceProposedSearchResultPrivate &other) -: QPlaceSearchResultPrivate(other), searchRequest(other.searchRequest) -{ -} - -QPlaceProposedSearchResultPrivate::~QPlaceProposedSearchResultPrivate() -{ -} - bool QPlaceProposedSearchResultPrivate::compare(const QPlaceSearchResultPrivate *other) const { const QPlaceProposedSearchResultPrivate *od = static_cast<const QPlaceProposedSearchResultPrivate *>(other); diff --git a/src/location/places/qplaceproposedsearchresult_p.h b/src/location/places/qplaceproposedsearchresult_p.h index abecaa61..30df6c9d 100644 --- a/src/location/places/qplaceproposedsearchresult_p.h +++ b/src/location/places/qplaceproposedsearchresult_p.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Aaron McCarthy <mccarthy.aaron@gmail.com> +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -58,11 +59,6 @@ QT_BEGIN_NAMESPACE class QPlaceProposedSearchResultPrivate : public QPlaceSearchResultPrivate { public: - QPlaceProposedSearchResultPrivate(); - QPlaceProposedSearchResultPrivate(const QPlaceProposedSearchResultPrivate &other); - - ~QPlaceProposedSearchResultPrivate(); - bool compare(const QPlaceSearchResultPrivate *other) const override; Q_DEFINE_SEARCHRESULT_PRIVATE_HELPER(QPlaceProposedSearchResult, QPlaceSearchResult::ProposedSearchResult) diff --git a/src/location/places/qplaceratings.cpp b/src/location/places/qplaceratings.cpp index b47b19c1..ba4389ef 100644 --- a/src/location/places/qplaceratings.cpp +++ b/src/location/places/qplaceratings.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -44,20 +44,6 @@ QT_USE_NAMESPACE QT_DEFINE_QSDP_SPECIALIZATION_DTOR(QPlaceRatingsPrivate) -QPlaceRatingsPrivate::QPlaceRatingsPrivate() - : QSharedData(), average(0), maximum(0), count(0) -{ -} - -QPlaceRatingsPrivate::QPlaceRatingsPrivate(const QPlaceRatingsPrivate &other) -: QSharedData(), average(0), maximum(other.maximum), count(other.count) -{ -} - -QPlaceRatingsPrivate::~QPlaceRatingsPrivate() -{ -} - bool QPlaceRatingsPrivate::operator==(const QPlaceRatingsPrivate &other) const { return average == other.average && maximum == other.maximum && count == other.count; diff --git a/src/location/places/qplaceratings_p.h b/src/location/places/qplaceratings_p.h index 84c527fa..0b8c5d91 100644 --- a/src/location/places/qplaceratings_p.h +++ b/src/location/places/qplaceratings_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -59,18 +59,13 @@ QT_BEGIN_NAMESPACE class QPlaceRatingsPrivate : public QSharedData { public: - QPlaceRatingsPrivate(); - QPlaceRatingsPrivate(const QPlaceRatingsPrivate &other); - - ~QPlaceRatingsPrivate(); - bool operator==(const QPlaceRatingsPrivate &other) const; bool isEmpty() const; - qreal average; - qreal maximum; - int count; + qreal average = 0; + qreal maximum = 0; + int count = 0; }; QT_END_NAMESPACE diff --git a/src/location/places/qplacereply_p.h b/src/location/places/qplacereply_p.h index 8fe57832..c044b595 100644 --- a/src/location/places/qplacereply_p.h +++ b/src/location/places/qplacereply_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -58,13 +58,9 @@ QT_BEGIN_NAMESPACE class QPlaceReplyPrivate { public: - QPlaceReplyPrivate() : - isFinished(false), - error(QPlaceReply::NoError), - errorString(QString()){} virtual ~QPlaceReplyPrivate(){} - bool isFinished; - QPlaceReply::Error error; + bool isFinished = false; + QPlaceReply::Error error = QPlaceReply::NoError; QString errorString; }; diff --git a/src/location/places/qplaceresult.cpp b/src/location/places/qplaceresult.cpp index 541b6e5d..a50bcb84 100644 --- a/src/location/places/qplaceresult.cpp +++ b/src/location/places/qplaceresult.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -43,21 +43,6 @@ QT_USE_NAMESPACE -QPlaceResultPrivate::QPlaceResultPrivate() - : QPlaceSearchResultPrivate(), distance(qQNaN()), sponsored(false) -{ -} - -QPlaceResultPrivate::QPlaceResultPrivate(const QPlaceResultPrivate &other) -: QPlaceSearchResultPrivate(other), distance(other.distance), place(other.place), - sponsored(other.sponsored) -{ -} - -QPlaceResultPrivate::~QPlaceResultPrivate() -{ -} - bool QPlaceResultPrivate::compare(const QPlaceSearchResultPrivate *other) const { const QPlaceResultPrivate *od = static_cast<const QPlaceResultPrivate *>(other); diff --git a/src/location/places/qplaceresult_p.h b/src/location/places/qplaceresult_p.h index ac3a527d..03b24548 100644 --- a/src/location/places/qplaceresult_p.h +++ b/src/location/places/qplaceresult_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -59,18 +59,13 @@ QT_BEGIN_NAMESPACE class QPlaceResultPrivate : public QPlaceSearchResultPrivate { public: - QPlaceResultPrivate(); - QPlaceResultPrivate(const QPlaceResultPrivate &other); - - ~QPlaceResultPrivate(); - bool compare(const QPlaceSearchResultPrivate *other) const override; Q_DEFINE_SEARCHRESULT_PRIVATE_HELPER(QPlaceResult, QPlaceSearchResult::PlaceResult) - qreal distance; + qreal distance = Q_QNAN; QPlace place; - bool sponsored; + bool sponsored = false; }; QT_END_NAMESPACE diff --git a/src/location/places/qplacereview.cpp b/src/location/places/qplacereview.cpp index 94a0e1b6..83dc298c 100644 --- a/src/location/places/qplacereview.cpp +++ b/src/location/places/qplacereview.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -42,26 +42,6 @@ QT_BEGIN_NAMESPACE -QPlaceReviewPrivate::QPlaceReviewPrivate() -: QPlaceContentPrivate(), rating(0) -{ -} - -QPlaceReviewPrivate::QPlaceReviewPrivate(const QPlaceReviewPrivate &other) - : QPlaceContentPrivate(other) -{ - dateTime = other.dateTime; - text = other.text; - language = other.language; - rating = other.rating; - reviewId = other.reviewId; - title = other.title; -} - -QPlaceReviewPrivate::~QPlaceReviewPrivate() -{ -} - bool QPlaceReviewPrivate::compare(const QPlaceContentPrivate *other) const { const QPlaceReviewPrivate *od = static_cast<const QPlaceReviewPrivate *>(other); diff --git a/src/location/places/qplacereview_p.h b/src/location/places/qplacereview_p.h index b6b29e5f..8fc4a9ba 100644 --- a/src/location/places/qplacereview_p.h +++ b/src/location/places/qplacereview_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -61,11 +61,6 @@ QT_BEGIN_NAMESPACE class QPlaceReviewPrivate : public QPlaceContentPrivate { public: - QPlaceReviewPrivate(); - QPlaceReviewPrivate(const QPlaceReviewPrivate &other); - - ~QPlaceReviewPrivate(); - bool compare(const QPlaceContentPrivate *other) const override; Q_DEFINE_CONTENT_PRIVATE_HELPER(QPlaceReview, QPlaceContent::ReviewType); @@ -73,7 +68,7 @@ public: QDateTime dateTime; QString text; QString language; - qreal rating; + qreal rating = 0; QString reviewId; QString title; }; diff --git a/src/location/places/qplacesearchreply.cpp b/src/location/places/qplacesearchreply.cpp index fd9cdf30..d3b34ab7 100644 --- a/src/location/places/qplacesearchreply.cpp +++ b/src/location/places/qplacesearchreply.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -47,7 +47,6 @@ QT_BEGIN_NAMESPACE class QPlaceSearchReplyPrivate : public QPlaceReplyPrivate { public: - QPlaceSearchReplyPrivate(){} QList<QPlaceSearchResult> results; QPlaceSearchRequest searchRequest; QPlaceSearchRequest previousPageRequest; diff --git a/src/location/places/qplacesearchrequest.cpp b/src/location/places/qplacesearchrequest.cpp index 06d7268e..382f0fb5 100644 --- a/src/location/places/qplacesearchrequest.cpp +++ b/src/location/places/qplacesearchrequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -53,51 +53,6 @@ QT_BEGIN_NAMESPACE QT_DEFINE_QSDP_SPECIALIZATION_DTOR(QPlaceSearchRequestPrivate) -QPlaceSearchRequestPrivate::QPlaceSearchRequestPrivate() -: QSharedData(), - visibilityScope(QLocation::UnspecifiedVisibility), - relevanceHint(QPlaceSearchRequest::UnspecifiedHint), - limit(-1) -{ -} - -QPlaceSearchRequestPrivate::QPlaceSearchRequestPrivate(const QPlaceSearchRequestPrivate &other) - : QSharedData(other), - searchTerm(other.searchTerm), - categories(other.categories), - searchArea(other.searchArea), - recommendationId(other.recommendationId), - visibilityScope(other.visibilityScope), - relevanceHint(other.relevanceHint), - limit(other.limit), - searchContext(other.searchContext), - related(other.related), - page(other.page) -{ -} - -QPlaceSearchRequestPrivate::~QPlaceSearchRequestPrivate() -{ -} - -QPlaceSearchRequestPrivate &QPlaceSearchRequestPrivate::operator=(const QPlaceSearchRequestPrivate &other) -{ - if (this != &other) { - searchTerm = other.searchTerm; - categories = other.categories; - searchArea = other.searchArea; - recommendationId = other.recommendationId; - visibilityScope = other.visibilityScope; - relevanceHint = other.relevanceHint; - limit = other.limit; - searchContext = other.searchContext; - related = other.related; - page = other.page; - } - - return *this; -} - bool QPlaceSearchRequestPrivate::operator==(const QPlaceSearchRequestPrivate &other) const { return searchTerm == other.searchTerm && diff --git a/src/location/places/qplacesearchrequest_p.h b/src/location/places/qplacesearchrequest_p.h index 2d158ba0..f48519ca 100644 --- a/src/location/places/qplacesearchrequest_p.h +++ b/src/location/places/qplacesearchrequest_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -66,11 +66,6 @@ QT_BEGIN_NAMESPACE class Q_LOCATION_PRIVATE_EXPORT QPlaceSearchRequestPrivate : public QSharedData { public: - QPlaceSearchRequestPrivate(); - QPlaceSearchRequestPrivate(const QPlaceSearchRequestPrivate &other); - ~QPlaceSearchRequestPrivate(); - - QPlaceSearchRequestPrivate &operator=(const QPlaceSearchRequestPrivate &other); bool operator==(const QPlaceSearchRequestPrivate &other) const; void clear(); @@ -81,10 +76,10 @@ public: QList<QPlaceCategory> categories; QGeoShape searchArea; QString recommendationId; - QLocation::VisibilityScope visibilityScope; - QPlaceSearchRequest::RelevanceHint relevanceHint; + QLocation::VisibilityScope visibilityScope = QLocation::UnspecifiedVisibility; + QPlaceSearchRequest::RelevanceHint relevanceHint = QPlaceSearchRequest::UnspecifiedHint; QGeoRoute routeSearchArea; - int limit; + int limit = -1; QVariant searchContext; bool related = false; int page = 0; diff --git a/src/location/places/qplacesearchsuggestionreply.cpp b/src/location/places/qplacesearchsuggestionreply.cpp index 6c12f68c..e0176526 100644 --- a/src/location/places/qplacesearchsuggestionreply.cpp +++ b/src/location/places/qplacesearchsuggestionreply.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -45,7 +45,6 @@ QT_BEGIN_NAMESPACE class QPlaceSearchSuggestionReplyPrivate : public QPlaceReplyPrivate { public: - QPlaceSearchSuggestionReplyPrivate(){} QStringList suggestions; }; diff --git a/src/location/places/qplacesupplier.cpp b/src/location/places/qplacesupplier.cpp index 35d976eb..7b730f94 100644 --- a/src/location/places/qplacesupplier.cpp +++ b/src/location/places/qplacesupplier.cpp @@ -44,23 +44,6 @@ QT_USE_NAMESPACE QT_DEFINE_QSDP_SPECIALIZATION_DTOR(QPlaceSupplierPrivate) -QPlaceSupplierPrivate::QPlaceSupplierPrivate() : QSharedData() -{ -} - -QPlaceSupplierPrivate::QPlaceSupplierPrivate(const QPlaceSupplierPrivate &other) - : QSharedData() -{ - this->name = other.name; - this->supplierId = other.supplierId; - this->url = other.url; - this->icon = other.icon; -} - -QPlaceSupplierPrivate::~QPlaceSupplierPrivate() -{ -} - bool QPlaceSupplierPrivate::operator==(const QPlaceSupplierPrivate &other) const { return ( diff --git a/src/location/places/qplacesupplier_p.h b/src/location/places/qplacesupplier_p.h index b1172239..41a26bda 100644 --- a/src/location/places/qplacesupplier_p.h +++ b/src/location/places/qplacesupplier_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -62,11 +62,6 @@ QT_BEGIN_NAMESPACE class QPlaceSupplierPrivate : public QSharedData { public: - QPlaceSupplierPrivate(); - QPlaceSupplierPrivate(const QPlaceSupplierPrivate &other); - - ~QPlaceSupplierPrivate(); - bool operator==(const QPlaceSupplierPrivate &other) const; bool isEmpty() const; diff --git a/src/location/places/qplaceuser.cpp b/src/location/places/qplaceuser.cpp index de2e82a6..48241e7a 100644 --- a/src/location/places/qplaceuser.cpp +++ b/src/location/places/qplaceuser.cpp @@ -44,20 +44,6 @@ QT_USE_NAMESPACE QT_DEFINE_QSDP_SPECIALIZATION_DTOR(QPlaceUserPrivate) -QPlaceUserPrivate::QPlaceUserPrivate() - : QSharedData() -{ -} - -QPlaceUserPrivate::QPlaceUserPrivate(const QPlaceUserPrivate &other) - : QSharedData(), userId(other.userId), name(other.name) -{ -} - -QPlaceUserPrivate::~QPlaceUserPrivate() -{ -} - bool QPlaceUserPrivate::operator==(const QPlaceUserPrivate &other) const { return userId == other.userId && name == other.name; diff --git a/src/location/places/qplaceuser_p.h b/src/location/places/qplaceuser_p.h index 2110ec28..b90dc0e2 100644 --- a/src/location/places/qplaceuser_p.h +++ b/src/location/places/qplaceuser_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -60,11 +60,6 @@ QT_BEGIN_NAMESPACE class QPlaceUserPrivate : public QSharedData { public: - QPlaceUserPrivate(); - QPlaceUserPrivate(const QPlaceUserPrivate &other); - - ~QPlaceUserPrivate(); - bool operator==(const QPlaceUserPrivate &other) const; QString userId; |