summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2018-07-25 16:03:36 +0200
committerPaolo Angelelli <paolo.angelelli@qt.io>2018-07-27 08:18:44 +0000
commit850c0bbba4c4c65df90f26e1e6174ce68b61d73c (patch)
tree7e408902493d513824801b2e19111393045682f6
parentfd6c6e9654a14788fc4eb7384c9dfa5de1f5ffde (diff)
downloadqtlocation-850c0bbba4c4c65df90f26e1e6174ce68b61d73c.tar.gz
Remove MapItemViewDelegateIncubator
Now that a delegate model is used internally by MapItemView, this class is not used any more. Change-Id: Ic0c35d6797a19549da6bc271b76e3529d812995e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/location/declarativemaps/declarativemaps.pri1
-rw-r--r--src/location/declarativemaps/mapitemviewdelegateincubator_p.h77
-rw-r--r--src/location/declarativemaps/qdeclarativegeomapitemview.cpp1
3 files changed, 0 insertions, 79 deletions
diff --git a/src/location/declarativemaps/declarativemaps.pri b/src/location/declarativemaps/declarativemaps.pri
index 28001f99..99d72a88 100644
--- a/src/location/declarativemaps/declarativemaps.pri
+++ b/src/location/declarativemaps/declarativemaps.pri
@@ -5,7 +5,6 @@ INCLUDEPATH += declarativemaps
PRIVATE_HEADERS += \
declarativemaps/error_messages_p.h \
declarativemaps/locationvaluetypehelper_p.h \
- declarativemaps/mapitemviewdelegateincubator_p.h \
declarativemaps/qdeclarativecirclemapitem_p.h \
declarativemaps/qdeclarativegeocodemodel_p.h \
declarativemaps/qdeclarativegeomaneuver_p.h \
diff --git a/src/location/declarativemaps/mapitemviewdelegateincubator_p.h b/src/location/declarativemaps/mapitemviewdelegateincubator_p.h
deleted file mode 100644
index 6ee9f6af..00000000
--- a/src/location/declarativemaps/mapitemviewdelegateincubator_p.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2015 Jolla Ltd, author: Aaron McCarthy <aaron.mccarthy@jollamobile.com>
-** 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 MAPITEMVIEWDELEGATEINCUBATOR_H
-#define MAPITEMVIEWDELEGATEINCUBATOR_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/QQmlIncubator>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeGeoMapItemView;
-class QDeclarativeGeoMapItemViewItemData;
-
-class Q_LOCATION_PRIVATE_EXPORT MapItemViewDelegateIncubator : public QQmlIncubator
-{
-public:
- MapItemViewDelegateIncubator(QDeclarativeGeoMapItemView *view, QDeclarativeGeoMapItemViewItemData *itemData, bool batched = true);
-
-protected:
- void statusChanged(Status status) override;
-
-private:
- QDeclarativeGeoMapItemView *m_view;
- QDeclarativeGeoMapItemViewItemData *m_itemData;
- bool m_batched;
-
- friend class QDeclarativeGeoMapItemView;
-};
-
-QT_END_NAMESPACE
-
-#endif // MAPITEMVIEWDELEGATEINCUBATOR_H
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
index 415eecb3..4461d2e0 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
@@ -39,7 +39,6 @@
#include "qdeclarativegeomapitemview_p.h"
#include "qdeclarativegeomap_p.h"
#include "qdeclarativegeomapitembase_p.h"
-#include "mapitemviewdelegateincubator_p.h"
#include <QtCore/QAbstractItemModel>
#include <QtQml/QQmlContext>