Integrate updates from q4 pre-release

This change covers revisions r45259 to r45585 but doesn't integrate
the unit tests.

17 files changed, 48 insertions, 89 deletions

diff --git a/src/location/places/qplacecontact.h b/src/location/places/qplacecontact.h
index 109a4fb7..03e4d737 100644
--- a/src/location/places/qplacecontact.h
+++ b/src/location/places/qplacecontact.h
@@ -56,7 +56,7 @@ public:
     enum ContactType {
         Phone,
         Email,
-        URL,
+        Url,
         Fax,
         IM,
         Undefined
diff --git a/src/location/places/qplacedescription.cpp b/src/location/places/qplacedescription.cpp
index cf5e688d..ccb054cf 100644
--- a/src/location/places/qplacedescription.cpp
+++ b/src/location/places/qplacedescription.cpp
@@ -55,7 +55,7 @@ QPlaceDescriptionPrivate::QPlaceDescriptionPrivate(const QPlaceDescriptionPrivat
     this->contentTitle = other.contentTitle;
     this->contentType = other.contentType;
     this->supplier = other.supplier;
-    this->sourceURL = other.sourceURL;
+    this->sourceUrl = other.sourceUrl;
     this->language = other.language;
 }
 
@@ -70,7 +70,7 @@ bool QPlaceDescriptionPrivate::operator==(const QPlaceDescriptionPrivate &other)
             && this->contentTitle == other.contentTitle
             && this->contentType == other.contentType
             && this->supplier == other.supplier
-            && this->sourceURL == other.sourceURL
+            && this->sourceUrl == other.sourceUrl
             && this->language == other.language
     );
 }
@@ -190,17 +190,17 @@ void QPlaceDescription::setSupplier(const QPlaceSupplier &data)
 /*!
     Returns source url.
 */
-QString QPlaceDescription::sourceURL() const
+QString QPlaceDescription::sourceUrl() const
 {
-    return d->sourceURL;
+    return d->sourceUrl;
 }
 
 /*!
     Sets source url.
 */
-void QPlaceDescription::setSourceURL(const QString &data)
+void QPlaceDescription::setSourceUrl(const QString &data)
 {
-    d->sourceURL = data;
+    d->sourceUrl = data;
 }
 
 /*!
diff --git a/src/location/places/qplacedescription.h b/src/location/places/qplacedescription.h
index a2f9f18a..599c46ea 100644
--- a/src/location/places/qplacedescription.h
+++ b/src/location/places/qplacedescription.h
@@ -74,8 +74,8 @@ public:
     void setContentType(const QString &data);
     QPlaceSupplier supplier() const;
     void setSupplier(const QPlaceSupplier &data);
-    QString sourceURL() const;
-    void setSourceURL(const QString &data);
+    QString sourceUrl() const;
+    void setSourceUrl(const QString &data);
     QString language() const;
     void setLanguage(const QString &data);
 
diff --git a/src/location/places/qplacedescription_p.h b/src/location/places/qplacedescription_p.h
index 1dcaa060..32691bb3 100644
--- a/src/location/places/qplacedescription_p.h
+++ b/src/location/places/qplacedescription_p.h
@@ -62,7 +62,7 @@ public:
     QString contentTitle;
     QString contentType;
     QPlaceSupplier supplier;
-    QString sourceURL;
+    QString sourceUrl;
     QString language;
 };
 
diff --git a/src/location/places/qplacemediaobject.cpp b/src/location/places/qplacemediaobject.cpp
index 7c133c7d..6feb636b 100644
--- a/src/location/places/qplacemediaobject.cpp
+++ b/src/location/places/qplacemediaobject.cpp
@@ -52,7 +52,7 @@ QPlaceMediaObjectPrivate::QPlaceMediaObjectPrivate(const QPlaceMediaObjectPrivat
     : QSharedData()
 {
     this->url = other.url;
-    this->thumbnailURL = other.thumbnailURL;
+    this->thumbnailUrl = other.thumbnailUrl;
     this->id = other.id;
     this->metaInfo = other.metaInfo;
     this->mimeType = other.mimeType;
@@ -67,7 +67,7 @@ bool QPlaceMediaObjectPrivate::operator==(const QPlaceMediaObjectPrivate &other)
 {
     return (
             this->url == other.url
-            && this->thumbnailURL == other.thumbnailURL
+            && this->thumbnailUrl == other.thumbnailUrl
             && this->id == other.id
             && this->metaInfo == other.metaInfo
             && this->mimeType == other.mimeType
@@ -147,7 +147,7 @@ void QPlaceMediaObject::setUrl(const QString &data)
 */
 QString QPlaceMediaObject::thumbnailUrl() const
 {
-    return d->thumbnailURL;
+    return d->thumbnailUrl;
 }
 
 /*!
@@ -155,7 +155,7 @@ QString QPlaceMediaObject::thumbnailUrl() const
 */
 void QPlaceMediaObject::setThumbnailUrl(const QString &data)
 {
-    d->thumbnailURL = data;
+    d->thumbnailUrl = data;
 }
 
 /*!
diff --git a/src/location/places/qplacemediaobject_p.h b/src/location/places/qplacemediaobject_p.h
index 0578b860..508de18c 100644
--- a/src/location/places/qplacemediaobject_p.h
+++ b/src/location/places/qplacemediaobject_p.h
@@ -59,7 +59,7 @@ public:
     bool operator==(const QPlaceMediaObjectPrivate &other) const;
 
     QString url;
-    QString thumbnailURL;
+    QString thumbnailUrl;
     QString id;
     QString metaInfo;
     QString mimeType;
diff --git a/src/location/places/qplacepaginationlist.h b/src/location/places/qplacepaginationlist.h
index 987d8ee3..2d0f0e0d 100644
--- a/src/location/places/qplacepaginationlist.h
+++ b/src/location/places/qplacepaginationlist.h
@@ -99,7 +99,7 @@ public:
     /*!
         Returns index of last item on current page.
     */
