Remove BusinessInformation,BusinessFeature and weekdayhours

These have beens superseded by the PlaceAttribute class.

We do not have attribute keys for the closing notes,at they moment
they are pointless without a time period that is relevant for the
closing note.

We do not have attribute key for the opening hours yet since we have
yet to implement that in the plugin.

we do no yet attribute keys for business features because we never
had any to work with from the start.

Change-Id: I1a8749b1a598b4928a9c197cb5f4bde7615cdf8f
Reviewed-on: http://codereview.qt.nokia.com/2949
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: abcd <qt_abcd1@ovi.com>

9 files changed, 2 insertions, 742 deletions

diff --git a/src/imports/location/declarativeplaces/declarativeplaces.pri b/src/imports/location/declarativeplaces/declarativeplaces.pri
index 9127626f..42e08252 100644
--- a/src/imports/location/declarativeplaces/declarativeplaces.pri
+++ b/src/imports/location/declarativeplaces/declarativeplaces.pri
@@ -8,19 +8,15 @@ SOURCES += \
     declarativeplaces/qdeclarativereviewmodel.cpp \
     declarativeplaces/qdeclarativemediamodel.cpp \
 #data
-    declarativeplaces/qdeclarativebusinessfeature.cpp \
-    declarativeplaces/qdeclarativebusinessinformation.cpp \
     declarativeplaces/qdeclarativecategory.cpp \
     declarativeplaces/qdeclarativedescription.cpp \
     declarativeplaces/qdeclarativemediaobject.cpp \
-    declarativeplaces/qdeclarativeperiod.cpp \
     declarativeplaces/qdeclarativeplace.cpp \
     declarativeplaces/qdeclarativeplaceattribute.cpp \
     declarativeplaces/qdeclarativerating.cpp \
     declarativeplaces/qdeclarativereview.cpp \
     declarativeplaces/qdeclarativesearchresult.cpp \
-    declarativeplaces/qdeclarativesupplier.cpp \
-    declarativeplaces/qdeclarativeweekdayhours.cpp
+    declarativeplaces/qdeclarativesupplier.cpp
 
 HEADERS += \
 #models
@@ -31,19 +27,15 @@ HEADERS += \
     declarativeplaces/qdeclarativereviewmodel_p.h \
     declarativeplaces/qdeclarativemediamodel_p.h \
 #data
-    declarativeplaces/qdeclarativebusinessfeature_p.h \
-    declarativeplaces/qdeclarativebusinessinformation_p.h \
     declarativeplaces/qdeclarativecategory_p.h \
     declarativeplaces/qdeclarativedescription_p.h \
     declarativeplaces/qdeclarativemediaobject_p.h \
-    declarativeplaces/qdeclarativeperiod_p.h \
     declarativeplaces/qdeclarativeplace_p.h \
     declarativeplaces/qdeclarativeplaceattribute_p.h \
     declarativeplaces/qdeclarativerating_p.h \
     declarativeplaces/qdeclarativereview_p.h \
     declarativeplaces/qdeclarativesearchresult_p.h \
