diff options
Diffstat (limited to 'src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h')
-rw-r--r-- | src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h index 34fb8763..67d31542 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h +++ b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h @@ -56,14 +56,13 @@ class QPlaceManager; class QPlaceSearchRequest; class QPlaceSearchReply; class QDeclarativePlace; -class QDeclarativeGeoShape; class QDeclarativeSearchModelBase : public QAbstractListModel, public QQmlParserStatus { Q_OBJECT Q_PROPERTY(QDeclarativeGeoServiceProvider *plugin READ plugin WRITE setPlugin NOTIFY pluginChanged) - Q_PROPERTY(QDeclarativeGeoShape *searchArea READ searchArea WRITE setSearchArea NOTIFY searchAreaChanged) + Q_PROPERTY(QVariant searchArea READ searchArea WRITE setSearchArea NOTIFY searchAreaChanged) Q_PROPERTY(int offset READ offset WRITE setOffset NOTIFY offsetChanged) Q_PROPERTY(int limit READ limit WRITE setLimit NOTIFY limitChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) @@ -86,8 +85,8 @@ public: QDeclarativeGeoServiceProvider *plugin() const; void setPlugin(QDeclarativeGeoServiceProvider *plugin); - QDeclarativeGeoShape *searchArea() const; - void setSearchArea(QDeclarativeGeoShape *searchArea); + QVariant searchArea() const; + void setSearchArea(const QVariant &searchArea); int offset() const; void setOffset(int offset); @@ -106,7 +105,6 @@ public: Q_INVOKABLE QString errorString() const; virtual void clearData(bool suppressSignal = false); - virtual void updateSearchRequest(); // From QQmlParserStatus virtual void classBegin(); @@ -136,8 +134,6 @@ protected: QPlaceReply *m_reply; private: - QDeclarativeGeoShape *m_searchArea; - bool m_complete; Status m_status; QString m_errorString; |