-    int stop() { return startIndx + dataList.count(); }
+    int stop() { return startIndx + dataList.count() - 1; }
     /*!
         Returns items list on current page.
     */
diff --git a/src/location/places/qplaceperiod.cpp b/src/location/places/qplaceperiod.cpp
index 0583522b..a9b1ef6c 100644
--- a/src/location/places/qplaceperiod.cpp
+++ b/src/location/places/qplaceperiod.cpp
@@ -92,43 +92,6 @@ QPlacePeriod::QPlacePeriod()
 {
 }
 
-QPlacePeriod::QPlacePeriod(int startHour, int startMinute, int endHour, int endMinute)
-    : d(new QPlacePeriodPrivate)
-{
-    QTime startTime(startHour, startMinute);
-    d->begin.setTime(startTime);
-    QTime endTime(endHour, endMinute);
-    d->end.setTime(endTime);
-}
-
-QPlacePeriod::QPlacePeriod(int startMonth, int startDay, int startHour, int startMinute,
-            int endMonth, int endDay, int endHour, int endMinute)
-    : d(new QPlacePeriodPrivate)
-{
-    QTime startTime(startHour, startMinute);
-    QDate startDate(0, startMonth, startDay);
-    d->begin.setTime(startTime);
-    d->begin.setDate(startDate);
-    QTime endTime(endHour, endMinute);
-    QDate endDate(0, endMonth, endDay);
-    d->end.setTime(endTime);
-    d->end.setDate(endDate);
-}
-
-QPlacePeriod::QPlacePeriod(int startYear, int startMonth, int startDay, int startHour, int startMinute,
-            int endYear, int endMonth, int endDay, int endHour, int endMinute)
-    : d(new QPlacePeriodPrivate)
-{
-    QTime startTime(startHour, startMinute);
-    QDate startDate(startYear, startMonth, startDay);
-    d->begin.setTime(startTime);
-    d->begin.setDate(startDate);
-    QTime endTime(endHour, endMinute);
-    QDate endDate(endYear, endMonth, endDay);
-    d->end.setTime(endTime);
-    d->end.setDate(endDate);
-}
-
 /*!
     Constructs a copy of \a other
 */