-    declarativeplaces/qdeclarativesupplier_p.h \
-    declarativeplaces/qdeclarativeweekdayhours_p.h
+    declarativeplaces/qdeclarativesupplier_p.h
 
 
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativebusinessinformation.cpp b/src/imports/location/declarativeplaces/qdeclarativebusinessinformation.cpp
deleted file mode 100644
index bf0c7701..00000000
--- a/src/imports/location/declarativeplaces/qdeclarativebusinessinformation.cpp
+++ /dev/null
@@ -1,357 +0,0 @@
-#include "qdeclarativebusinessinformation_p.h"
-
-QT_USE_NAMESPACE
-
-/*!
-    \qmlclass BusinessInformation
-
-    \brief The BusinessInformation element holds business information data.
-    \inherits QObject
-
-    BusinessInformation cointains many properties holding data of the place like
-    business features, openning hours, etc.
-
-    \ingroup qml-places
-*/
-
-QDeclarativeBusinessInformation::QDeclarativeBusinessInformation(QObject* parent)
-        : QObject(parent)
-{
-}
-
-QDeclarativeBusinessInformation::QDeclarativeBusinessInformation(const QPlaceBusinessInformation &src,
-        QObject *parent)
-        : QObject(parent),
-          m_src(src)
-{
-    synchronizeFeatures();
-    synchronizeOpeningHours();
-    synchronizeAnnualClosings();
-}
-
-QDeclarativeBusinessInformation::~QDeclarativeBusinessInformation()
-{
-}
-
-void QDeclarativeBusinessInformation::setBusinessInformation(const QPlaceBusinessInformation &src)
-{
-    QPlaceBusinessInformation previous = m_src;
-    m_src = src;
-
-    if (previous.additionalData() != m_src.additionalData()) {
-        emit additionalDataChanged();
-    }
-    if (previous.features() != m_src.features()) {
-        synchronizeFeatures();
-        emit featuresChanged();
-    }
-    if (previous.openingHours() != m_src.openingHours()) {
-        synchronizeOpeningHours();
-        emit openingHoursChanged();
-    }
-    if (previous.annualClosings() != m_src.annualClosings()) {
-        synchronizeAnnualClosings();
-        emit annualClosingsChanged();
-    }
-    if (previous.annualClosingNote() != m_src.annualClosingNote()) {
-        emit annualClosingNoteChanged();
-    }
-    if (previous.openingNote() != m_src.openingNote()) {
-        emit openingNoteChanged();
-    }
-    if (previous.paymentMethods() != m_src.paymentMethods()) {
-        emit paymentMethodsChanged();
-    }
-}
-
-QPlaceBusinessInformation QDeclarativeBusinessInformation::businessInformation()
-{
-    QList<QPlaceBusinessFeature> featureList;
-    foreach (QDeclarativeBusinessFeature *value, m_features) {
-        featureList.append(value->businessFeature());
-    }
-    m_src.setFeatures(featureList);
-    QList<QPlaceWeekdayHours> openingList;
-    foreach (QDeclarativeWeekdayHours *value, m_openingHours) {
-        openingList.append(value->weekdayHours());
-    }
-    m_src.setOpeningHours(openingList);
-    QList<QPlacePeriod> annualClosingsList;
-    foreach (QDeclarativePeriod *value, m_annualClosings) {
-        annualClosingsList.append(value->period());
-    }
-    m_src.setAnnualClosings(annualClosingsList);
-    return m_src;
-}
-
-/*!
-    \qmlproperty QVariantHash BusinessInformation::additionalData
-
-    This property holds additional data for business information.
-    Those are pairs of strings (key/value).
-*/
-
-void QDeclarativeBusinessInformation::setAdditionalData(const QVariantHash &additionalData)
-{
-    if (m_src.additionalData() != additionalData) {
-        m_src.setAdditionalData(additionalData);
-        emit additionalDataChanged();
-    }
-}
-
-QVariantHash QDeclarativeBusinessInformation::additionalData() const
-{
-    return m_src.additionalData();
-}
-
-/*!
-    \qmlproperty string BusinessInformation::annualClosingNote
-
-    This property holds annual closing note.
-*/
-void QDeclarativeBusinessInformation::setAnnualClosingNote(const QString &data)
-{
-    if (m_src.annualClosingNote() != data) {
-        m_src.setAnnualClosingNote(data);
-        emit annualClosingNoteChanged();
-    }
-}
-
-QString QDeclarativeBusinessInformation::annualClosingNote() const
-{
-    return m_src.annualClosingNote();
-}
-
-/*!
-    \qmlproperty string BusinessInformation::openingNote
-
-    This property holds oppening note.
-*/
-void QDeclarativeBusinessInformation::setOpeningNote(const QString &data)
-{
-    if (m_src.openingNote() != data) {
-        m_src.setOpeningNote(data);
-        emit annualClosingNoteChanged();
-    }
-}
-
-QString QDeclarativeBusinessInformation::openingNote() const
-{
-    return m_src.openingNote();
-}
-
-/*!
-    \qmlproperty stringlist BusinessInformation::paymentMethods
-
-    This property holds payment methods list.
-*/
-void QDeclarativeBusinessInformation::setPaymentMethods(const QStringList &data)
-{
-    if (m_src.paymentMethods() != data) {
-        m_src.setPaymentMethods(data);
-        emit paymentMethodsChanged();
-    }
-}
-
-QStringList QDeclarativeBusinessInformation::paymentMethods() const
-{
-    return m_src.paymentMethods();
-}
-
-/*!
-    \qmlproperty QDeclarativeListProperty<QDeclarativeBusinessFeature> BusinessInformation::features
-
-    This property holds business featyres list.
-
-    Note: this property's changed() signal is currently emitted only if the
-    whole element changes, not if only the contents of the element change.
-*/
-QDeclarativeListProperty<QDeclarativeBusinessFeature> QDeclarativeBusinessInformation::features()
-{
-    return QDeclarativeListProperty<QDeclarativeBusinessFeature>(this,
-                                                          0, // opaque data parameter
-                                                          features_append,
-                                                          features_count,
-                                                          features_at,
-                                                          features_clear);
-}
-
-void QDeclarativeBusinessInformation::features_append(QDeclarativeListProperty<QDeclarativeBusinessFeature> *prop,
-                                                  QDeclarativeBusinessFeature *value)
-{
-    QDeclarativeBusinessInformation* object = static_cast<QDeclarativeBusinessInformation*>(prop->object);
-    QDeclarativeBusinessFeature *altValue = new QDeclarativeBusinessFeature(object);
-    altValue->setBusinessFeature(value->businessFeature());
-    object->m_features.append(altValue);
-    QList<QPlaceBusinessFeature> list = object->m_src.features();
-    list.append(value->businessFeature());
-    object->m_src.setFeatures(list);
-    emit object->featuresChanged();
-}
-
-int QDeclarativeBusinessInformation::features_count(QDeclarativeListProperty<QDeclarativeBusinessFeature> *prop)
-{
-    return static_cast<QDeclarativeBusinessInformation*>(prop->object)->m_features.count();
-}
-
-QDeclarativeBusinessFeature* QDeclarativeBusinessInformation::features_at(QDeclarativeListProperty<QDeclarativeBusinessFeature> *prop,
-                                                                          int index)
-{
-    QDeclarativeBusinessInformation* object = static_cast<QDeclarativeBusinessInformation*>(prop->object);
-    QDeclarativeBusinessFeature *res = NULL;
-    if (object->m_features.count() > index && index > -1) {
-        res = object->m_features[index];
-    }
-    return res;
-}
-
-void QDeclarativeBusinessInformation::features_clear(QDeclarativeListProperty<QDeclarativeBusinessFeature> *prop)
-{
-    QDeclarativeBusinessInformation* object = static_cast<QDeclarativeBusinessInformation*>(prop->object);
-    qDeleteAll(object->m_features);
-    object->m_features.clear();
-    object->m_src.setFeatures(QList<QPlaceBusinessFeature>());
-    emit object->featuresChanged();
-}
-
-void QDeclarativeBusinessInformation::synchronizeFeatures()
-{
-    qDeleteAll(m_features);
-    m_features.clear();
-    foreach (QPlaceBusinessFeature value, m_src.features()) {
-        QDeclarativeBusinessFeature* declarativeValue = new QDeclarativeBusinessFeature(value, this);
-        m_features.append(declarativeValue);
-    }
-}
-
-/*!
-    \qmlproperty QDeclarativeListProperty<QDeclarativeWeekdayHours> BusinessInformation::openingHours
-
-    This property opening hours list.
-
-    Note: this property's changed() signal is currently emitted only if the
-    whole element changes, not if only the contents of the element change.
-*/
-QDeclarativeListProperty<QDeclarativeWeekdayHours> QDeclarativeBusinessInformation::openingHours()
-{
-    return QDeclarativeListProperty<QDeclarativeWeekdayHours>(this,
-                                                          0, // opaque data parameter
-                                                          openingHours_append,
-                                                          openingHours_count,
-                                                          openingHours_at,
-                                                          openingHours_clear);
-}
-
-void QDeclarativeBusinessInformation::openingHours_append(QDeclarativeListProperty<QDeclarativeWeekdayHours> *prop,
-                                                  QDeclarativeWeekdayHours *value)
-{
-    QDeclarativeBusinessInformation* object = static_cast<QDeclarativeBusinessInformation*>(prop->object);
-    QDeclarativeWeekdayHours *altValue = new QDeclarativeWeekdayHours(object);
-    altValue->setWeekdayHours(value->weekdayHours());
-    object->m_openingHours.append(altValue);
-    QList<QPlaceWeekdayHours> list = object->m_src.openingHours();
-    list.append(value->weekdayHours());
-    object->m_src.setOpeningHours(list);
-    emit object->openingHoursChanged();
-}
-
-int QDeclarativeBusinessInformation::openingHours_count(QDeclarativeListProperty<QDeclarativeWeekdayHours> *prop)
-{
-    return static_cast<QDeclarativeBusinessInformation*>(prop->object)->m_openingHours.count();
-}
-
-QDeclarativeWeekdayHours* QDeclarativeBusinessInformation::openingHours_at(QDeclarativeListProperty<QDeclarativeWeekdayHours> *prop,
-                                                                          int index)
-{
-    QDeclarativeBusinessInformation* object = static_cast<QDeclarativeBusinessInformation*>(prop->object);
-    QDeclarativeWeekdayHours *res = NULL;
-    if (object->m_openingHours.count() > index && index > -1) {
-        res = object->m_openingHours[index];
-    }
-    return res;
-}
-
-void QDeclarativeBusinessInformation::openingHours_clear(QDeclarativeListProperty<QDeclarativeWeekdayHours> *prop)
-{
-    QDeclarativeBusinessInformation* object = static_cast<QDeclarativeBusinessInformation*>(prop->object);
-    qDeleteAll(object->m_openingHours);
-    object->m_openingHours.clear();
-    object->m_src.setOpeningHours(QList<QPlaceWeekdayHours>());
-    emit object->openingHoursChanged();
-}
-
-void QDeclarativeBusinessInformation::synchronizeOpeningHours()
-{
-    qDeleteAll(m_openingHours);
-    m_openingHours.clear();
-    foreach (QPlaceWeekdayHours value, m_src.openingHours()) {
-        QDeclarativeWeekdayHours* declarativeValue = new QDeclarativeWeekdayHours(value, this);
-        m_openingHours.append(declarativeValue);
-    }
-}
-
-/*!
-    \qmlproperty QDeclarativeListProperty<QDeclarativePeriod> BusinessInformation::annualClosings
-
-    This property annual closings list.
-
-    Note: this property's changed() signal is currently emitted only if the
-    whole element changes, not if only the contents of the element change.
-*/
-QDeclarativeListProperty<QDeclarativePeriod> QDeclarativeBusinessInformation::annualClosings()
-{
-    return QDeclarativeListProperty<QDeclarativePeriod>(this,
-                                                          0, // opaque data parameter
-                                                          annualClosings_append,
-                                                          annualClosings_count,
-                                                          annualClosings_at,
-                                                          annualClosings_clear);
-}
-
-void QDeclarativeBusinessInformation::annualClosings_append(QDeclarativeListProperty<QDeclarativePeriod> *prop,
-                                                  QDeclarativePeriod *value)
-{
-    QDeclarativeBusinessInformation* object = static_cast<QDeclarativeBusinessInformation*>(prop->object);
-    QDeclarativePeriod *altValue = new QDeclarativePeriod(object);
-    altValue->setPeriod(value->period());
-    object->m_annualClosings.append(altValue);
-    QList<QPlacePeriod> list = object->m_src.annualClosings();
-    list.append(value->period());
-    object->m_src.setAnnualClosings(list);
-    emit object->annualClosingNoteChanged();
-}
-
-int QDeclarativeBusinessInformation::annualClosings_count(QDeclarativeListProperty<QDeclarativePeriod> *prop)
-{
-    return static_cast<QDeclarativeBusinessInformation*>(prop->object)->m_annualClosings.count();
-}
-
-QDeclarativePeriod* QDeclarativeBusinessInformation::annualClosings_at(QDeclarativeListProperty<QDeclarativePeriod> *prop,
-                                                                          int index)
-{
-    QDeclarativeBusinessInformation* object = static_cast<QDeclarativeBusinessInformation*>(prop->object);
-    QDeclarativePeriod *res = NULL;
-    if (object->m_annualClosings.count() > index && index > -1) {
-        res = object->m_annualClosings[index];
-    }
-    return res;
-}
-
-void QDeclarativeBusinessInformation::annualClosings_clear(QDeclarativeListProperty<QDeclarativePeriod> *prop)
-{
-    QDeclarativeBusinessInformation* object = static_cast<QDeclarativeBusinessInformation*>(prop->object);
-    qDeleteAll(object->m_annualClosings);
-    object->m_annualClosings.clear();
-    object->m_src.setAnnualClosings(QList<QPlacePeriod>());
-    emit object->annualClosingNoteChanged();
-}
-
-void QDeclarativeBusinessInformation::synchronizeAnnualClosings()
-{
-    qDeleteAll(m_annualClosings);
-    m_annualClosings.clear();
-    foreach (QPlacePeriod value, m_src.annualClosings()) {
-        QDeclarativePeriod* declarativeValue = new QDeclarativePeriod(value, this);
-        m_annualClosings.append(declarativeValue);
-    }
-}
diff --git a/src/imports/location/declarativeplaces/qdeclarativebusinessinformation_p.h b/src/imports/location/declarativeplaces/qdeclarativebusinessinformation_p.h
deleted file mode 100644
index abb73857..00000000
--- a/src/imports/location/declarativeplaces/qdeclarativebusinessinformation_p.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef QDECLARATIVEBUSINESSINFORMATION_P_H
-#define QDECLARATIVEBUSINESSINFORMATION_P_H
-
-#include <QObject>
-#include <QDeclarativeListProperty>
-#include <qplacebusinessinformation.h>
-#include "qdeclarativebusinessfeature_p.h"
-#include "qdeclarativeperiod_p.h"
-#include "qdeclarativeweekdayhours_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeBusinessInformation : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QVariantHash additionalData READ additionalData WRITE setAdditionalData NOTIFY additionalDataChanged);
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeBusinessFeature> features READ features NOTIFY featuresChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeWeekdayHours> openingHours READ openingHours NOTIFY openingHoursChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativePeriod> annualClosings READ annualClosings NOTIFY annualClosingsChanged)
-    Q_PROPERTY(QString annualClosingNote READ annualClosingNote WRITE setAnnualClosingNote NOTIFY annualClosingNoteChanged);
-    Q_PROPERTY(QString openingNote READ openingNote WRITE setOpeningNote NOTIFY openingNoteChanged);
-    Q_PROPERTY(QStringList paymentMethods READ paymentMethods WRITE setPaymentMethods NOTIFY paymentMethodsChanged);
-
-public:
-    explicit QDeclarativeBusinessInformation(QObject* parent = 0);
-    explicit QDeclarativeBusinessInformation(const QPlaceBusinessInformation &src,
-                                             QObject* parent = 0);
-    ~QDeclarativeBusinessInformation();
-
-    QPlaceBusinessInformation businessInformation();
-    void setBusinessInformation(const QPlaceBusinessInformation &src);
-
-    QVariantHash additionalData() const;
-    void setAdditionalData(const QVariantHash &data);
-    QDeclarativeListProperty<QDeclarativeBusinessFeature> features();
-    static void features_append(QDeclarativeListProperty<QDeclarativeBusinessFeature> *prop,
-                                  QDeclarativeBusinessFeature* value);
-    static int features_count(QDeclarativeListProperty<QDeclarativeBusinessFeature> *prop);
-    static QDeclarativeBusinessFeature* features_at(QDeclarativeListProperty<QDeclarativeBusinessFeature> *prop, int index);
-    static void features_clear(QDeclarativeListProperty<QDeclarativeBusinessFeature> *prop);
-    QDeclarativeListProperty<QDeclarativePeriod> annualClosings();
-    static void annualClosings_append(QDeclarativeListProperty<QDeclarativePeriod> *prop,
-                                  QDeclarativePeriod* value);
-    static int annualClosings_count(QDeclarativeListProperty<QDeclarativePeriod> *prop);
-    static QDeclarativePeriod* annualClosings_at(QDeclarativeListProperty<QDeclarativePeriod> *prop, int index);
-    static void annualClosings_clear(QDeclarativeListProperty<QDeclarativePeriod> *prop);
-    QDeclarativeListProperty<QDeclarativeWeekdayHours> openingHours();
-    static void openingHours_append(QDeclarativeListProperty<QDeclarativeWeekdayHours> *prop,
-                                  QDeclarativeWeekdayHours* value);
-    static int openingHours_count(QDeclarativeListProperty<QDeclarativeWeekdayHours> *prop);
-    static QDeclarativeWeekdayHours* openingHours_at(QDeclarativeListProperty<QDeclarativeWeekdayHours> *prop, int index);
-    static void openingHours_clear(QDeclarativeListProperty<QDeclarativeWeekdayHours> *prop);
-    QString annualClosingNote() const;
-    void setAnnualClosingNote(const QString &data);
-    QString openingNote() const;
-    void setOpeningNote(const QString &data);
-    QStringList paymentMethods() const;
-    void setPaymentMethods(const QStringList &data);
-
-signals:
-    void additionalDataChanged();
-    void featuresChanged();
-    void openingHoursChanged();
-    void annualClosingsChanged();
-    void annualClosingNoteChanged();
-    void openingNoteChanged();
-    void paymentMethodsChanged();
-
-private:
-    void synchronizeFeatures();
-    void synchronizeOpeningHours();
-    void synchronizeAnnualClosings();
-
-private:
-    QList<QDeclarativeBusinessFeature*> m_features;
-    QList<QDeclarativePeriod*> m_annualClosings;
-    QList<QDeclarativeWeekdayHours*> m_openingHours;
-
-    QPlaceBusinessInformation m_src;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeBusinessInformation));
-
-#endif // QDECLARATIVEBUSINESSINFORMATION_P_H
diff --git a/src/imports/location/declarativeplaces/qdeclarativeperiod.cpp b/src/imports/location/declarativeplaces/qdeclarativeperiod.cpp
deleted file mode 100644
index 2c54fc06..00000000
--- a/src/imports/location/declarativeplaces/qdeclarativeperiod.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "qdeclarativeperiod_p.h"
-
-QT_USE_NAMESPACE
-
-/*!
-    \qmlclass Period
-
-    \brief The Period element holds various time slot data, such as
-    begining and end dates.
-    \inherits QObject
-
-    \ingroup qml-places
-*/
-
-QDeclarativePeriod::QDeclarativePeriod(QObject* parent)
-        : QObject(parent) {}
-
-QDeclarativePeriod::QDeclarativePeriod(const QPlacePeriod &period,
-        QObject *parent)
-        : QObject(parent),
-        m_period(period) {}
-
-QDeclarativePeriod::~QDeclarativePeriod() {}
-
-void QDeclarativePeriod::setPeriod(const QPlacePeriod &period)
-{
-    QPlacePeriod previousPeriod = m_period;
-    m_period = period;
-
-    if (period.startDate() != previousPeriod.startDate()) {
-        emit startDateChanged();
-    }
-    if (period.startTime() != previousPeriod.startTime()) {
-        emit startTimeChanged();
-    }
-    if (period.endDate() != previousPeriod.endDate()) {
-        emit endDateChanged();
-    }
-    if (period.endTime() != previousPeriod.endTime()) {
-        emit endTimeChanged();
-    }
-}
-
-QPlacePeriod QDeclarativePeriod::period() const
-{
-    return m_period;
-}
-
-/*!
-    \qmlproperty QDate Period::startDate
-
-    This property holds the begining date.
-*/
-void QDeclarativePeriod::setStartDate(const QDate &startDate)
-{
-    if (m_period.startDate() != startDate) {
-        m_period.setStartDate(startDate);
-        emit startDateChanged();
-    }
-}
-
-QDate QDeclarativePeriod::startDate() const
-{
-    return m_period.startDate();
-}
-
-/*!
-    \qmlproperty QTime Period::startTime
-
-    This property holds the begining time.
-*/
-void QDeclarativePeriod::setStartTime(const QTime &startTime)
-{
-    if (m_period.startTime() != startTime) {
-        m_period.setStartTime(startTime);
-        emit startTimeChanged();
-    }
-}
-
-QTime QDeclarativePeriod::startTime() const
-{
-    return m_period.startTime();
-}
-
-/*!
-    \qmlproperty QDate Period::endDate
-
-    This property holds the ending date.
-*/
-void QDeclarativePeriod::setEndDate(const QDate &endDate)
-{
-    if (m_period.endDate() != endDate) {
-        m_period.setEndDate(endDate);
-        emit endDateChanged();
-    }
-}
-
-QDate QDeclarativePeriod::endDate() const
-{
-    return m_period.endDate();
-}
-
-/*!
-    \qmlproperty QTime Period::endTime
-
-    This property holds the ending time.
-*/
-void QDeclarativePeriod::setEndTime(const QTime &endTime)
-{
-    if (m_period.endTime() != endTime) {
-        m_period.setEndTime(endTime);
-        emit endTimeChanged();
-    }
-}
-
-QTime QDeclarativePeriod::endTime() const
-{
-    return m_period.endTime();
-}
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
index 76bb302a..7a7eae4e 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
@@ -36,7 +36,6 @@ QDeclarativePlace::QDeclarativePlace(const QGeoPlace &src, QObject *parent)
 
     m_rating.setRating(m_src.rating());
     m_location.setLocation(m_src.location());
