From bc49b871f1c5c69ccefb18f87db1f3f94a995a56 Mon Sep 17 00:00:00 2001 From: Alex Wilson Date: Tue, 15 May 2012 15:38:49 +1000 Subject: Coding style fixes: whitespace around pointers/references Change-Id: Ie527591e2d9a1578137136fb6664e86c43eed1bf Reviewed-by: Thomas Lowe Reviewed-by: Alex Wilson --- src/location/places/placemacro.h | 14 +++++++------- src/location/places/qplace.cpp | 6 +++--- src/location/places/qplace.h | 2 +- src/location/places/qplaceattribute_p.h | 2 +- src/location/places/qplacecontent.h | 4 ++-- src/location/places/qplacecontent_p.h | 14 +++++++------- src/location/places/qplacecontentrequest.cpp | 4 ++-- src/location/places/qplacecontentrequest.h | 2 +- src/location/places/qplaceicon.cpp | 2 +- src/location/places/qplacemanager.cpp | 4 ++-- src/location/places/qplacemanagerengine.cpp | 2 +- src/location/places/qplacematchrequest.cpp | 4 ++-- src/location/places/qplacematchrequest.h | 2 +- src/location/places/qplacesearchrequest.cpp | 4 ++-- src/location/places/qplacesearchrequest.h | 2 +- 15 files changed, 34 insertions(+), 34 deletions(-) (limited to 'src/location/places') diff --git a/src/location/places/placemacro.h b/src/location/places/placemacro.h index b8e7761a..14ee8090 100644 --- a/src/location/places/placemacro.h +++ b/src/location/places/placemacro.h @@ -51,23 +51,23 @@ QT_BEGIN_NAMESPACE #define Q_DECLARE_D_FUNC(Class) \ - inline Class##Private* d_func(); \ - inline const Class##Private* d_func() const;\ + inline Class##Private *d_func(); \ + inline const Class##Private *d_func() const;\ friend class Class##Private; #define Q_DECLARE_COPY_CTOR(Class, BaseClass) \ Class(const BaseClass &other); #define Q_IMPLEMENT_D_FUNC(Class) \ - Class##Private* Class::d_func() { return reinterpret_cast(d_ptr.data()); } \ - const Class##Private* Class::d_func() const { return reinterpret_cast(d_ptr.constData()); } + Class##Private *Class::d_func() { return reinterpret_cast(d_ptr.data()); } \ + const Class##Private *Class::d_func() const { return reinterpret_cast(d_ptr.constData()); } #define Q_IMPLEMENT_COPY_CTOR(Class, BaseClass) \ - Class::Class(const BaseClass& other) : BaseClass() { Class##Private::copyIfPossible(d_ptr, other); } + Class::Class(const BaseClass &other) : BaseClass() { Class##Private::copyIfPossible(d_ptr, other); } #define Q_DEFINE_PRIVATE_HELPER(Class, BaseClass, ClassType) \ - BaseClass##Private* clone() const { return new Class##Private(*this); } \ - static void copyIfPossible(QSharedDataPointer& d_ptr, const BaseClass &other) \ + BaseClass##Private *clone() const { return new Class##Private(*this); } \ + static void copyIfPossible(QSharedDataPointer &d_ptr, const BaseClass &other) \ { \ if (other.type() == ClassType) \ d_ptr = extract_d(other); \ diff --git a/src/location/places/qplace.cpp b/src/location/places/qplace.cpp index 926b0ce5..f6743a80 100644 --- a/src/location/places/qplace.cpp +++ b/src/location/places/qplace.cpp @@ -153,12 +153,12 @@ QPlace &QPlace::operator= (const QPlace & other) return *this; } -inline QPlacePrivate* QPlace::d_func() +inline QPlacePrivate *QPlace::d_func() { return static_cast(d_ptr.data()); } -inline const QPlacePrivate* QPlace::d_func() const +inline const QPlacePrivate *QPlace::d_func() const { return static_cast(d_ptr.constData()); } @@ -647,7 +647,7 @@ QPlacePrivate::QPlacePrivate(const QPlacePrivate &other) QPlacePrivate::~QPlacePrivate() {} -QPlacePrivate& QPlacePrivate::operator= (const QPlacePrivate & other) +QPlacePrivate &QPlacePrivate::operator= (const QPlacePrivate & other) { if (this == &other) return *this; diff --git a/src/location/places/qplace.h b/src/location/places/qplace.h index c3bfc34d..9ab0a5ec 100644 --- a/src/location/places/qplace.h +++ b/src/location/places/qplace.h @@ -73,7 +73,7 @@ public: QPlace(const QPlace &other); ~QPlace(); - QPlace& operator=(const QPlace &other); + QPlace &operator=(const QPlace &other); bool operator==(const QPlace &other) const; bool operator!=(const QPlace &other) const; diff --git a/src/location/places/qplaceattribute_p.h b/src/location/places/qplaceattribute_p.h index b8f94d33..c5fb862f 100644 --- a/src/location/places/qplaceattribute_p.h +++ b/src/location/places/qplaceattribute_p.h @@ -68,7 +68,7 @@ public: virtual bool operator== (const QPlaceAttributePrivate &other) const; - virtual QPlaceAttributePrivate* clone() const { return new QPlaceAttributePrivate(*this); } + virtual QPlaceAttributePrivate *clone() const { return new QPlaceAttributePrivate(*this); } bool isEmpty() const; diff --git a/src/location/places/qplacecontent.h b/src/location/places/qplacecontent.h index b75a9740..8581e535 100644 --- a/src/location/places/qplacecontent.h +++ b/src/location/places/qplacecontent.h @@ -54,8 +54,8 @@ QT_BEGIN_NAMESPACE #define Q_DECLARE_CONTENT_D_FUNC(Class) \ - inline Class##Private* d_func(); \ - inline const Class##Private* d_func() const;\ + inline Class##Private *d_func(); \ + inline const Class##Private *d_func() const;\ friend class Class##Private; #define Q_DECLARE_CONTENT_COPY_CTOR(Class) \ diff --git a/src/location/places/qplacecontent_p.h b/src/location/places/qplacecontent_p.h index 4fbc9e60..ee9fb8d5 100644 --- a/src/location/places/qplacecontent_p.h +++ b/src/location/places/qplacecontent_p.h @@ -65,16 +65,16 @@ QT_BEGIN_NAMESPACE #define Q_IMPLEMENT_CONTENT_D_FUNC(Class) \ - Class##Private* Class::d_func() { return reinterpret_cast(d_ptr.data()); } \ - const Class##Private* Class::d_func() const { return reinterpret_cast(d_ptr.constData()); } \ + Class##Private *Class::d_func() { return reinterpret_cast(d_ptr.data()); } \ + const Class##Private *Class::d_func() const { return reinterpret_cast(d_ptr.constData()); } \ #define Q_IMPLEMENT_CONTENT_COPY_CTOR(Class) \ - Class::Class(const QPlaceContent& other) : QPlaceContent() { Class##Private::copyIfPossible(d_ptr, other); } + Class::Class(const QPlaceContent &other) : QPlaceContent() { Class##Private::copyIfPossible(d_ptr, other); } #define Q_DEFINE_CONTENT_PRIVATE_HELPER(Class, ContentType) \ - QPlaceContentPrivate* clone() const { return new Class##Private(*this); } \ + QPlaceContentPrivate *clone() const { return new Class##Private(*this); } \ virtual QPlaceContent::Type type() const {return ContentType;} \ - static void copyIfPossible(QSharedDataPointer& d_ptr, const QPlaceContent& other) \ + static void copyIfPossible(QSharedDataPointer &d_ptr, const QPlaceContent &other) \ { \ if (other.type() == ContentType) \ d_ptr = extract_d(other); \ @@ -89,11 +89,11 @@ public: virtual ~QPlaceContentPrivate(){} virtual bool compare(const QPlaceContentPrivate *other) const; - virtual QPlaceContentPrivate* clone() const = 0; + virtual QPlaceContentPrivate *clone() const = 0; virtual QPlaceContent::Type type() const = 0; /* Helper functions for C++ protection rules */ - static const QSharedDataPointer& extract_d(const QPlaceContent& other) {return other.d_ptr;} + static const QSharedDataPointer &extract_d(const QPlaceContent &other) {return other.d_ptr;} QPlaceSupplier supplier; QPlaceUser user; diff --git a/src/location/places/qplacecontentrequest.cpp b/src/location/places/qplacecontentrequest.cpp index a48ffb37..9c5ac14e 100644 --- a/src/location/places/qplacecontentrequest.cpp +++ b/src/location/places/qplacecontentrequest.cpp @@ -224,12 +224,12 @@ void QPlaceContentRequest::clear() d->clear(); } -inline QPlaceContentRequestPrivate* QPlaceContentRequest::d_func() +inline QPlaceContentRequestPrivate *QPlaceContentRequest::d_func() { return static_cast(d_ptr.data()); } -inline const QPlaceContentRequestPrivate* QPlaceContentRequest::d_func() const +inline const QPlaceContentRequestPrivate *QPlaceContentRequest::d_func() const { return static_cast(d_ptr.constData()); } diff --git a/src/location/places/qplacecontentrequest.h b/src/location/places/qplacecontentrequest.h index 3d7100ca..034411dd 100644 --- a/src/location/places/qplacecontentrequest.h +++ b/src/location/places/qplacecontentrequest.h @@ -61,7 +61,7 @@ public: QPlaceContentRequest(const QPlaceContentRequest &other); ~QPlaceContentRequest(); - QPlaceContentRequest& operator=(const QPlaceContentRequest &other); + QPlaceContentRequest &operator=(const QPlaceContentRequest &other); bool operator==(const QPlaceContentRequest &other) const; bool operator!=(const QPlaceContentRequest &other) const; diff --git a/src/location/places/qplaceicon.cpp b/src/location/places/qplaceicon.cpp index 8db4dfe0..205ae5e1 100644 --- a/src/location/places/qplaceicon.cpp +++ b/src/location/places/qplaceicon.cpp @@ -51,7 +51,7 @@ QPlaceIconPrivate::QPlaceIconPrivate() { } -QPlaceIconPrivate::QPlaceIconPrivate(const QPlaceIconPrivate&other) +QPlaceIconPrivate::QPlaceIconPrivate(const QPlaceIconPrivate &other) : QSharedData(other), manager(other.manager), parameters(other.parameters) diff --git a/src/location/places/qplacemanager.cpp b/src/location/places/qplacemanager.cpp index 68ba0df5..0cd9aee7 100644 --- a/src/location/places/qplacemanager.cpp +++ b/src/location/places/qplacemanager.cpp @@ -416,7 +416,7 @@ QPlaceMatchReply *QPlaceManager::matchingPlaces(const QPlaceMatchRequest &reques } /*! - \fn void QPlaceManager::finished(QPlaceReply* reply) + \fn void QPlaceManager::finished(QPlaceReply *reply) This signal is emitted when \a reply has finished processing. @@ -430,7 +430,7 @@ QPlaceMatchReply *QPlaceManager::matchingPlaces(const QPlaceMatchRequest &reques */ /*! - \fn void QPlaceManager::error(QPlaceReply* reply, QPlaceReply::Error error, const QString &errorString) + \fn void QPlaceManager::error(QPlaceReply *reply, QPlaceReply::Error error, const QString &errorString) This signal is emitted when an error has been detected in the processing of \a reply. The QPlaceManager::finished() signal will probably follow. diff --git a/src/location/places/qplacemanagerengine.cpp b/src/location/places/qplacemanagerengine.cpp index 66f7410e..f53fd331 100644 --- a/src/location/places/qplacemanagerengine.cpp +++ b/src/location/places/qplacemanagerengine.cpp @@ -379,7 +379,7 @@ QPlaceManagerEnginePrivate::~QPlaceManagerEnginePrivate() } /*! - \fn void QPlaceManagerEngine::finished(QPlaceReply* reply) + \fn void QPlaceManagerEngine::finished(QPlaceReply *reply) This signal is emitted when \a reply has finished processing. diff --git a/src/location/places/qplacematchrequest.cpp b/src/location/places/qplacematchrequest.cpp index 963ec977..a1c87aa6 100644 --- a/src/location/places/qplacematchrequest.cpp +++ b/src/location/places/qplacematchrequest.cpp @@ -246,12 +246,12 @@ void QPlaceMatchRequest::clear() d->clear(); } -inline QPlaceMatchRequestPrivate* QPlaceMatchRequest::d_func() +inline QPlaceMatchRequestPrivate *QPlaceMatchRequest::d_func() { return static_cast(d_ptr.data()); } -inline const QPlaceMatchRequestPrivate* QPlaceMatchRequest::d_func() const +inline const QPlaceMatchRequestPrivate *QPlaceMatchRequest::d_func() const { return static_cast(d_ptr.constData()); } diff --git a/src/location/places/qplacematchrequest.h b/src/location/places/qplacematchrequest.h index 459d3ef7..7bca1256 100644 --- a/src/location/places/qplacematchrequest.h +++ b/src/location/places/qplacematchrequest.h @@ -62,7 +62,7 @@ public: QPlaceMatchRequest(const QPlaceMatchRequest &other); - QPlaceMatchRequest& operator=(const QPlaceMatchRequest &other); + QPlaceMatchRequest &operator=(const QPlaceMatchRequest &other); bool operator==(const QPlaceMatchRequest &other) const; bool operator!=(const QPlaceMatchRequest &other) const; diff --git a/src/location/places/qplacesearchrequest.cpp b/src/location/places/qplacesearchrequest.cpp index 05568000..ad654891 100644 --- a/src/location/places/qplacesearchrequest.cpp +++ b/src/location/places/qplacesearchrequest.cpp @@ -422,12 +422,12 @@ void QPlaceSearchRequest::clear() d->clear(); } -inline QPlaceSearchRequestPrivate* QPlaceSearchRequest::d_func() +inline QPlaceSearchRequestPrivate *QPlaceSearchRequest::d_func() { return static_cast(d_ptr.data()); } -inline const QPlaceSearchRequestPrivate* QPlaceSearchRequest::d_func() const +inline const QPlaceSearchRequestPrivate *QPlaceSearchRequest::d_func() const { return static_cast(d_ptr.constData()); } diff --git a/src/location/places/qplacesearchrequest.h b/src/location/places/qplacesearchrequest.h index 6cbcc5ad..256d3df9 100644 --- a/src/location/places/qplacesearchrequest.h +++ b/src/location/places/qplacesearchrequest.h @@ -69,7 +69,7 @@ public: QPlaceSearchRequest(const QPlaceSearchRequest &other); - QPlaceSearchRequest& operator=(const QPlaceSearchRequest &other); + QPlaceSearchRequest &operator=(const QPlaceSearchRequest &other); bool operator==(const QPlaceSearchRequest &other) const; bool operator!=(const QPlaceSearchRequest &other) const; -- cgit v1.2.1