9 files changed, 17 insertions, 43 deletions
diff --git a/src/location/places/qplacecontent.cpp b/src/location/places/qplacecontent.cpp
index 71f47af5..51a34f23 100644
--- a/src/location/places/qplacecontent.cpp
+++ b/src/location/places/qplacecontent.cpp
@@ -73,6 +73,16 @@ bool QPlaceContent::operator!=(const QPlaceContent &other) const
     return !(*this == other);
 }
 
+QPlaceSupplier QPlaceContent::supplier() const
+{
+    return d_ptr->supplier;
+}
+
+void QPlaceContent::setSupplier(const QPlaceSupplier &supplier)
+{
+    d_ptr->supplier = supplier;
+}
+
 /*!
     \internal
     Constructs a new content object from the given pointer \a d.
diff --git a/src/location/places/qplacecontent.h b/src/location/places/qplacecontent.h
index 0beb2ed9..eece4fce 100644
--- a/src/location/places/qplacecontent.h
+++ b/src/location/places/qplacecontent.h
@@ -57,6 +57,7 @@ QT_BEGIN_NAMESPACE
 #define Q_DECLARE_CONTENT_COPY_CTOR(Class) \
     Class(const QPlaceContent &other);
 
+class QPlaceSupplier;
 class QPlaceContentPrivate;
 class Q_LOCATION_EXPORT QPlaceContent
 {
@@ -81,6 +82,9 @@ public:
 
     QPlaceContent::Type type() const;
 
+    QPlaceSupplier supplier() const;
+    void setSupplier(const QPlaceSupplier &supplier);
+
 protected:
     explicit QPlaceContent(QPlaceContentPrivate *d);
     QSharedDataPointer<QPlaceContentPrivate> d_ptr;
diff --git a/src/location/places/qplacecontent_p.h b/src/location/places/qplacecontent_p.h
index d3b258d0..50b1b790 100644
--- a/src/location/places/qplacecontent_p.h
+++ b/src/location/places/qplacecontent_p.h
@@ -54,11 +54,11 @@
 //
 
 #include "qplacecontent.h"
+#include "qplacesupplier.h"
 
 #include <QSharedData>
 #include <QString>
 
-
 QT_BEGIN_NAMESPACE
 
 
@@ -92,6 +92,8 @@ public:
 
     /* Helper functions for C++ protection rules */
     static const QSharedDataPointer<QPlaceContentPrivate>& extract_d(const QPlaceContent& other) {return other.d_ptr;}
+
+    QPlaceSupplier supplier;
 };
 
 #if defined(Q_CC_MWERKS)
diff --git a/src/location/places/qplaceimage.cpp b/src/location/places/qplaceimage.cpp
index 0353a9a3..8053e45f 100644
--- a/src/location/places/qplaceimage.cpp
+++ b/src/location/places/qplaceimage.cpp
@@ -197,21 +197,3 @@ void QPlaceImage::setMimeType(const QString &data)
     Q_D(QPlaceImage);
     d->mimeType = data;
 }
-
-/*!
-    Returns supplier.
-*/
-QPlaceSupplier QPlaceImage::supplier() const
-{
-    Q_D(const QPlaceImage);
-    return d->supplier;
-}
-
-/*!
-    Sets supplier.
-*/
-void QPlaceImage::setSupplier(const QPlaceSupplier &data)
-{
-    Q_D(QPlaceImage);
-    d->supplier = data;
-}
diff --git a/src/location/places/qplaceimage.h b/src/location/places/qplaceimage.h
index f5a9f717..ca0d5357 100644
--- a/src/location/places/qplaceimage.h
+++ b/src/location/places/qplaceimage.h
@@ -72,8 +72,6 @@ public:
     void setMetaInfo(const QString &data);
     QString mimeType() const;
     void setMimeType(const QString &data);
-    QPlaceSupplier supplier() const;
-    void setSupplier(const QPlaceSupplier &data);
 
 private:
     Q_DECLARE_CONTENT_D_FUNC(QPlaceImage)
diff --git a/src/location/places/qplaceimage_p.h b/src/location/places/qplaceimage_p.h
index d0470ef9..c3512ba0 100644
--- a/src/location/places/qplaceimage_p.h
+++ b/src/location/places/qplaceimage_p.h
@@ -67,7 +67,6 @@ public:
     QString id;
     QString metaInfo;
     QString mimeType;
-    QPlaceSupplier supplier;
 };
 
 QT_END_NAMESPACE
diff --git a/src/location/places/qplacereview.cpp b/src/location/places/qplacereview.cpp
index 720f62c3..bbbb3ebd 100644
--- a/src/location/places/qplacereview.cpp
+++ b/src/location/places/qplacereview.cpp
@@ -278,24 +278,6 @@ void QPlaceReview::setReviewId(const QString &data)
 }
 
 /*!
-    Returns supplier. Do not remove it.
-*/
-QPlaceSupplier QPlaceReview::supplier() const
-{
-    Q_D(const QPlaceReview);
-    return d->supplier;
-}
-
-/*!
-    Sets supplier.
-*/
-void QPlaceReview::setSupplier(const QPlaceSupplier &data)
-{
-    Q_D(QPlaceReview);
-    d->supplier = data;
-}
-
-/*!
     Returns review title.
 */
 QString QPlaceReview::title() const
diff --git a/src/location/places/qplacereview.h b/src/location/places/qplacereview.h
index 08e11b23..bfb39f67 100644
--- a/src/location/places/qplacereview.h
+++ b/src/location/places/qplacereview.h
@@ -76,8 +76,6 @@ public:
     void setRating(const qreal &data);
     QString reviewId() const;
     void setReviewId(const QString &data);
-    QPlaceSupplier supplier() const;
-    void setSupplier(const QPlaceSupplier &data);
     QString title() const;
     void setTitle(const QString &data);
     QString userId() const;
diff --git a/src/location/places/qplacereview_p.h b/src/location/places/qplacereview_p.h
index 4a3910ff..ccd01428 100644
--- a/src/location/places/qplacereview_p.h
+++ b/src/location/places/qplacereview_p.h
@@ -69,7 +69,6 @@ public:
     int unhelpfulVotings;
     qreal rating;
     QString reviewId;
-    QPlaceSupplier supplier;
     QString title;
     QString userId;
     QString userName;