-    m_businessInformation.setBusinessInformation(m_src.businessInformation());
 }
 
 QDeclarativePlace::~QDeclarativePlace()
@@ -98,10 +97,6 @@ void QDeclarativePlace::setPlace(const QGeoPlace &src)
     if (previous.additionalData() != m_src.additionalData()) {
         emit additionalDataChanged();
     }
-    if (previous.businessInformation() != m_src.businessInformation()) {
-        m_businessInformation.setBusinessInformation(m_src.businessInformation());
-        emit businessInformationChanged();
-    }
     if (previous.categories() != m_src.categories()) {
         synchronizeCategories();
         emit categoriesChanged();
@@ -184,7 +179,6 @@ QGeoPlace QDeclarativePlace::place()
         suppliers.append(value->supplier());
     }
     m_src.setSuppliers(suppliers);
-    m_src.setBusinessInformation(m_businessInformation.businessInformation());
     return m_src;
 }
 
@@ -252,28 +246,6 @@ QDeclarativeRating *QDeclarativePlace::rating()
 }
 
 /*!
-    \qmlproperty BusinessInformation Place::businessInformation
-
-    This property holds business information of the place.
-
-    Note: this property's changed() signal is currently emitted only if the
-    whole element changes, not if only the contents of the element change.
-*/
-void QDeclarativePlace::setBusinessInformation(QDeclarativeBusinessInformation *obj)
-{
-    if (m_src.businessInformation() != obj->businessInformation()) {
-        m_businessInformation.setBusinessInformation(obj->businessInformation());
-        m_src.setBusinessInformation(obj->businessInformation());
-        emit businessInformationChanged();
-    }
-}
-
-QDeclarativeBusinessInformation *QDeclarativePlace::businessInformation()
-{
-    return &m_businessInformation;
-}
-
-/*!
     \qmlproperty string Place::name
 
     This property holds name.
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h
index 4ef3b3af..b049eef7 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h
@@ -5,7 +5,6 @@
 #include <QDeclarativeListProperty>
 #include <qgeoplace.h>
 #include "qdeclarativegeolocation_p.h"
-#include "qdeclarativebusinessinformation_p.h"
 #include "qdeclarativecategory_p.h"
 #include "qdeclarativesupplier_p.h"
 #include "qdeclarativerating_p.h"
@@ -27,7 +26,6 @@ class QDeclarativePlace : public QObject, public QDeclarativeParserStatus
     Q_PROPERTY(QDeclarativeListProperty<QDeclarativeCategory> categories READ categories NOTIFY categoriesChanged)
     Q_PROPERTY(QDeclarativeListProperty<QDeclarativeDescription> descriptions READ descriptions NOTIFY descriptionsChanged)
     Q_PROPERTY(QDeclarativeGeoLocation* location READ location WRITE setLocation NOTIFY locationChanged);
-    Q_PROPERTY(QDeclarativeBusinessInformation* businessInformation READ businessInformation WRITE setBusinessInformation NOTIFY businessInformationChanged);
     Q_PROPERTY(QDeclarativeRating* rating READ rating WRITE setRating NOTIFY ratingChanged);
     Q_PROPERTY(QDeclarativeListProperty<QDeclarativeSupplier> suppliers READ suppliers NOTIFY suppliersChanged)
     Q_PROPERTY(QStringList feeds READ feeds WRITE setFeeds NOTIFY feedsChanged);
@@ -95,8 +93,6 @@ public:
     void setName(const QString &name);
     QString placeId() const;
     void setPlaceId(const QString &placeId);
-    QDeclarativeBusinessInformation *businessInformation();
-    void setBusinessInformation(QDeclarativeBusinessInformation *business);
     QString shortDescription() const;
     void setShortDescription(const QString &description);
     QStringList tags() const;
@@ -166,7 +162,6 @@ private:
     QDeclarativeGeoLocation m_location;
     QDeclarativeRating m_rating;
     QList<QDeclarativeSupplier*> m_suppliers;
-    QDeclarativeBusinessInformation m_businessInformation;
     QDeclarativeReviewModel *m_reviewModel;
     QDeclarativeMediaModel *m_mediaModel;
     QDeclarativePropertyMap *m_extendedAttributes;
diff --git a/src/imports/location/declarativeplaces/qdeclarativeweekdayhours.cpp b/src/imports/location/declarativeplaces/qdeclarativeweekdayhours.cpp
deleted file mode 100644
index 9c9ec704..00000000
--- a/src/imports/location/declarativeplaces/qdeclarativeweekdayhours.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "qdeclarativeweekdayhours_p.h"
-
-QT_USE_NAMESPACE
-
-/*!
-    \qmlclass WeekdayHours
-
-    \brief The WeekdayHours element holds various positional data, such as \l
-    latitude and \l longitude and.
-    \inherits QObject
-
-    \ingroup qml-places
-*/
-
-QDeclarativeWeekdayHours::QDeclarativeWeekdayHours(QObject* parent)
-        : QObject(parent) {}
-
-QDeclarativeWeekdayHours::QDeclarativeWeekdayHours(const QPlaceWeekdayHours &weekdayHours,
-        QObject *parent)
-        : QObject(parent),
-          m_period(weekdayHours.period()),
-          m_weekdayHours(weekdayHours) {}
-
-QDeclarativeWeekdayHours::~QDeclarativeWeekdayHours() {}
-
-void QDeclarativeWeekdayHours::setWeekdayHours(const QPlaceWeekdayHours &weekdayHours)
-{
-    QPlaceWeekdayHours previousWeekdayHours = m_weekdayHours;
-    m_weekdayHours = weekdayHours;
-
-    if (m_weekdayHours.weekday() != previousWeekdayHours.weekday()) {
-        emit weekdayChanged();
-    }
-    if (m_weekdayHours.period() != previousWeekdayHours.period()) {
-        m_period.setPeriod(m_weekdayHours.period());
-        emit periodChanged();
-    }
-}
-
-QPlaceWeekdayHours QDeclarativeWeekdayHours::weekdayHours()
-{
-    m_weekdayHours.setPeriod(m_period.period());
-    return m_weekdayHours;
-}
-
-/*!
-    \qmlproperty Qt::DayOfWeek WeekdayHours::weekday
-
-    This property holds the day of the week.
-
-    Note: this property's changed() signal is currently emitted only if the
-    whole element changes, not if only the contents of the element change.
-*/
-
-void QDeclarativeWeekdayHours::setWeekday(const Qt::DayOfWeek &weekday)
-{
-    if (m_weekdayHours.weekday() != weekday) {
-        m_weekdayHours.setWeekday(weekday);
-        emit weekdayChanged();
-    }
-}
-
-Qt::DayOfWeek QDeclarativeWeekdayHours::weekday() const
-{
-    return m_weekdayHours.weekday();
-}
-
-/*!
-    \qmlproperty double WeekdayHours::period
-
-    This property holds period time.
-*/
-
-void QDeclarativeWeekdayHours::setPeriod(QDeclarativePeriod *period)
-{
-    if (m_period.period() != period->period()) {
-        m_period.setPeriod(period->period());
-        emit periodChanged();
-    }
-}
-
-QDeclarativePeriod* QDeclarativeWeekdayHours::period()
-{
-    return &m_period;
-}
diff --git a/src/imports/location/declarativeplaces/qdeclarativeweekdayhours_p.h b/src/imports/location/declarativeplaces/qdeclarativeweekdayhours_p.h
deleted file mode 100644
index b3b1d4af..00000000
--- a/src/imports/location/declarativeplaces/qdeclarativeweekdayhours_p.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef QDECLARATIVEWEEKDAYHOURS_P_H
-#define QDECLARATIVEWEEKDAYHOURS_P_H
-
-#include <qplaceweekdayhours.h>
-#include <QtDeclarative/qdeclarative.h>
-#include <QObject>
-
-#include "qdeclarativeperiod_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeWeekdayHours : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QDeclarativePeriod* period READ period WRITE setPeriod NOTIFY periodChanged)
-    Q_PROPERTY(Qt::DayOfWeek weekday READ weekday WRITE setWeekday NOTIFY weekdayChanged)
-
-public:
-    explicit QDeclarativeWeekdayHours(QObject* parent = 0);
-    explicit QDeclarativeWeekdayHours(const QPlaceWeekdayHours &weekdayHours, QObject* parent = 0);
-    ~QDeclarativeWeekdayHours();
-
-    QPlaceWeekdayHours weekdayHours();
-    void setWeekdayHours(const QPlaceWeekdayHours &weekdayHours);
-
-    QDeclarativePeriod *period();
-    void setPeriod(QDeclarativePeriod *period);
-    Qt::DayOfWeek weekday() const;
-    void setWeekday(const Qt::DayOfWeek &weekday);
-
-signals:
-    void periodChanged();
-    void weekdayChanged();
-
-private:
-    QDeclarativePeriod m_period;
-    QPlaceWeekdayHours m_weekdayHours;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeWeekdayHours));
-
-#endif // QDECLARATIVEWEEKDAYHOURS_P_H
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 86152132..a4856042 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -75,8 +75,6 @@
 #include "qdeclarativegeomaneuver_p.h"
 
 //Place includes
