summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorabcd <amos.choy@nokia.com>2012-08-13 13:01:15 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-24 12:01:43 +0200
commit47108cfe90e0d819767cfe18f926c5cf087a1783 (patch)
tree33ba169ce61b2376b5feed69a15c198f1069b072 /src
parentd110f169f1f3622251fadfb34340517459589a89 (diff)
downloadqtlocation-47108cfe90e0d819767cfe18f926c5cf087a1783.tar.gz
Remove obsolete function
The manager() function was a left over from when save and remove functionality was tied to the models. It should have been removed when this functionality was tied to Category instances. Change-Id: Id6304c284255e258f01e2817bbfd8385cdd83051 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp37
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h2
2 files changed, 0 insertions, 39 deletions
diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
index 017ddf12..1867fadf 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
@@ -670,43 +670,6 @@ int QDeclarativeSupportedCategoriesModel::rowToAddChild(PlaceCategoryNode *node,
}
/*!
- \internal
- Helper function to return the manager, this manager is intended to be used
- to perform the next operation. If the checkState parameter is true,
- the model is checked to see if an operation is underway and if so
- a null pointer is returned.
-*/
-QPlaceManager *QDeclarativeSupportedCategoriesModel::manager(bool checkState)
-{
- if (checkState) {
- if (m_status != QDeclarativeSupportedCategoriesModel::Ready && m_status != QDeclarativeSupportedCategoriesModel::Error)
- return 0;
- }
-
- if (m_response) {
- m_response->abort();
- m_response->deleteLater();
- m_response = 0;
- }
-
- if (!m_plugin) {
- qmlInfo(this) << QCoreApplication::translate(CONTEXT_NAME, PLUGIN_NOT_ASSIGNED_TO_PLACE);
- return 0;
- }
-
- QGeoServiceProvider *serviceProvider = m_plugin->sharedGeoServiceProvider();
- if (!serviceProvider)
- return 0;
-
- QPlaceManager *placeManager = serviceProvider->placeManager();
-
- if (!placeManager)
- return 0;
-
- return placeManager;
-}
-
-/*!
\qmlsignal CategoryModel::dataChanged()
Indicates that significant changes have been made to the underlying datastore.
diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
index 01291809..a51c5335 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
@@ -141,8 +141,6 @@ private:
int rowToAddChild(PlaceCategoryNode *, const QPlaceCategory &category);
void updateLayout();
- QPlaceManager *manager(bool stateCheck = true);
-
QPlaceReply *m_response;
QDeclarativeGeoServiceProvider *m_plugin;