diff options
Diffstat (limited to 'src/imports/location/qdeclarativelandmarkmodel.cpp')
| -rw-r--r-- | src/imports/location/qdeclarativelandmarkmodel.cpp | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/src/imports/location/qdeclarativelandmarkmodel.cpp b/src/imports/location/qdeclarativelandmarkmodel.cpp index 462bbacc..969c0b7a 100644 --- a/src/imports/location/qdeclarativelandmarkmodel.cpp +++ b/src/imports/location/qdeclarativelandmarkmodel.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** ** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 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 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** ** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -347,6 +347,12 @@ void QDeclarativeLandmarkAbstractModel::setSortOrder(QDeclarativeLandmarkAbstrac emit sortOrderChanged(); } +QLandmarkManager* QDeclarativeLandmarkAbstractModel::landmarkManager() +{ + return m_manager; +} + + /*! \qmlclass LandmarkModel QDeclarativeLandmarkModel \brief The LandmarkModel element provides access to landmarks. @@ -410,12 +416,13 @@ int QDeclarativeLandmarkModel::rowCount(const QModelIndex& parent) const // Returns the stored under the given role for the item referred to by the index. QVariant QDeclarativeLandmarkModel::data(const QModelIndex& index, int role) const { - QDeclarativeLandmark *declarativeLandmark = m_declarativeLandmarks.at(index.row()); + //QDeclarativeLandmark *declarativeLandmark = m_declarativeLandmarks.at(index.row()); + QObject *declarativeLandmark = m_declarativeLandmarks.at(index.row()); switch (role) { case Qt::DisplayRole: if (declarativeLandmark) - return declarativeLandmark->landmark().name(); + return (qobject_cast<QDeclarativeLandmark*>(declarativeLandmark))->landmark().name(); case LandmarkRole: if (declarativeLandmark) return QVariant::fromValue(declarativeLandmark); |