-#include "qdeclarativebusinessfeature_p.h"
-#include "qdeclarativebusinessinformation_p.h"
 #include "qdeclarativecategory_p.h"
 #include "qdeclarativedescription_p.h"
 #include "qdeclarativegeolocation_p.h"
@@ -193,21 +191,17 @@ public:
             qmlRegisterType<QDeclarativeGeoRouteSegment>(uri, 5, 0, "RouteSegment");
             qmlRegisterType<QDeclarativeGeoManeuver>(uri, 5, 0, "RouteManeuver");
 
-            qmlRegisterType<QDeclarativeBusinessFeature>(uri, 5, 0, "BusinessFeature");
-            qmlRegisterType<QDeclarativeBusinessInformation>(uri, 5, 0, "BusinessInformation");
             qmlRegisterType<QDeclarativeCategory>(uri, 5, 0, "Category");
             qmlRegisterType<QDeclarativeDescription>(uri, 5, 0, "Description");
             qmlRegisterType<QDeclarativeGeoLocation>(uri, 5, 0, "Location");
             qmlRegisterType<QDeclarativeMediaObject>(uri, 5, 0, "MediaObject");
             qmlRegisterType<QDeclarativeMediaModel>(uri, 5, 0, "MediaModel");
-            qmlRegisterType<QDeclarativePeriod>(uri, 5, 0, "Period");
             qmlRegisterType<QDeclarativePlace>(uri, 5, 0, "Place");
             qmlRegisterType<QDeclarativeRating>(uri, 5, 0, "Rating");
             qmlRegisterType<QDeclarativeReview>(uri, 5, 0, "Review");
             qmlRegisterType<QDeclarativeReviewModel>(uri, 5, 0, "ReviewModel");
             qmlRegisterType<QDeclarativeSearchResult>(uri, 5, 0, "SearchResult");
             qmlRegisterType<QDeclarativeSupplier>(uri, 5, 0, "Supplier");
-            qmlRegisterType<QDeclarativeWeekdayHours>(uri, 5, 0, "WeekdayHours");
 
             qmlRegisterType<QDeclarativeRecommendationModel>(uri, 5, 0, "RecommendationModel");
             qmlRegisterType<QDeclarativeSupportedCategoriesModel>(uri, 5, 0, "SupportedCategoriesModel");