Moving location qml implementation to location/declarative*

QtLocation quick classes and headers are moved out of the import directory.
The location quick classes are now in a subdirectory inside the main qtlocation
module.
This is necessary in order to privately export certain classes, such as
Map Items classes, and create an API to inject these objects into QGeoMap
to let plugins render the Map Items directly

Change-Id: Ia6ba5f07c4eddd3c4c2ce54bf34f1afcd42c2558
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

1 files changed, 153 insertions, 0 deletions

diff --git a/src/location/declarativeplaces/qdeclarativecategory_p.h b/src/location/declarativeplaces/qdeclarativecategory_p.h
new file mode 100644
index 00000000..c32072f4
--- /dev/null
+++ b/src/location/declarativeplaces/qdeclarativecategory_p.h
@@ -0,0 +1,153 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtLocation module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECATEGORY_P_H
+#define QDECLARATIVECATEGORY_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtQml/qqml.h>
+#include <QtQml/QQmlParserStatus>
+#include <QObject>
+
+#include <QtLocation/qplacecategory.h>
+
+#include <QtLocation/private/qdeclarativegeoserviceprovider_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativePlaceIcon;
+class QPlaceReply;
+class QPlaceManager;
+
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCategory : public QObject, public QQmlParserStatus
+{
+    Q_OBJECT
+
+    Q_ENUMS(Status Visibility)
+
+
+    Q_PROPERTY(QPlaceCategory category READ category WRITE setCategory)
+    Q_PROPERTY(QDeclarativeGeoServiceProvider *plugin READ plugin WRITE setPlugin NOTIFY pluginChanged)
+    Q_PROPERTY(QString categoryId READ categoryId WRITE setCategoryId NOTIFY categoryIdChanged)
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged)
+    Q_PROPERTY(QDeclarativePlaceIcon *icon READ icon WRITE setIcon NOTIFY iconChanged)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+
+    Q_INTERFACES(QQmlParserStatus)
+
+public:
+    explicit QDeclarativeCategory(QObject *parent = 0);
+    QDeclarativeCategory(const QPlaceCategory &category, QDeclarativeGeoServiceProvider *plugin, QObject *parent = 0);
+    ~QDeclarativeCategory();
+
+    enum Visibility {
+        UnspecifiedVisibility = QLocation::UnspecifiedVisibility,
+        DeviceVisibility = QLocation::DeviceVisibility,
+        PrivateVisibility = QLocation::PrivateVisibility,
+        PublicVisibility = QLocation::PublicVisibility
+    };
+    enum Status {Ready, Saving, Removing, Error};
+
+    //From QQmlParserStatus
+    virtual void classBegin() {}
+    virtual void componentComplete();
+
+    void setPlugin(QDeclarativeGeoServiceProvider *plugin);
+    QDeclarativeGeoServiceProvider *plugin() const;
+
+    QPlaceCategory category();
+    void setCategory(const QPlaceCategory &category);
+
+    QString categoryId() const;
+    void setCategoryId(const QString &catID);
+    QString name() const;
+    void setName(const QString &name);
+
+    Visibility visibility() const;
+    void setVisibility(Visibility visibility);
+
+    QDeclarativePlaceIcon *icon() const;
+    void setIcon(QDeclarativePlaceIcon *icon);
+
+    Q_INVOKABLE QString errorString() const;
+
+    Status status() const;
+    void setStatus(Status status, const QString &errorString = QString());
+
+    Q_INVOKABLE void save(const QString &parentId = QString());
+    Q_INVOKABLE void remove();
+
+Q_SIGNALS:
+    void pluginChanged();
+    void categoryIdChanged();
+    void nameChanged();
+    void visibilityChanged();
+    void iconChanged();
+    void statusChanged();
+
+private Q_SLOTS:
+    void replyFinished();
+    void pluginReady();
+
+private:
+    QPlaceManager *manager();
+
+    QPlaceCategory m_category;
+    QDeclarativePlaceIcon *m_icon;
+    QDeclarativeGeoServiceProvider *m_plugin;
+    QPlaceReply *m_reply;
+    bool m_complete;
+    Status m_status;
+    QString m_errorString;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeCategory)
+
+#endif // QDECLARATIVECATEGORY_P_H