diff --git a/src/location/places/qplaceperiod.h b/src/location/places/qplaceperiod.h
index 0d0108d4..919c3bcb 100644
--- a/src/location/places/qplaceperiod.h
+++ b/src/location/places/qplaceperiod.h
@@ -54,12 +54,6 @@ class Q_LOCATION_EXPORT QPlacePeriod
 {
 public:
     QPlacePeriod();
-    QPlacePeriod(int startHour, int startMinute, int endHour, int endMinute);
-    QPlacePeriod(int startMonth, int startDay, int startHour, int startMinute,
-                int endMonth, int endDay, int endHour, int endMinute);
-    QPlacePeriod(int startYear, int startMonth, int startDay, int startHour, int startMinute,
-                int endYear, int endMonth, int endDay, int endHour, int endMinute);
-
     QPlacePeriod(const QPlacePeriod &other);
 
     virtual ~QPlacePeriod();
diff --git a/src/location/places/qplacequery.cpp b/src/location/places/qplacequery.cpp
index 43aeacb5..b466e845 100644
--- a/src/location/places/qplacequery.cpp
+++ b/src/location/places/qplacequery.cpp
@@ -164,7 +164,7 @@ int QPlaceQuery::limit() const
 /*!
     Sets the maximum number of places to be fetched to \a limit.
 
-    A limit of -1 indicates that the default limit of the backend should used.
+    A negative limit indicates that the default limit of the backend should used.
     If the backend maximum limit is less than \a limit, then only the
     backend maximum limit number of places are retrieved.
 
diff --git a/src/location/places/qplacereview.cpp b/src/location/places/qplacereview.cpp
index f33c2450..9a4f30db 100644
--- a/src/location/places/qplacereview.cpp
+++ b/src/location/places/qplacereview.cpp
@@ -67,7 +67,7 @@ QPlaceReviewPrivate::QPlaceReviewPrivate(const QPlaceReviewPrivate &other)
     this->title = other.title;
     this->userId = other.userId;
     this->userName = other.userName;
-    this->originatorURL = other.originatorURL;
+    this->originatorUrl = other.originatorUrl;
 }
 
 QPlaceReviewPrivate::~QPlaceReviewPrivate()
@@ -89,7 +89,7 @@ bool QPlaceReviewPrivate::operator==(const QPlaceReviewPrivate &other) const
             && this->title == other.title
             && this->userId == other.userId
             && this->userName == other.userName
-            && this->originatorURL == other.originatorURL
+            && this->originatorUrl == other.originatorUrl
     );
 }
 
@@ -340,15 +340,15 @@ void QPlaceReview::setUserName(const QString &data)
 /*!
     Returns originator URL.
 */
-QString QPlaceReview::originatorURL() const
+QString QPlaceReview::originatorUrl() const
 {
-    return d->originatorURL;
+    return d->originatorUrl;
 }
 
 /*!
-    Sets originator URL.
+    Sets originator \a url of the review.
 */
-void QPlaceReview::setOriginatorURL(const QString &data)
+void QPlaceReview::setOriginatorUrl(const QString &url)
 {
-    d->originatorURL = data;
+    d->originatorUrl = url;
 }
diff --git a/src/location/places/qplacereview.h b/src/location/places/qplacereview.h
index 15889649..616257b1 100644
--- a/src/location/places/qplacereview.h
+++ b/src/location/places/qplacereview.h
@@ -90,8 +90,8 @@ public:
     void setUserId(const QString &data);
     QString userName() const;
     void setUserName(const QString &data);
-    QString originatorURL() const;
-    void setOriginatorURL(const QString &data);
+    QString originatorUrl() const;
+    void setOriginatorUrl(const QString &data);
 
 private:
     QSharedDataPointer<QPlaceReviewPrivate> d;
diff --git a/src/location/places/qplacereview_p.h b/src/location/places/qplacereview_p.h
index 0f9f3bee..197f8215 100644
--- a/src/location/places/qplacereview_p.h
+++ b/src/location/places/qplacereview_p.h
@@ -70,7 +70,7 @@ public:
     QString title;
     QString userId;
     QString userName;
-    QString originatorURL;
+    QString originatorUrl;
 };
 
 QTM_END_NAMESPACE
