From 9639f9485164ffb2a03d5edf6d5972d4048ea00c Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Fri, 7 Oct 2011 10:06:03 +1000
Subject: Improve naming consistency in Places API.

Change-Id: Ic902592c3367a76fc0e23c237712224abbf31703
Reviewed-on: http://codereview.qt-project.org/6206
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
---
 src/location/places/qplacecontentrequest.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/location/places/qplacecontentrequest.cpp')

diff --git a/src/location/places/qplacecontentrequest.cpp b/src/location/places/qplacecontentrequest.cpp
index f51287dd..e439ecd7 100644
--- a/src/location/places/qplacecontentrequest.cpp
+++ b/src/location/places/qplacecontentrequest.cpp
@@ -46,7 +46,7 @@
 QT_BEGIN_NAMESPACE
 
 QPlaceContentRequestPrivate::QPlaceContentRequestPrivate()
-    : QPlaceRequestPrivate(), contentType(QPlaceContent::InvalidType)
+:   QPlaceRequestPrivate(QPlaceRequest::ContentRequest), contentType(QPlaceContent::InvalidType)
 {
 }
 
@@ -63,8 +63,7 @@ QPlaceContentRequestPrivate::QPlaceContentRequestPrivate(const QPlaceContentRequ
 bool QPlaceContentRequestPrivate::compare(const QPlaceRequestPrivate *other) const
 {
     const QPlaceContentRequestPrivate *od = static_cast<const QPlaceContentRequestPrivate *>(other);
-    return (QPlaceRequestPrivate::compare(other)
-            && this->contentType ==od->contentType);
+    return contentType == od->contentType && QPlaceRequestPrivate::compare(other);
 }
 
 void QPlaceContentRequestPrivate::clear()
-- 
cgit v1.2.1