diff --git a/src/location/places/qplacesupplier.cpp b/src/location/places/qplacesupplier.cpp
index 22696052..5fbc0564 100644
--- a/src/location/places/qplacesupplier.cpp
+++ b/src/location/places/qplacesupplier.cpp
@@ -54,7 +54,7 @@ QPlaceSupplierPrivate::QPlaceSupplierPrivate(const QPlaceSupplierPrivate &other)
     this->name = other.name;
     this->supplierId = other.supplierId;
     this->url = other.url;
-    this->supplierIconURL = other.supplierIconURL;
+    this->supplierIconUrl = other.supplierIconUrl;
 }
 
 QPlaceSupplierPrivate::~QPlaceSupplierPrivate()
@@ -67,7 +67,7 @@ bool QPlaceSupplierPrivate::operator==(const QPlaceSupplierPrivate &other) const
             this->name == other.name
             && this->supplierId == other.supplierId
             && this->url == other.url
-            && this->supplierIconURL == other.supplierIconURL
+            && this->supplierIconUrl == other.supplierIconUrl
     );
 }
 
@@ -149,33 +149,33 @@ void QPlaceSupplier::setSupplierId(const QString &data)
 }
 
 /*!
-    Returns URL.
+    Returns the URL of the supplier.
 */
-QString QPlaceSupplier::URL() const
+QString QPlaceSupplier::url() const
 {
     return d->url;
 }
 
 /*!
-    Sets URL of the icon.
+    Sets \a url of the supplier.
 */
-void QPlaceSupplier::setURL(const QString &data)
+void QPlaceSupplier::setUrl(const QString &url)
 {
-    d->url = data;
+    d->url = url;
 }
 
 /*!
-    Returns URL of the icon.
+    Returns the supplier's icon URL.
 */
-QString QPlaceSupplier::supplierIconURL() const
+QString QPlaceSupplier::supplierIconUrl() const
 {
-    return d->supplierIconURL;
+    return d->supplierIconUrl;
 }
 
 /*!
-    Sets URL of the icon.
+    Sets \a url of the icon of the supplier.
 */
-void QPlaceSupplier::setSupplierIconURL(const QString &data)
+void QPlaceSupplier::setSupplierIconUrl(const QString &url)
 {
-    d->supplierIconURL = data;
+    d->supplierIconUrl = url;
 }
diff --git a/src/location/places/qplacesupplier.h b/src/location/places/qplacesupplier.h
index a92ce624..0bd52ef0 100644
--- a/src/location/places/qplacesupplier.h
+++ b/src/location/places/qplacesupplier.h
@@ -68,10 +68,10 @@ public:
     void setName(const QString &data);
     QString supplierId() const;
     void setSupplierId(const QString &data);
-    QString URL() const;
-    void setURL(const QString &data);
-    QString supplierIconURL() const;
-    void setSupplierIconURL(const QString &data);
+    QString url() const;
+    void setUrl(const QString &data);
+    QString supplierIconUrl() const;
+    void setSupplierIconUrl(const QString &data);
 
 private:
     QSharedDataPointer<QPlaceSupplierPrivate> d;
diff --git a/src/location/places/qplacesupplier_p.h b/src/location/places/qplacesupplier_p.h
index 8832a164..f35536e3 100644
--- a/src/location/places/qplacesupplier_p.h
+++ b/src/location/places/qplacesupplier_p.h
@@ -62,7 +62,7 @@ public:
     QString name;
     QString supplierId;
     QString url;
-    QString supplierIconURL;
+    QString supplierIconUrl;
 };
 
 QTM_END_NAMESPACE
diff --git a/src/location/places/qplaceweekdayhours.cpp b/src/location/places/qplaceweekdayhours.cpp
index 92c77f01..2b949442 100644
--- a/src/location/places/qplaceweekdayhours.cpp
+++ b/src/location/places/qplaceweekdayhours.cpp
@@ -44,7 +44,9 @@
 
 QTM_USE_NAMESPACE
 
-QPlaceWeekdayHoursPrivate::QPlaceWeekdayHoursPrivate() : QSharedData()
+QPlaceWeekdayHoursPrivate::QPlaceWeekdayHoursPrivate()
+    : QSharedData(),
+      weekday(Qt::Monday)
 {
 }