summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorabcd <amos.choy@nokia.com>2012-06-13 19:07:27 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-14 05:14:26 +0200
commit53e64c5ddc4fec4bdb0d66410808c8b3b90c90c5 (patch)
treea7581c7b43e97829d8a7cc6ab40bbb1d3f4d9438
parent1428c9b43901b7f8ecf0ebc8c19f5fb15e2058b1 (diff)
downloadqtlocation-53e64c5ddc4fec4bdb0d66410808c8b3b90c90c5.tar.gz
Remove corrections
The new REST server doesn't support did you mean corrections. This combined with the fact that a more generic solution to provide corrections is intended to be provided later on means that it is not worthwhile providing corrections as they are currently implemented, they will soon be deprecated anyway. Change-Id: I674aba99dc3cdc0eb0fc48d928a2146f5e792a2f Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat
-rw-r--r--doc/src/examples/declarative-places.qdoc4
-rw-r--r--doc/src/places.qdoc13
-rw-r--r--doc/src/plugins/jsondb.qdoc3
-rw-r--r--doc/src/plugins/nokia.qdoc3
-rw-r--r--doc/src/snippets/places/requesthandler.h18
-rw-r--r--examples/declarative/places/content/places/SearchResultDelegate.qml148
-rw-r--r--examples/declarative/places/places.qml1
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp37
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h9
-rw-r--r--src/imports/location/plugins.qmltypes472
-rw-r--r--src/imports/location/qdeclarativegeoserviceprovider.cpp3
-rw-r--r--src/imports/location/qdeclarativegeoserviceprovider_p.h1
-rw-r--r--src/location/maps/qgeoserviceprovider.h7
-rw-r--r--src/location/places/qplacemanager.cpp1
-rw-r--r--src/location/places/qplacesearchrequest.cpp18
-rw-r--r--src/location/places/qplacesearchrequest.h3
-rw-r--r--src/location/places/qplacesearchresult.cpp38
-rw-r--r--src/location/places/qplacesearchresult.h6
-rw-r--r--src/location/places/qplacesearchresult_p.h1
-rw-r--r--src/plugins/geoservices/nokia/nokia_plugin.json1
-rw-r--r--tests/auto/declarative_core/tst_placesearchmodel.qml1
-rw-r--r--tests/auto/declarative_core/tst_plugin.qml1
-rw-r--r--tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp19
-rw-r--r--tests/auto/qplacesearchresult/tst_qplacesearchresult.cpp7
24 files changed, 444 insertions, 371 deletions
diff --git a/doc/src/examples/declarative-places.qdoc b/doc/src/examples/declarative-places.qdoc
index 45f66eeb..d182e6f9 100644
--- a/doc/src/examples/declarative-places.qdoc
+++ b/doc/src/examples/declarative-places.qdoc
@@ -161,9 +161,7 @@
\snippet declarative/places/places.qml PlaceSearchModel model
First some of the model's properties are set, which will be used to form the search request.
- In this example we want a maximum of five search term corrections to be returned in the result
- set, so the \l {PlaceSearchModel::maximumCorrections}{maximumCorrections} property is set
- accordingly. The \l {PlaceSearchModel::searchArea}{searchArea} property is set to the
+ The \l {PlaceSearchModel::searchArea}{searchArea} property is set to the
\e searchRegion object which is a \l BoundingCircle with a center that is linked to the current
location displayed on the \l Map.
diff --git a/doc/src/places.qdoc b/doc/src/places.qdoc
index dbba3835..f7a6ef82 100644
--- a/doc/src/places.qdoc
+++ b/doc/src/places.qdoc
@@ -67,9 +67,6 @@
\snippet declarative/places.qml Search MapItemView
- The search model may also be used to specify whether corrections are returned.
- See the documentation for \l PlaceSearchModel for details.
-
\section2 Fetching Details
In order to save bandwidth, sometimes a backend will only return places which
are partially populated with details. This can be checked with the
@@ -151,16 +148,6 @@
If the plugin supports paging, limit and offset parameters may be provided to the search request.
\snippet places/requesthandler.h Search paging
- \section3 Corrections
- Suggested search term corrections to user input may also be returned with the search results if desired.
- A maximum number can be set in the search request.
- \snippet places/requesthandler.h Corrections
- \dots
- \dots
- \snippet places/requesthandler.h Corrections handling pt1
- \dots
- \snippet places/requesthandler.h Corrections handling pt2
-
\section2 Fetching Place Details
A place that has been returned from a search request may have more details
that can be fetched. The following demonstrates how to check if there
diff --git a/doc/src/plugins/jsondb.qdoc b/doc/src/plugins/jsondb.qdoc
index d1d01202..cf7a6ab1 100644
--- a/doc/src/plugins/jsondb.qdoc
+++ b/doc/src/plugins/jsondb.qdoc
@@ -107,9 +107,6 @@ capabilities are outlined below:
\li Lexical name relevance hint
\li yes
\row
- \li Search term corrections
- \li no
- \row
\li Extended Attributes
\li no
\row
diff --git a/doc/src/plugins/nokia.qdoc b/doc/src/plugins/nokia.qdoc
index c2da69ee..9eb64cdc 100644
--- a/doc/src/plugins/nokia.qdoc
+++ b/doc/src/plugins/nokia.qdoc
@@ -184,9 +184,6 @@ and behaviours are outlined below:
\li Lexical name relevance hint
\li no
\row
- \li Search term corrections
- \li no
- \row
\li Extended Attributes
\li no
\row
diff --git a/doc/src/snippets/places/requesthandler.h b/doc/src/snippets/places/requesthandler.h
index a0743c8a..a6a5f95f 100644
--- a/doc/src/snippets/places/requesthandler.h
+++ b/doc/src/snippets/places/requesthandler.h
@@ -104,24 +104,6 @@ public:
//! [Search paging]
}
- void didYouMean()
- {
- QPlaceSearchRequest searchRequest;
- //! [Corrections]
- searchRequest.setMaximumCorrections(2);
- //! [Corrections]
-
-
- //! [Corrections handling pt1]
- QPlaceSearchResult result;
- //! [Corrections handling pt1]
-
- //! [Corrections handling pt2]
- if (result.type() == QPlaceSearchResult::CorrectionResult)
- qDebug() << result.correction();
- //! [Corrections handling pt2]
- }
-
void details()
{
QPlace place;
diff --git a/examples/declarative/places/content/places/SearchResultDelegate.qml b/examples/declarative/places/content/places/SearchResultDelegate.qml
index a95ce9d0..daa45b71 100644
--- a/examples/declarative/places/content/places/SearchResultDelegate.qml
+++ b/examples/declarative/places/content/places/SearchResultDelegate.qml
@@ -52,115 +52,63 @@ Item {
height: childrenRect.height
//! [PlaceSearchModel place delegate]
- Component {
- id: placeComponent
-
- Item {
- id: placeRoot
-
- height: childrenRect.height
- width: parent.width
-
- Rectangle {
- anchors.fill: parent
- color: "#dbffde"
- visible: model.sponsored !== undefined ? model.sponsored : false
- }
-
- Column {
- width: parent.width
-
- Row {
- Image {
- visible: (place.favorite != null)
- source: "../../resources/star.png"
- height: placeName.height
- fillMode: Image.PreserveAspectFit
- }
-
- Text { id: placeName; text: place.favorite ? place.favorite.name : place.name }
- }
- Text { id: distanceText; text: PlacesUtils.prettyDistance(distance); font.italic: true }
- Text {
- text: qsTr("Sponsored result")
- horizontalAlignment: Text.AlignRight
- font.pixelSize: 8
- width: parent.width
- visible: model.sponsored !== undefined ? model.sponsored : false
- }
- }
-
- MouseArea {
- anchors.fill: parent
-
- onPressed: placeRoot.state = "Pressed"
- onReleased: placeRoot.state = ""
- onCanceled: placeRoot.state = ""
+ Rectangle {
+ anchors.fill: parent
+ color: "#dbffde"
+ visible: model.sponsored !== undefined ? model.sponsored : false
+ }
- onClicked: {
- if (model.type === undefined || type === PlaceSearchModel.PlaceResult) {
- if (!place.detailsFetched)
- place.getDetails();
+ Column {
+ width: parent.width
- root.displayPlaceDetails({
- distance: model.distance,
- place: model.place,
- });
- }
- }
+ Row {
+ Image {
+ visible: (place.favorite != null)
+ source: "../../resources/star.png"
+ height: placeName.height
+ fillMode: Image.PreserveAspectFit
}
- states: [
- State {
- name: ""
- },
- State {
- name: "Pressed"
- PropertyChanges { target: placeName; color: "#1C94FC"}
- PropertyChanges { target: distanceText; color: "#1C94FC"}
- }
- ]
+ Text { id: placeName; text: place.favorite ? place.favorite.name : place.name }
+ }
+ Text { id: distanceText; text: PlacesUtils.prettyDistance(distance); font.italic: true }
+ Text {
+ text: qsTr("Sponsored result")
+ horizontalAlignment: Text.AlignRight
+ font.pixelSize: 8
+ width: parent.width
+ visible: model.sponsored !== undefined ? model.sponsored : false
}
}
- //! [PlaceSearchModel place delegate]
-
- Component {
- id: correctionComponent
- Item {
- id: correctionRoot
-
- Text {
- id: correctionText
- width: parent.width
- text: "Did you mean " + correction + "?"
-
- MouseArea {
- anchors.fill: parent
- onPressed: correctionRoot.state = "Pressed"
- onReleased: correctionRoot.state = ""
- onCanceled: correctionRoot.state = ""
-
- onClicked: root.searchFor(correction);
- }
+ MouseArea {
+ anchors.fill: parent
+
+ onPressed: root.state = "Pressed"
+ onReleased: root.state = ""
+ onCanceled: root.state = ""
+
+ onClicked: {
+ if (model.type === undefined || type === PlaceSearchModel.PlaceResult) {
+ if (!place.detailsFetched)
+ place.getDetails();
+ root.displayPlaceDetails({
+ distance: model.distance,
+ place: model.place,
+ });
}
-
- states: [
- State {
- name: ""
- },
- State {
- name: "Pressed"
- PropertyChanges { target: correctionText; color: "#1C94FC"}
- }
- ]
}
}
- Loader {
- anchors.left: parent.left
- anchors.right: parent.right
-
- sourceComponent: (model.type === undefined || model.type === PlaceSearchModel.PlaceResult) ? placeComponent : correctionComponent
- }
+ states: [
+ State {
+ name: ""
+ },
+ State {
+ name: "Pressed"
+ PropertyChanges { target: placeName; color: "#1C94FC"}
+ PropertyChanges { target: distanceText; color: "#1C94FC"}
+ }
+ ]
+ //! [PlaceSearchModel place delegate]
}
diff --git a/examples/declarative/places/places.qml b/examples/declarative/places/places.qml
index e80c9d16..273e267d 100644
--- a/examples/declarative/places/places.qml
+++ b/examples/declarative/places/places.qml
@@ -360,7 +360,6 @@ Item {
id: placeSearchModel
plugin: placesPlugin
- maximumCorrections: 5
searchArea: searchRegion
function searchForCategory(category) {
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp
index c52fd06c..b51b7121 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp
@@ -97,11 +97,6 @@ QT_USE_NAMESPACE
\li bool
\li Valid only when the \c type role is \c PlaceResult, true if the search result is a
sponsored result.
- \row
- \li correction
- \li string
- \li Valid only when the \c type role is \c CorrectionResult, a suggested correction to
- the search term.
\endtable
\section2 Search Result Types
@@ -113,9 +108,6 @@ QT_USE_NAMESPACE
\li PlaceSearchModel.PlaceResult
\li The search result contains a place.
\row
- \li PlaceSearchModel.CorrectionResult
- \li The search result contains a search term correction.
- \row
\li PlaceSearchModel.UnknownSearchResult
\li The contents of the search result are unknown.
\endtable
@@ -158,13 +150,6 @@ QT_USE_NAMESPACE
support a means to retrieve the total number of items available from the
backed. Also note that support for \l offset and \l limit can vary
according to the \l plugin.
-
- \section1 Corrections
- The PlaceSearchModel can return correction results if supported by the \l plugin.
- Correction results consist of a string which can be used as a search term for another query and
- are often used in the context of "Did you mean" corrections. The \l maximumCorrections property
- can be used to limit the maximum number of search term correction results that may be returned.
- Setting \l maximumCorrections to 0 will prevent any search term correction results from being returned.
*/
/*!
@@ -447,25 +432,6 @@ void QDeclarativeSearchResultModel::setRelevanceHint(QDeclarativeSearchResultMod
}
/*!
- \qmlproperty int PlaceSearchModel::maximumCorrections
-
- This property holds the maximum number of search term corrections that may be returned.
-*/
-int QDeclarativeSearchResultModel::maximumCorrections() const
-{
- return m_request.maximumCorrections();
-}
-
-void QDeclarativeSearchResultModel::setMaximumCorrections(int corrections)
-{
- if (m_request.maximumCorrections() == corrections)
- return;
-
- m_request.setMaximumCorrections(corrections);
- emit maximumCorrectionsChanged();
-}
-
-/*!
\qmlproperty enum PlaceSearchModel::visibilityScope
This property holds the visibility scope of the places to search. Only places with the
@@ -513,8 +479,6 @@ QVariant QDeclarativeSearchResultModel::data(const QModelIndex &index, int role)
switch (role) {
case SearchResultTypeRole:
return m_results.at(index.row()).type();
- case CorrectionRole:
- return m_results.at(index.row()).correction();
case SponsoredRole:
return m_results.at(index.row()).isSponsored();
default:
@@ -526,7 +490,6 @@ QHash<int, QByteArray> QDeclarativeSearchResultModel::roleNames() const
{
QHash<int, QByteArray> roles = QDeclarativeResultModelBase::roleNames();
roles.insert(SearchResultTypeRole, "type");
- roles.insert(CorrectionRole, "correction");
roles.insert(SponsoredRole, "sponsored");
return roles;
}
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
index 160223ef..a5476f68 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
@@ -56,7 +56,6 @@ class QDeclarativeSearchResultModel : public QDeclarativeResultModelBase
Q_PROPERTY(QString searchTerm READ searchTerm WRITE setSearchTerm NOTIFY searchTermChanged)
Q_PROPERTY(QQmlListProperty<QDeclarativeCategory> categories READ categories NOTIFY categoriesChanged)
- Q_PROPERTY(int maximumCorrections READ maximumCorrections WRITE setMaximumCorrections NOTIFY maximumCorrectionsChanged)
Q_PROPERTY(RelevanceHint relevanceHint READ relevanceHint WRITE setRelevanceHint NOTIFY relevanceHintChanged)
Q_PROPERTY(QDeclarativePlace::Visibility visibilityScope READ visibilityScope WRITE setVisibilityScope NOTIFY visibilityScopeChanged)
@@ -65,8 +64,7 @@ class QDeclarativeSearchResultModel : public QDeclarativeResultModelBase
public:
enum SearchResultType {
UnknownSearchResult = QPlaceSearchResult::UnknownSearchResult,
- PlaceResult = QPlaceSearchResult::PlaceResult,
- CorrectionResult = QPlaceSearchResult::CorrectionResult
+ PlaceResult = QPlaceSearchResult::PlaceResult
};
enum RelevanceHint {
@@ -91,9 +89,6 @@ public:
QDeclarativeSearchResultModel::RelevanceHint relevanceHint() const;
void setRelevanceHint(QDeclarativeSearchResultModel::RelevanceHint hint);
- int maximumCorrections() const;
- void setMaximumCorrections(int corrections);
-
QDeclarativePlace::Visibility visibilityScope() const;
void setVisibilityScope(QDeclarativePlace::Visibility visibilityScope);
@@ -103,7 +98,6 @@ public:
Q_SIGNALS:
void searchTermChanged();
void categoriesChanged();
- void maximumCorrectionsChanged();
void relevanceHintChanged();
void visibilityScopeChanged();
@@ -118,7 +112,6 @@ private Q_SLOTS:
private:
enum Roles {
SearchResultTypeRole = QDeclarativeResultModelBase::PlaceRole + 1,
- CorrectionRole,
SponsoredRole
};
diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes
index 03216880..75f2fbc6 100644
--- a/src/imports/location/plugins.qmltypes
+++ b/src/imports/location/plugins.qmltypes
@@ -9,83 +9,97 @@ Module {
prototype: "QObject"
Signal {
name: "dataChanged"
+ type: "void"
Parameter { name: "topLeft"; type: "QModelIndex" }
Parameter { name: "bottomRight"; type: "QModelIndex" }
Parameter { name: "roles"; type: "QSet<int>" }
}
Signal {
name: "dataChanged"
+ type: "void"
Parameter { name: "topLeft"; type: "QModelIndex" }
Parameter { name: "bottomRight"; type: "QModelIndex" }
}
Signal {
name: "headerDataChanged"
+ type: "void"
Parameter { name: "orientation"; type: "Qt::Orientation" }
Parameter { name: "first"; type: "int" }
Parameter { name: "last"; type: "int" }
}
Signal {
name: "layoutChanged"
+ type: "void"
Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
}
- Signal { name: "layoutChanged" }
+ Signal { name: "layoutChanged"; type: "void" }
Signal {
name: "layoutAboutToBeChanged"
+ type: "void"
Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
}
- Signal { name: "layoutAboutToBeChanged" }
+ Signal { name: "layoutAboutToBeChanged"; type: "void" }
Signal {
name: "rowsAboutToBeInserted"
+ type: "void"
Parameter { name: "parent"; type: "QModelIndex" }
Parameter { name: "first"; type: "int" }
Parameter { name: "last"; type: "int" }
}
Signal {
name: "rowsInserted"
+ type: "void"
Parameter { name: "parent"; type: "QModelIndex" }
Parameter { name: "first"; type: "int" }
Parameter { name: "last"; type: "int" }
}
Signal {
name: "rowsAboutToBeRemoved"
+ type: "void"
Parameter { name: "parent"; type: "QModelIndex" }
Parameter { name: "first"; type: "int" }
Parameter { name: "last"; type: "int" }
}
Signal {
name: "rowsRemoved"
+ type: "void"
Parameter { name: "parent"; type: "QModelIndex" }
Parameter { name: "first"; type: "int" }
Parameter { name: "last"; type: "int" }
}
Signal {
name: "columnsAboutToBeInserted"
+ type: "void"
Parameter { name: "parent"; type: "QModelIndex" }
Parameter { name: "first"; type: "int" }
Parameter { name: "last"; type: "int" }
}
Signal {
name: "columnsInserted"
+ type: "void"
Parameter { name: "parent"; type: "QModelIndex" }
Parameter { name: "first"; type: "int" }
Parameter { name: "last"; type: "int" }
}
Signal {
name: "columnsAboutToBeRemoved"
+ type: "void"
Parameter { name: "parent"; type: "QModelIndex" }
Parameter { name: "first"; type: "int" }
Parameter { name: "last"; type: "int" }
}
Signal {
name: "columnsRemoved"
+ type: "void"
Parameter { name: "parent"; type: "QModelIndex" }
Parameter { name: "first"; type: "int" }
Parameter { name: "last"; type: "int" }
}
- Signal { name: "modelAboutToBeReset" }
- Signal { name: "modelReset" }
+ Signal { name: "modelAboutToBeReset"; type: "void" }
+ Signal { name: "modelReset"; type: "void" }
Signal {
name: "rowsAboutToBeMoved"
+ type: "void"
Parameter { name: "sourceParent"; type: "QModelIndex" }
Parameter { name: "sourceStart"; type: "int" }
Parameter { name: "sourceEnd"; type: "int" }
@@ -94,6 +108,7 @@ Module {
}
Signal {
name: "rowsMoved"
+ type: "void"
Parameter { name: "parent"; type: "QModelIndex" }
Parameter { name: "start"; type: "int" }
Parameter { name: "end"; type: "int" }
@@ -102,6 +117,7 @@ Module {
}
Signal {
name: "columnsAboutToBeMoved"
+ type: "void"
Parameter { name: "sourceParent"; type: "QModelIndex" }
Parameter { name: "sourceStart"; type: "int" }
Parameter { name: "sourceEnd"; type: "int" }
@@ -110,6 +126,7 @@ Module {
}
Signal {
name: "columnsMoved"
+ type: "void"
Parameter { name: "parent"; type: "QModelIndex" }
Parameter { name: "start"; type: "int" }
Parameter { name: "end"; type: "int" }
@@ -117,7 +134,7 @@ Module {
Parameter { name: "column"; type: "int" }
}
Method { name: "submit"; type: "bool" }
- Method { name: "revert" }
+ Method { name: "revert"; type: "void" }
}
Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" }
Component {
@@ -149,13 +166,20 @@ Module {
Property { name: "visibility"; type: "Visibility" }
Property { name: "icon"; type: "QDeclarativePlaceIcon"; isPointer: true }
Property { name: "status"; type: "Status"; isReadonly: true }
+ Signal { name: "pluginChanged"; type: "void" }
+ Signal { name: "categoryIdChanged"; type: "void" }
+ Signal { name: "nameChanged"; type: "void" }
+ Signal { name: "visibilityChanged"; type: "void" }
+ Signal { name: "iconChanged"; type: "void" }
+ Signal { name: "statusChanged"; type: "void" }
Method { name: "errorString"; type: "string" }
Method {
name: "save"
+ type: "void"
Parameter { name: "parentId"; type: "string" }
}
- Method { name: "save" }
- Method { name: "remove" }
+ Method { name: "save"; type: "void" }
+ Method { name: "remove"; type: "void" }
}
Component {
name: "QDeclarativeCircleMapItem"
@@ -163,7 +187,7 @@ Module {
prototype: "QDeclarativeGeoMapItemBase"
exports: ["MapCircle 5.0"]
Property { name: "center"; type: "QDeclarativeCoordinate"; isPointer: true }
- Property { name: "radius"; type: "qreal" }
+ Property { name: "radius"; type: "double" }
Property { name: "color"; type: "QColor" }
Property {
name: "border"
@@ -173,14 +197,17 @@ Module {
}
Signal {
name: "centerChanged"
+ type: "void"
Parameter { name: "center"; type: "const QDeclarativeCoordinate"; isPointer: true }
}
Signal {
name: "radiusChanged"
- Parameter { name: "radius"; type: "qreal" }
+ type: "void"
+ Parameter { name: "radius"; type: "double" }
}
Signal {
name: "colorChanged"
+ type: "void"
Parameter { name: "color"; type: "QColor" }
}
}
@@ -191,6 +218,8 @@ Module {
Property { name: "contactDetail"; type: "QPlaceContactDetail" }
Property { name: "label"; type: "string" }
Property { name: "value"; type: "string" }
+ Signal { name: "labelChanged"; type: "void" }
+ Signal { name: "valueChanged"; type: "void" }
}
Component {
name: "QDeclarativeCoordinate"
@@ -203,39 +232,44 @@ Module {
Property { name: "isValid"; type: "bool"; isReadonly: true }
Signal {
name: "latitudeChanged"
+ type: "void"
Parameter { name: "latitude"; type: "double" }
}
Signal {
name: "longitudeChanged"
+ type: "void"
Parameter { name: "longitude"; type: "double" }
}
Signal {
name: "altitudeChanged"
+ type: "void"
Parameter { name: "altitude"; type: "double" }
}
Signal {
name: "validityChanged"
+ type: "void"
Parameter { name: "valid"; type: "bool" }
}
Signal {
name: "coordinateChanged"
+ type: "void"
Parameter { name: "coord"; type: "QGeoCoordinate" }
}
Method {
name: "distanceTo"
- type: "qreal"
+ type: "double"
Parameter { name: "coordinate"; type: "QObject"; isPointer: true }
}
Method {
name: "azimuthTo"
- type: "qreal"
+ type: "double"
Parameter { name: "coordinate"; type: "QObject"; isPointer: true }
}
Method {
name: "atDistanceAndAzimuth"
type: "QDeclarativeCoordinate*"
- Parameter { name: "distance"; type: "qreal" }
- Parameter { name: "azimuth"; type: "qreal" }
+ Parameter { name: "distance"; type: "double" }
+ Parameter { name: "azimuth"; type: "double" }
}
}
Component {
@@ -252,6 +286,17 @@ Module {
Property { name: "district"; type: "string" }
Property { name: "street"; type: "string" }
Property { name: "postalCode"; type: "string" }
+ Property { name: "isTextGenerated"; type: "bool"; isReadonly: true }
+ Signal { name: "textChanged"; type: "void" }
+ Signal { name: "countryChanged"; type: "void" }
+ Signal { name: "countryCodeChanged"; type: "void" }
+ Signal { name: "stateChanged"; type: "void" }
+ Signal { name: "countyChanged"; type: "void" }
+ Signal { name: "cityChanged"; type: "void" }
+ Signal { name: "districtChanged"; type: "void" }
+ Signal { name: "streetChanged"; type: "void" }
+ Signal { name: "postalCodeChanged"; type: "void" }
+ Signal { name: "isTextGeneratedChanged"; type: "void" }
}
Component {
name: "QDeclarativeGeoBoundingArea"
@@ -270,6 +315,13 @@ Module {
Property { name: "center"; type: "QDeclarativeCoordinate"; isPointer: true }
Property { name: "height"; type: "double" }
Property { name: "width"; type: "double" }
+ Signal { name: "bottomLeftChanged"; type: "void" }
+ Signal { name: "bottomRightChanged"; type: "void" }
+ Signal { name: "topLeftChanged"; type: "void" }
+ Signal { name: "topRightChanged"; type: "void" }
+ Signal { name: "centerChanged"; type: "void" }
+ Signal { name: "heightChanged"; type: "void" }
+ Signal { name: "widthChanged"; type: "void" }
Method {
name: "contains"
type: "bool"
@@ -282,7 +334,9 @@ Module {
exports: ["BoundingCircle 5.0"]
Property { name: "circle"; type: "QGeoBoundingCircle" }
Property { name: "center"; type: "QDeclarativeCoordinate"; isPointer: true }
- Property { name: "radius"; type: "qreal" }
+ Property { name: "radius"; type: "double" }
+ Signal { name: "centerChanged"; type: "void" }
+ Signal { name: "radiusChanged"; type: "void" }
Method {
name: "contains"
type: "bool"
@@ -297,6 +351,9 @@ Module {
Property { name: "address"; type: "QDeclarativeGeoAddress"; isPointer: true }
Property { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
Property { name: "boundingBox"; type: "QDeclarativeGeoBoundingBox"; isPointer: true }
+ Signal { name: "addressChanged"; type: "void" }
+ Signal { name: "coordinateChanged"; type: "void" }
+ Signal { name: "boundingBoxChanged"; type: "void" }
}
Component {
name: "QDeclarativeGeoManeuver"
@@ -324,7 +381,7 @@ Module {
Property { name: "instructionText"; type: "string"; isReadonly: true }
Property { name: "direction"; type: "Direction"; isReadonly: true }
Property { name: "timeToNextInstruction"; type: "int"; isReadonly: true }
- Property { name: "distanceToNextInstruction"; type: "qreal"; isReadonly: true }
+ Property { name: "distanceToNextInstruction"; type: "double"; isReadonly: true }
Property { name: "waypoint"; type: "QDeclarativeCoordinate"; isReadonly: true; isPointer: true }
Property { name: "waypointValid"; type: "bool"; isReadonly: true }
}
@@ -333,12 +390,18 @@ Module {
defaultProperty: "data"
prototype: "QQuickItem"
exports: ["Map 5.0"]
+ Property {
+ name: "gesture"
+ type: "QDeclarativeGeoMapGestureArea"
+ isReadonly: true
+ isPointer: true
+ }
Property { name: "pinch"; type: "QDeclarativeGeoMapPinchArea"; isReadonly: true; isPointer: true }
Property { name: "flick"; type: "QDeclarativeGeoMapFlickable"; isReadonly: true; isPointer: true }
Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
- Property { name: "minimumZoomLevel"; type: "qreal"; isReadonly: true }
- Property { name: "maximumZoomLevel"; type: "qreal"; isReadonly: true }
- Property { name: "zoomLevel"; type: "qreal" }
+ Property { name: "minimumZoomLevel"; type: "double"; isReadonly: true }
+ Property { name: "maximumZoomLevel"; type: "double"; isReadonly: true }
+ Property { name: "zoomLevel"; type: "double" }
Property { name: "activeMapType"; type: "QDeclarativeGeoMapType"; isPointer: true }
Property {
name: "supportedMapTypes"
@@ -348,49 +411,61 @@ Module {
}
Property { name: "center"; type: "QDeclarativeCoordinate"; isPointer: true }
Property { name: "mapItems"; type: "QList<QObject*>"; isReadonly: true }
- Property { name: "tilt"; type: "qreal" }
- Property { name: "bearing"; type: "qreal" }
+ Property { name: "tilt"; type: "double" }
+ Property { name: "bearing"; type: "double" }
Signal {
name: "wheel"
- Parameter { name: "delta"; type: "qreal" }
+ type: "void"
+ Parameter { name: "delta"; type: "double" }
}
Signal {
name: "pluginChanged"
+ type: "void"
Parameter { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
}
Signal {
name: "zoomLevelChanged"
- Parameter { name: "zoomLevel"; type: "qreal" }
+ type: "void"
+ Parameter { name: "zoomLevel"; type: "double" }
}
Signal {
name: "bearingChanged"
- Parameter { name: "bearing"; type: "qreal" }
+ type: "void"
+ Parameter { name: "bearing"; type: "double" }
}
Signal {
name: "tiltChanged"
- Parameter { name: "tilt"; type: "qreal" }
+ type: "void"
+ Parameter { name: "tilt"; type: "double" }
}
Signal {
name: "centerChanged"
+ type: "void"
Parameter { name: "coordinate"; type: "const QDeclarativeCoordinate"; isPointer: true }
}
- Method {
- name: "cameraStopped"
- }
+ Signal { name: "activeMapTypeChanged"; type: "void" }
+ Signal { name: "supportedMapTypesChanged"; type: "void" }
+ Signal { name: "minimumZoomLevelChanged"; type: "void" }
+ Signal { name: "maximumZoomLevelChanged"; type: "void" }
+ Signal { name: "mapItemsChanged"; type: "void" }
Method {
name: "pan"
+ type: "void"
Parameter { name: "dx"; type: "int" }
Parameter { name: "dy"; type: "int" }
}
+ Method { name: "cameraStopped"; type: "void" }
Method {
name: "removeMapItem"
+ type: "void"
Parameter { name: "item"; type: "QDeclarativeGeoMapItemBase"; isPointer: true }
}
Method {
name: "addMapItem"
+ type: "void"
Parameter { name: "item"; type: "QDeclarativeGeoMapItemBase"; isPointer: true }
}
- Method { name: "clearMapItems" }
+ Method { name: "clearMapItems"; type: "void" }
Method {
name: "toCoordinate"
type: "QDeclarativeCoordinate*"
@@ -401,17 +476,84 @@ Module {
type: "QPointF"
Parameter { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
}
+ Method { name: "fitViewportToMapItems"; type: "void" }
}
Component {
name: "QDeclarativeGeoMapFlickable"
prototype: "QObject"
exports: ["MapFlickable 5.0"]
- Property { name: "deceleration"; type: "qreal" }
+ Property { name: "deceleration"; type: "double" }
+ Property { name: "enabled"; type: "bool" }
+ Signal { name: "decelerationChanged"; type: "void" }
+ Signal { name: "enabledChanged"; type: "void" }
+ Signal { name: "movementStarted"; type: "void" }
+ Signal { name: "movementEnded"; type: "void" }
+ Signal { name: "flickStarted"; type: "void" }
+ Signal { name: "flickEnded"; type: "void" }
+ }
+ Component {
+ name: "QDeclarativeGeoMapGestureArea"
+ prototype: "QObject"
+ exports: ["MapGestureArea 5.0"]
+ Enum {
+ name: "ActiveGesture"
+ values: {
+ "NoGesture": 0,
+ "ZoomGesture": 1,
+ "RotationGesture": 2,
+ "TiltGesture": 4,
+ "PanGesture": 8,
+ "FlickGesture": 16
+ }
+ }
+ Enum {
+ name: "ActiveGestures"
+ values: {
+ "NoGesture": 0,
+ "ZoomGesture": 1,
+ "RotationGesture": 2,
+ "TiltGesture": 4,
+ "PanGesture": 8,
+ "FlickGesture": 16
+ }
+ }
Property { name: "enabled"; type: "bool" }
- Signal { name: "movementStarted" }
- Signal { name: "movementEnded" }
- Signal { name: "flickStarted" }
- Signal { name: "flickEnded" }
+ Property { name: "pinchEnabled"; type: "bool" }
+ Property { name: "panEnabled"; type: "bool" }
+ Property { name: "isPinchActive"; type: "bool" }
+ Property { name: "isPanActive"; type: "bool"; isReadonly: true }
+ Property { name: "activeGestures"; type: "ActiveGestures" }
+ Property { name: "maximumZoomLevelChange"; type: "double" }
+ Property { name: "rotationFactor"; type: "double" }
+ Property { name: "flickDeceleration"; type: "double" }
+ Signal { name: "pinchActiveChanged"; type: "void" }
+ Signal { name: "enabledChanged"; type: "void" }
+ Signal { name: "maximumZoomLevelChangeChanged"; type: "void" }
+ Signal { name: "rotationFactorChanged"; type: "void" }
+ Signal { name: "activeGesturesChanged"; type: "void" }
+ Signal { name: "flickDecelerationChanged"; type: "void" }
+ Signal { name: "pinchEnabledChanged"; type: "void" }
+ Signal { name: "panEnabledChanged"; type: "void" }
+ Signal {
+ name: "pinchStarted"
+ type: "void"
+ Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true }
+ }
+ Signal {
+ name: "pinchUpdated"
+ type: "void"
+ Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true }
+ }
+ Signal {
+ name: "pinchFinished"
+ type: "void"
+ Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true }
+ }
+ Signal { name: "panStarted"; type: "void" }
+ Signal { name: "panFinished"; type: "void" }
+ Signal { name: "flickStarted"; type: "void" }
+ Signal { name: "flickFinished"; type: "void" }
+ Signal { name: "movementStopped"; type: "void" }
}
Component {
name: "QDeclarativeGeoMapItemBase"
@@ -425,8 +567,8 @@ Module {
exports: ["MapItemView 5.0"]
Property { name: "model"; type: "QVariant" }
Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
- Property { name: "visible"; type: "bool" }
- Property { name: "z"; type: "qreal" }
+ Signal { name: "modelChanged"; type: "void" }
+ Signal { name: "delegateChanged"; type: "void" }
}
Component {
name: "QDeclarativeGeoMapMouseArea"
@@ -477,25 +619,28 @@ Module {
Property { name: "enabled"; type: "bool" }
Property { name: "active"; type: "bool"; isReadonly: true }
Property { name: "activeGestures"; type: "ActiveGestures" }
- Property { name: "maximumZoomLevelChange"; type: "qreal" }
- Property { name: "rotationFactor"; type: "qreal" }
- Signal { name: "minimumZoomLevelChanged" }
- Signal { name: "maximumZoomLevelChanged" }
- Signal { name: "minimumRotationChanged" }
- Signal { name: "maximumRotationChanged" }
- Signal { name: "minimumTiltChanged" }
- Signal { name: "maximumTiltChanged" }
- Signal { name: "maximumTiltChangeChanged" }
+ Property { name: "maximumZoomLevelChange"; type: "double" }
+ Property { name: "rotationFactor"; type: "double" }
+ Property { name: "flickDeceleration"; type: "double" }
+ Signal { name: "activeChanged"; type: "void" }
+ Signal { name: "enabledChanged"; type: "void" }
+ Signal { name: "maximumZoomLevelChangeChanged"; type: "void" }
+ Signal { name: "rotationFactorChanged"; type: "void" }
+ Signal { name: "activeGesturesChanged"; type: "void" }
+ Signal { name: "flickDecelerationChanged"; type: "void" }
Signal {
name: "pinchStarted"
+ type: "void"
Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true }
}
Signal {
name: "pinchUpdated"
+ type: "void"
Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true }
}
Signal {
name: "pinchFinished"
+ type: "void"
Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true }
}
}
@@ -504,7 +649,7 @@ Module {
prototype: "QObject"
exports: ["MapPinchEvent 5.0"]
Property { name: "center"; type: "QPointF"; isReadonly: true }
- Property { name: "angle"; type: "qreal"; isReadonly: true }
+ Property { name: "angle"; type: "double"; isReadonly: true }
Property { name: "point1"; type: "QPointF"; isReadonly: true }
Property { name: "point2"; type: "QPointF"; isReadonly: true }
Property { name: "pointCount"; type: "int"; isReadonly: true }
@@ -517,8 +662,12 @@ Module {
exports: ["MapQuickItem 5.0"]
Property { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
Property { name: "anchorPoint"; type: "QPointF" }
- Property { name: "zoomLevel"; type: "qreal" }
+ Property { name: "zoomLevel"; type: "double" }
Property { name: "sourceItem"; type: "QQuickItem"; isPointer: true }
+ Signal { name: "coordinateChanged"; type: "void" }
+ Signal { name: "sourceItemChanged"; type: "void" }
+ Signal { name: "anchorPointChanged"; type: "void" }
+ Signal { name: "zoomLevelChanged"; type: "void" }
}
Component {
name: "QDeclarativeGeoMapType"
@@ -549,7 +698,7 @@ Module {
exports: ["Route 5.0"]
Property { name: "bounds"; type: "QDeclarativeGeoBoundingBox"; isReadonly: true; isPointer: true }
Property { name: "travelTime"; type: "int"; isReadonly: true }
- Property { name: "distance"; type: "qreal"; isReadonly: true }
+ Property { name: "distance"; type: "double"; isReadonly: true }
Property { name: "path"; type: "QDeclarativeCoordinate"; isList: true; isReadonly: true }
Property { name: "segments"; type: "QDeclarativeGeoRouteSegment"; isList: true; isReadonly: true }
}
@@ -584,15 +733,22 @@ Module {
Property { name: "status"; type: "Status"; isReadonly: true }
Property { name: "errorString"; type: "string"; isReadonly: true }
Property { name: "error"; type: "RouteError"; isReadonly: true }
- Signal { name: "routesChanged" }
- Method { name: "update" }
+ Signal { name: "countChanged"; type: "void" }
+ Signal { name: "pluginChanged"; type: "void" }
+ Signal { name: "queryChanged"; type: "void" }
+ Signal { name: "autoUpdateChanged"; type: "void" }
+ Signal { name: "statusChanged"; type: "void" }
+ Signal { name: "errorStringChanged"; type: "void" }
+ Signal { name: "errorChanged"; type: "void" }
+ Signal { name: "routesChanged"; type: "void" }
+ Method { name: "update"; type: "void" }
Method {
name: "get"
type: "QDeclarativeGeoRoute*"
Parameter { name: "index"; type: "int" }
}
- Method { name: "clear" }
- Method { name: "reset" }
+ Method { name: "reset"; type: "void" }
+ Method { name: "cancel"; type: "void" }
}
Component {
name: "QDeclarativeGeoRouteQuery"
@@ -701,27 +857,40 @@ Module {
isReadonly: true
}
Property { name: "featureTypes"; type: "QList<int>"; isReadonly: true }
- Signal { name: "queryDetailsChanged" }
+ Signal { name: "numberAlternativeRoutesChanged"; type: "void" }
+ Signal { name: "travelModesChanged"; type: "void" }
+ Signal { name: "routeOptimizationsChanged"; type: "void" }
+ Signal { name: "waypointsChanged"; type: "void" }
+ Signal { name: "excludedAreasChanged"; type: "void" }
+ Signal { name: "featureTypesChanged"; type: "void" }
+ Signal { name: "maneuverDetailChanged"; type: "void" }
+ Signal { name: "segmentDetailChanged"; type: "void" }
+ Signal { name: "queryDetailsChanged"; type: "void" }
Method {
name: "addWaypoint"
+ type: "void"
Parameter { name: "waypoint"; type: "QDeclarativeCoordinate"; isPointer: true }
}
Method {
name: "removeWaypoint"
+ type: "void"
Parameter { name: "waypoint"; type: "QDeclarativeCoordinate"; isPointer: true }
}
- Method { name: "clearWaypoints" }
+ Method { name: "clearWaypoints"; type: "void" }
Method {
name: "addExcludedArea"
+ type: "void"
Parameter { name: "area"; type: "QDeclarativeGeoBoundingBox"; isPointer: true }
}
Method {
name: "removeExcludedArea"
+ type: "void"
Parameter { name: "area"; type: "QDeclarativeGeoBoundingBox"; isPointer: true }
}
- Method { name: "clearExcludedAreas" }
+ Method { name: "clearExcludedAreas"; type: "void" }
Method {
name: "setFeatureWeight"
+ type: "void"
Parameter { name: "featureType"; type: "FeatureType" }
Parameter { name: "featureWeight"; type: "FeatureWeight" }
}
@@ -730,14 +899,14 @@ Module {
type: "int"
Parameter { name: "featureType"; type: "FeatureType" }
}
- Method { name: "resetFeatureWeights" }
+ Method { name: "resetFeatureWeights"; type: "void" }
}
Component {
name: "QDeclarativeGeoRouteSegment"
prototype: "QObject"
exports: ["RouteSegment 5.0"]
Property { name: "travelTime"; type: "int"; isReadonly: true }
- Property { name: "distance"; type: "qreal"; isReadonly: true }
+ Property { name: "distance"; type: "double"; isReadonly: true }
Property { name: "path"; type: "QDeclarativeCoordinate"; isList: true; isReadonly: true }
Property { name: "maneuver"; type: "QDeclarativeGeoManeuver"; isReadonly: true; isPointer: true }
}
@@ -826,10 +995,9 @@ Module {
"RemoveCategoryFeature": 32,
"PlaceRecommendationsFeature": 64,
"SearchSuggestionsFeature": 128,
- "CorrectionsFeature": 256,
- "LocalizedPlacesFeature": 512,
- "NotificationsFeature": 1024,
- "PlaceMatchingFeature": 2048,
+ "LocalizedPlacesFeature": 256,
+ "NotificationsFeature": 512,
+ "PlaceMatchingFeature": 1024,
"AnyPlacesFeatures": -1
}
}
@@ -845,10 +1013,9 @@ Module {
"RemoveCategoryFeature": 32,
"PlaceRecommendationsFeature": 64,
"SearchSuggestionsFeature": 128,
- "CorrectionsFeature": 256,
- "LocalizedPlacesFeature": 512,
- "NotificationsFeature": 1024,
- "PlaceMatchingFeature": 2048,
+ "LocalizedPlacesFeature": 256,
+ "NotificationsFeature": 512,
+ "PlaceMatchingFeature": 1024,
"AnyPlacesFeatures": -1
}
}
@@ -872,15 +1039,19 @@ Module {
Property { name: "isAttached"; type: "bool"; isReadonly: true }
Signal {
name: "nameChanged"
+ type: "void"
Parameter { name: "name"; type: "string" }
}
- Signal { name: "attached" }
+ Signal { name: "localesChanged"; type: "void" }
+ Signal { name: "attached"; type: "void" }
Signal {
name: "preferredChanged"
+ type: "void"
Parameter { name: "preferences"; type: "QStringList" }
}
Signal {
name: "allowExperimentalChanged"
+ type: "void"
Parameter { name: "allow"; type: "bool" }
}
Method {
@@ -916,10 +1087,12 @@ Module {
Property { name: "value"; type: "QVariant" }
Signal {
name: "nameChanged"
+ type: "void"
Parameter { name: "name"; type: "string" }
}
Signal {
name: "valueChanged"
+ type: "void"
Parameter { name: "value"; type: "QVariant" }
}
}
@@ -933,21 +1106,25 @@ Module {
Property { name: "places"; type: "QDeclarativeGeoServiceProvider::PlacesFeatures" }
Signal {
name: "mappingRequirementsChanged"
+ type: "void"
Parameter { name: "features"; type: "QDeclarativeGeoServiceProvider::MappingFeatures" }
}
Signal {
name: "routingRequirementsChanged"
+ type: "void"
Parameter { name: "features"; type: "QDeclarativeGeoServiceProvider::RoutingFeatures" }
}
Signal {
name: "geocodingRequirementsChanged"
+ type: "void"
Parameter { name: "features"; type: "QDeclarativeGeoServiceProvider::GeocodingFeatures" }
}
Signal {
name: "placesRequirementsChanged"
+ type: "void"
Parameter { name: "features"; type: "QDeclarativeGeoServiceProvider::PlacesFeatures" }
}
- Signal { name: "requirementsChanged" }
+ Signal { name: "requirementsChanged"; type: "void" }
Method {
name: "matches"
type: "bool"
@@ -989,27 +1166,39 @@ Module {
Property { name: "query"; type: "QVariant" }
Property { name: "bounds"; type: "QObject"; isPointer: true }
Property { name: "error"; type: "GeocodeError"; isReadonly: true }
- Signal { name: "locationsChanged" }
- Method { name: "update" }
+ Signal { name: "countChanged"; type: "void" }
+ Signal { name: "pluginChanged"; type: "void" }
+ Signal { name: "statusChanged"; type: "void" }
+ Signal { name: "errorStringChanged"; type: "void" }
+ Signal { name: "errorChanged"; type: "void" }
+ Signal { name: "locationsChanged"; type: "void" }
+ Signal { name: "autoUpdateChanged"; type: "void" }
+ Signal { name: "boundsChanged"; type: "void" }
+ Signal { name: "queryChanged"; type: "void" }
+ Signal { name: "limitChanged"; type: "void" }
+ Signal { name: "offsetChanged"; type: "void" }
+ Method { name: "update"; type: "void" }
Method {
name: "get"
type: "QDeclarativeGeoLocation*"
Parameter { name: "index"; type: "int" }
}
- Method { name: "clear" }
- Method { name: "reset" }
+ Method { name: "reset"; type: "void" }
+ Method { name: "cancel"; type: "void" }
}
Component {
name: "QDeclarativeMapLineProperties"
prototype: "QObject"
- Property { name: "width"; type: "qreal" }
+ Property { name: "width"; type: "double" }
Property { name: "color"; type: "QColor" }
Signal {
name: "widthChanged"
- Parameter { name: "width"; type: "qreal" }
+ type: "void"
+ Parameter { name: "width"; type: "double" }
}
Signal {
name: "colorChanged"
+ type: "void"
Parameter { name: "color"; type: "QColor" }
}
}
@@ -1074,16 +1263,40 @@ Module {
Property { name: "primaryWebsite"; type: "QUrl"; isReadonly: true }
Property { name: "visibility"; type: "Visibility" }
Property { name: "favorite"; type: "QDeclarativePlace"; isPointer: true }
- Method { name: "getDetails" }
- Method { name: "save" }
- Method { name: "remove" }
+ Signal { name: "pluginChanged"; type: "void" }
+ Signal { name: "categoriesChanged"; type: "void" }
+ Signal { name: "locationChanged"; type: "void" }
+ Signal { name: "ratingsChanged"; type: "void" }
+ Signal { name: "supplierChanged"; type: "void" }
+ Signal { name: "iconChanged"; type: "void" }
+ Signal { name: "nameChanged"; type: "void" }
+ Signal { name: "placeIdChanged"; type: "void" }
+ Signal { name: "attributionChanged"; type: "void" }
+ Signal { name: "detailsFetchedChanged"; type: "void" }
+ Signal { name: "reviewModelChanged"; type: "void" }
+ Signal { name: "imageModelChanged"; type: "void" }
+ Signal { name: "editorialModelChanged"; type: "void" }
+ Signal { name: "primaryPhoneChanged"; type: "void" }
+ Signal { name: "primaryFaxChanged"; type: "void" }
+ Signal { name: "primaryEmailChanged"; type: "void" }
+ Signal { name: "primaryWebsiteChanged"; type: "void" }
+ Signal { name: "extendedAttributesChanged"; type: "void" }
+ Signal { name: "contactDetailsChanged"; type: "void" }
+ Signal { name: "statusChanged"; type: "void" }
+ Signal { name: "visibilityChanged"; type: "void" }
+ Signal { name: "favoriteChanged"; type: "void" }
+ Method { name: "getDetails"; type: "void" }
+ Method { name: "save"; type: "void" }
+ Method { name: "remove"; type: "void" }
Method { name: "errorString"; type: "string" }
Method {
name: "copyFrom"
+ type: "void"
Parameter { name: "original"; type: "QDeclarativePlace"; isPointer: true }
}
Method {
name: "initializeFavorite"
+ type: "void"
Parameter { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
}
}
@@ -1094,6 +1307,8 @@ Module {
Property { name: "attribute"; type: "QPlaceAttribute" }
Property { name: "label"; type: "string" }
Property { name: "text"; type: "string" }
+ Signal { name: "labelChanged"; type: "void" }
+ Signal { name: "textChanged"; type: "void" }
}
Component {
name: "QDeclarativePlaceContentModel"
@@ -1101,6 +1316,9 @@ Module {
Property { name: "place"; type: "QDeclarativePlace"; isPointer: true }
Property { name: "batchSize"; type: "int" }
Property { name: "totalCount"; type: "int"; isReadonly: true }
+ Signal { name: "placeChanged"; type: "void" }
+ Signal { name: "batchSizeChanged"; type: "void" }
+ Signal { name: "totalCountChanged"; type: "void" }
}
Component {
name: "QDeclarativePlaceEditorialModel"
@@ -1114,6 +1332,8 @@ Module {
Property { name: "icon"; type: "QPlaceIcon" }
Property { name: "parameters"; type: "QObject"; isReadonly: true; isPointer: true }
Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
+ Signal { name: "pluginChanged"; type: "void" }
+ Signal { name: "parametersChanged"; type: "void" }
Method {
name: "url"
type: "QUrl"
@@ -1133,6 +1353,8 @@ Module {
Property { name: "user"; type: "QPlaceUser" }
Property { name: "userId"; type: "string" }
Property { name: "name"; type: "string" }
+ Signal { name: "userIdChanged"; type: "void" }
+ Signal { name: "nameChanged"; type: "void" }
}
Component {
name: "QDeclarativePolygonMapItem"
@@ -1147,16 +1369,20 @@ Module {
isReadonly: true
isPointer: true
}
+ Signal { name: "pathChanged"; type: "void" }
Signal {
name: "colorChanged"
+ type: "void"
Parameter { name: "color"; type: "QColor" }
}
Method {
name: "addCoordinate"
+ type: "void"
Parameter { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
}
Method {
name: "removeCoordinate"
+ type: "void"
Parameter { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
}
}
@@ -1172,12 +1398,15 @@ Module {
isReadonly: true
isPointer: true
}
+ Signal { name: "pathChanged"; type: "void" }
Method {
name: "addCoordinate"
+ type: "void"
Parameter { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
}
Method {
name: "removeCoordinate"
+ type: "void"
Parameter { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
}
}
@@ -1192,10 +1421,21 @@ Module {
Property { name: "timestamp"; type: "QDateTime"; isReadonly: true }
Property { name: "speed"; type: "double"; isReadonly: true }
Property { name: "speedValid"; type: "bool"; isReadonly: true }
- Property { name: "horizontalAccuracy"; type: "qreal" }
- Property { name: "verticalAccuracy"; type: "qreal" }
+ Property { name: "horizontalAccuracy"; type: "double" }
+ Property { name: "verticalAccuracy"; type: "double" }
Property { name: "horizontalAccuracyValid"; type: "bool"; isReadonly: true }
Property { name: "verticalAccuracyValid"; type: "bool"; isReadonly: true }
+ Signal { name: "latitudeValidChanged"; type: "void" }
+ Signal { name: "longitudeValidChanged"; type: "void" }
+ Signal { name: "altitudeValidChanged"; type: "void" }
+ Signal { name: "timestampChanged"; type: "void" }
+ Signal { name: "speedChanged"; type: "void" }
+ Signal { name: "speedValidChanged"; type: "void" }
+ Signal { name: "coordinateChanged"; type: "void" }
+ Signal { name: "horizontalAccuracyChanged"; type: "void" }
+ Signal { name: "horizontalAccuracyValidChanged"; type: "void" }
+ Signal { name: "verticalAccuracyChanged"; type: "void" }
+ Signal { name: "verticalAccuracyValidChanged"; type: "void" }
}
Component {
name: "QDeclarativePositionSource"
@@ -1229,29 +1469,44 @@ Module {
}
Property { name: "position"; type: "QDeclarativePosition"; isReadonly: true; isPointer: true }
Property { name: "active"; type: "bool" }
+ Property { name: "valid"; type: "bool"; isReadonly: true }
Property { name: "nmeaSource"; type: "QUrl" }
Property { name: "updateInterval"; type: "int" }
Property { name: "supportedPositioningMethods"; type: "PositioningMethods"; isReadonly: true }
Property { name: "preferredPositioningMethods"; type: "PositioningMethods" }
Property { name: "sourceError"; type: "SourceError"; isReadonly: true }
- Method { name: "update" }
- Method { name: "start" }
- Method { name: "stop" }
+ Property { name: "name"; type: "string" }
+ Signal { name: "positionChanged"; type: "void" }
+ Signal { name: "activeChanged"; type: "void" }
+ Signal { name: "nmeaSourceChanged"; type: "void" }
+ Signal { name: "updateIntervalChanged"; type: "void" }
+ Signal { name: "supportedPositioningMethodsChanged"; type: "void" }
+ Signal { name: "preferredPositioningMethodsChanged"; type: "void" }
+ Signal { name: "sourceErrorChanged"; type: "void" }
+ Signal { name: "nameChanged"; type: "void" }
+ Signal { name: "validityChanged"; type: "void" }
+ Method { name: "update"; type: "void" }
+ Method { name: "start"; type: "void" }
+ Method { name: "stop"; type: "void" }
}
Component {
name: "QDeclarativeRatings"
prototype: "QObject"
exports: ["Ratings 5.0"]
Property { name: "ratings"; type: "QPlaceRatings" }
- Property { name: "average"; type: "qreal" }
- Property { name: "maximum"; type: "qreal" }
+ Property { name: "average"; type: "double" }
+ Property { name: "maximum"; type: "double" }
Property { name: "count"; type: "int" }
+ Signal { name: "averageChanged"; type: "void" }
+ Signal { name: "maximumChanged"; type: "void" }
+ Signal { name: "countChanged"; type: "void" }
}
Component {
name: "QDeclarativeRecommendationModel"
prototype: "QDeclarativeResultModelBase"
exports: ["PlaceRecommendationModel 5.0"]
Property { name: "placeId"; type: "string" }
+ Signal { name: "placeIdChanged"; type: "void" }
}
Component {
name: "QDeclarativeRectangleMapItem"
@@ -1269,14 +1524,17 @@ Module {
}
Signal {
name: "topLeftChanged"
+ type: "void"
Parameter { name: "topLeft"; type: "const QDeclarativeCoordinate"; isPointer: true }
}
Signal {
name: "bottomRightChanged"
+ type: "void"
Parameter { name: "bottomRight"; type: "const QDeclarativeCoordinate"; isPointer: true }
}
Signal {
name: "colorChanged"
+ type: "void"
Parameter { name: "color"; type: "QColor" }
}
}
@@ -1286,7 +1544,10 @@ Module {
Property { name: "count"; type: "int"; isReadonly: true }
Property { name: "favoritesPlugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
Property { name: "favoritesMatchParameters"; type: "QVariantMap" }
- Signal { name: "rowCountChanged" }
+ Signal { name: "rowCountChanged"; type: "void" }
+ Signal { name: "favoritesPluginChanged"; type: "void" }
+ Signal { name: "favoritesMatchParametersChanged"; type: "void" }
+ Signal { name: "dataChanged"; type: "void" }
Method {
name: "data"
type: "QVariant"
@@ -1313,6 +1574,7 @@ Module {
}
Signal {
name: "routeChanged"
+ type: "void"
Parameter { name: "route"; type: "const QDeclarativeGeoRoute"; isPointer: true }
}
}
@@ -1322,9 +1584,10 @@ Module {
Enum {
name: "Status"
values: {
- "Ready": 0,
- "Executing": 1,
- "Error": 2
+ "Null": 0,
+ "Ready": 1,
+ "Loading": 2,
+ "Error": 3
}
}
Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
@@ -1332,9 +1595,14 @@ Module {
Property { name: "offset"; type: "int" }
Property { name: "limit"; type: "int" }
Property { name: "status"; type: "Status"; isReadonly: true }
- Method { name: "execute" }
- Method { name: "cancel" }
- Method { name: "clear" }
+ Signal { name: "pluginChanged"; type: "void" }
+ Signal { name: "searchAreaChanged"; type: "void" }
+ Signal { name: "offsetChanged"; type: "void" }
+ Signal { name: "limitChanged"; type: "void" }
+ Signal { name: "statusChanged"; type: "void" }
+ Method { name: "update"; type: "void" }
+ Method { name: "cancel"; type: "void" }
+ Method { name: "reset"; type: "void" }
Method { name: "errorString"; type: "string" }
}
Component {
@@ -1344,9 +1612,8 @@ Module {
Enum {
name: "SearchResultType"
values: {
- "PlaceResult": 0,
- "CorrectionResult": 1,
- "UnknownSearchResult": 2
+ "UnknownSearchResult": 0,
+ "PlaceResult": 1
}
}
Enum {
@@ -1359,9 +1626,12 @@ Module {
}
Property { name: "searchTerm"; type: "string" }
Property { name: "categories"; type: "QDeclarativeCategory"; isList: true; isReadonly: true }
- Property { name: "maximumCorrections"; type: "int" }
Property { name: "relevanceHint"; type: "RelevanceHint" }
Property { name: "visibilityScope"; type: "QDeclarativePlace::Visibility" }
+ Signal { name: "searchTermChanged"; type: "void" }
+ Signal { name: "categoriesChanged"; type: "void" }
+ Signal { name: "relevanceHintChanged"; type: "void" }
+ Signal { name: "visibilityScopeChanged"; type: "void" }
}
Component {
name: "QDeclarativeSearchSuggestionModel"
@@ -1369,6 +1639,8 @@ Module {
exports: ["PlaceSearchSuggestionModel 5.0"]
Property { name: "searchTerm"; type: "string" }
Property { name: "suggestions"; type: "QStringList"; isReadonly: true }
+ Signal { name: "searchTermChanged"; type: "void" }
+ Signal { name: "suggestionsChanged"; type: "void" }
}
Component {
name: "QDeclarativeSupplier"
@@ -1379,6 +1651,10 @@ Module {
Property { name: "supplierId"; type: "string" }
Property { name: "url"; type: "QUrl" }
Property { name: "icon"; type: "QDeclarativePlaceIcon"; isPointer: true }
+ Signal { name: "nameChanged"; type: "void" }
+ Signal { name: "supplierIdChanged"; type: "void" }
+ Signal { name: "urlChanged"; type: "void" }
+ Signal { name: "iconChanged"; type: "void" }
}
Component {
name: "QDeclarativeSupportedCategoriesModel"
@@ -1387,7 +1663,8 @@ Module {
Enum {
name: "Roles"
values: {
- "CategoryRole": 256
+ "CategoryRole": 256,
+ "ParentCategoryRole": 257
}
}
Enum {
@@ -1401,7 +1678,11 @@ Module {
Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
Property { name: "hierarchical"; type: "bool" }
Property { name: "status"; type: "Status"; isReadonly: true }
- Method { name: "update" }
+ Signal { name: "pluginChanged"; type: "void" }
+ Signal { name: "hierarchicalChanged"; type: "void" }
+ Signal { name: "statusChanged"; type: "void" }
+ Signal { name: "dataChanged"; type: "void" }
+ Method { name: "update"; type: "void" }
Method {
name: "data"
type: "QVariant"
@@ -1415,6 +1696,7 @@ Module {
prototype: "QObject"
Signal {
name: "valueChanged"
+ type: "void"
Parameter { name: "key"; type: "string" }
Parameter { name: "value"; type: "QVariant" }
}
diff --git a/src/imports/location/qdeclarativegeoserviceprovider.cpp b/src/imports/location/qdeclarativegeoserviceprovider.cpp
index d32f993a..bd7e3aca 100644
--- a/src/imports/location/qdeclarativegeoserviceprovider.cpp
+++ b/src/imports/location/qdeclarativegeoserviceprovider.cpp
@@ -267,9 +267,6 @@ bool QDeclarativeGeoServiceProvider::supportsRouting(const RoutingFeatures &feat
\li Plugin.SearchSuggestionsFeature
\li Supports suggestions to user query
\row
- \li Plugin.CorrectionsFeature
- \li User can edit saved place data.
- \row
\li Plugin.LocalizedPlacesFeature
\li Local places
\row
diff --git a/src/imports/location/qdeclarativegeoserviceprovider_p.h b/src/imports/location/qdeclarativegeoserviceprovider_p.h
index 1c4c3b98..6642ac38 100644
--- a/src/imports/location/qdeclarativegeoserviceprovider_p.h
+++ b/src/imports/location/qdeclarativegeoserviceprovider_p.h
@@ -143,7 +143,6 @@ public:
RemoveCategoryFeature = QGeoServiceProvider::RemoveCategoryFeature,
PlaceRecommendationsFeature = QGeoServiceProvider::PlaceRecommendationsFeature,
SearchSuggestionsFeature = QGeoServiceProvider::SearchSuggestionsFeature,
- CorrectionsFeature = QGeoServiceProvider::CorrectionsFeature,
LocalizedPlacesFeature = QGeoServiceProvider::LocalizedPlacesFeature,
NotificationsFeature = QGeoServiceProvider::NotificationsFeature,
PlaceMatchingFeature = QGeoServiceProvider::PlaceMatchingFeature,
diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h
index 9bd8ded5..51e23aff 100644
--- a/src/location/maps/qgeoserviceprovider.h
+++ b/src/location/maps/qgeoserviceprovider.h
@@ -116,10 +116,9 @@ public:
RemoveCategoryFeature = (1<<5),
PlaceRecommendationsFeature = (1<<6),
SearchSuggestionsFeature = (1<<7),
- CorrectionsFeature = (1<<8),
- LocalizedPlacesFeature = (1<<9),
- NotificationsFeature = (1<<10),
- PlaceMatchingFeature = (1<<11),
+ LocalizedPlacesFeature = (1<<8),
+ NotificationsFeature = (1<<9),
+ PlaceMatchingFeature = (1<<10),
AnyPlacesFeatures = ~(0)
};
diff --git a/src/location/places/qplacemanager.cpp b/src/location/places/qplacemanager.cpp
index 0dc9bf1b..56051e08 100644
--- a/src/location/places/qplacemanager.cpp
+++ b/src/location/places/qplacemanager.cpp
@@ -141,7 +141,6 @@ QT_BEGIN_NAMESPACE
\value RemoveCategoryFeature The manager can be used to remove categories.
\value RecommendationsFeature The manager can be used to provide recommendations.
\value SearchSuggestionsFeature The manager can be used to provide search term suggestions.
- \value CorrectionsFeature The manager can be used to provide search term corrections
\value LocaleFeature The manager can be used to provide place data localized
according to locale
\value NotificationsFeature The manager has signal notifications for when
diff --git a/src/location/places/qplacesearchrequest.cpp b/src/location/places/qplacesearchrequest.cpp
index ad654891..9a120e2f 100644
--- a/src/location/places/qplacesearchrequest.cpp
+++ b/src/location/places/qplacesearchrequest.cpp
@@ -313,24 +313,6 @@ void QPlaceSearchRequest::setSearchArea(const QGeoBoundingArea &area)
}
/*!
- Returns the maximum number of search term corrections that may be returned.
-*/
-int QPlaceSearchRequest::maximumCorrections() const
-{
- Q_D(const QPlaceSearchRequest);
- return d->dymNumber;
-}
-
-/*!
- Sets maximum \a number of search term corrections that may be returned.
-*/
-void QPlaceSearchRequest::setMaximumCorrections(int number)
-{
- Q_D(QPlaceSearchRequest);
- d->dymNumber = number;
-}
-
-/*!
Returns the visibility scope used when searching for places. The default value is
QtLocation::UnspecifiedVisibility meaning that no explicit scope has been assigned.
Places of any scope may be returned during the search.
diff --git a/src/location/places/qplacesearchrequest.h b/src/location/places/qplacesearchrequest.h
index 256d3df9..32639519 100644
--- a/src/location/places/qplacesearchrequest.h
+++ b/src/location/places/qplacesearchrequest.h
@@ -86,9 +86,6 @@ public:
QGeoBoundingArea searchArea() const;
void setSearchArea(const QGeoBoundingArea &area);
- int maximumCorrections() const;
- void setMaximumCorrections(int number);
-
QtLocation::VisibilityScope visibilityScope() const;
void setVisibilityScope(QtLocation::VisibilityScope visibilityScopes);
diff --git a/src/location/places/qplacesearchresult.cpp b/src/location/places/qplacesearchresult.cpp
index 0feb8f74..88550871 100644
--- a/src/location/places/qplacesearchresult.cpp
+++ b/src/location/places/qplacesearchresult.cpp
@@ -57,7 +57,6 @@ QPlaceSearchResultPrivate::QPlaceSearchResultPrivate(const QPlaceSearchResultPri
distance = other.distance;
type = other.type;
place = other.place;
- correction = other.correction;
sponsored = other.sponsored;
}
@@ -70,7 +69,6 @@ bool QPlaceSearchResultPrivate::operator==(const QPlaceSearchResultPrivate &othe
return distance == other.distance &&
type == other.type &&
place == other.place &&
- correction == other.correction &&
sponsored == other.sponsored;
}
@@ -83,23 +81,20 @@ bool QPlaceSearchResultPrivate::operator==(const QPlaceSearchResultPrivate &othe
\brief The QPlaceSearchResult class represents a search result.
- There are two types of search results. The first is a
- \l {QPlaceSearchResult::PlaceResult} {place result}, which contains
- a place that matched the search request, but also metadata about the place
- such as the distance from the search center of a search request and whether the result is a
- sponsored or \l {http://en.wikipedia.org/wiki/Organic_search}{organic} search result.
-
- The other type is a \l {QPlaceSearchResult::CorrectionResult}{correction}, which
- contains an alternative search term that may better reflect the
- user's intended query.
-
+ Currently the only useful search result type is the
+ \l {QPlaceSearchResult::PlaceResult} {place result}.
+ For search results of this type, the \l {QPlaceSearchResult::distance()} {distance},
+ \l {QPlaceSearchResult::place()}{place} and {QPlaceSearchResult::isSponsored} isSponsored
+ fields of the search result is filled in. Thus the result contains the distance
+ from the place from the search center of the search request, the place data containing
+ coordinates, address and so on, and finally an indication of whether the
+ result is sponsored or \l {http://en.wikipedia.org/wiki/Organic_search}{organic}.
*/
/*!
\enum QPlaceSearchResult::SearchResultType
Defines the type of search result
\value PlaceResult The search result contains a place.
- \value CorrectionResult The search result contains a search term correction.
\value UnknownSearchResult The contents of the search result are unknown.
*/
@@ -208,23 +203,6 @@ void QPlaceSearchResult::setPlace(const QPlace &place)
}
/*!
- Returns the correction term that this particular search result represents.
- This field is only valid when the search result type is QPlaceSearchResult::CorrectionResult.
-*/
-QString QPlaceSearchResult::correction() const
-{
- return d->correction;
-}
-
-/*!
- Sets the \a correction term of the search result.
-*/
-void QPlaceSearchResult::setCorrection(const QString &correction)
-{
- d->correction = correction;
-}
-
-/*!
Returns true if the search result represents a sponsored result.
\sa setSponsored()
diff --git a/src/location/places/qplacesearchresult.h b/src/location/places/qplacesearchresult.h
index 132599cc..52d0bfd0 100644
--- a/src/location/places/qplacesearchresult.h
+++ b/src/location/places/qplacesearchresult.h
@@ -72,8 +72,7 @@ public:
enum SearchResultType {
UnknownSearchResult = 0,
- PlaceResult,
- CorrectionResult
+ PlaceResult
};
qreal distance() const;
@@ -85,9 +84,6 @@ public:
QPlace place() const;
void setPlace(const QPlace &place);
- QString correction() const;
- void setCorrection(const QString &correction);
-
bool isSponsored() const;
void setSponsored(bool sponsored);
diff --git a/src/location/places/qplacesearchresult_p.h b/src/location/places/qplacesearchresult_p.h
index 05e96e69..1a9b80e0 100644
--- a/src/location/places/qplacesearchresult_p.h
+++ b/src/location/places/qplacesearchresult_p.h
@@ -61,7 +61,6 @@ public:
qreal distance;
QPlaceSearchResult::SearchResultType type;
QPlace place;
- QString correction;
bool sponsored;
};
diff --git a/src/plugins/geoservices/nokia/nokia_plugin.json b/src/plugins/geoservices/nokia/nokia_plugin.json
index d8abb0f2..4f6d6316 100644
--- a/src/plugins/geoservices/nokia/nokia_plugin.json
+++ b/src/plugins/geoservices/nokia/nokia_plugin.json
@@ -14,7 +14,6 @@
"ReverseGeocodingFeature",
"PlaceRecommendationsFeature",
"SearchSuggestionsFeature",
- "CorrectionsFeature",
"LocalizedPlacesFeature"
]
}
diff --git a/tests/auto/declarative_core/tst_placesearchmodel.qml b/tests/auto/declarative_core/tst_placesearchmodel.qml
index 6b041d07..ddc9d912 100644
--- a/tests/auto/declarative_core/tst_placesearchmodel.qml
+++ b/tests/auto/declarative_core/tst_placesearchmodel.qml
@@ -75,7 +75,6 @@ TestCase {
{ tag: "limit", property: "limit", signal: "limitChanged", value: 10, reset: -1 },
{ tag: "searchTerm", property: "searchTerm", signal: "searchTermChanged", value: "Test term", reset: "" },
- { tag: "maximumCorrections", property: "maximumCorrections", signal: "maximumCorrectionsChanged", value: 5, reset: 0 },
{ tag: "relevanceHint", property: "relevanceHint", signal: "relevanceHintChanged", value: PlaceSearchModel.DistanceHint, reset: PlaceSearchModel.UnspecifiedHint },
{ tag: "visibilityScope", property: "visibilityScope", signal: "visibilityScopeChanged", value: Place.DeviceVisibility, reset: Place.UnspecifiedVisibility },
];
diff --git a/tests/auto/declarative_core/tst_plugin.qml b/tests/auto/declarative_core/tst_plugin.qml
index 8f171a33..3e2e2825 100644
--- a/tests/auto/declarative_core/tst_plugin.qml
+++ b/tests/auto/declarative_core/tst_plugin.qml
@@ -134,7 +134,6 @@ Item {
verify(testPlugin.supportsPlaces(Plugin.SavePlaceFeature))
verify(testPlugin.supportsPlaces(Plugin.SaveCategoryFeature))
verify(testPlugin.supportsPlaces(Plugin.SearchSuggestionsFeature))
- verify(!testPlugin.supportsPlaces(Plugin.CorrectionsFeature))
verify(!testPlugin.supportsPlaces(Plugin.RemovePlaceFeature))
}
diff --git a/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp b/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp
index 2b5c510b..76139e3f 100644
--- a/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp
+++ b/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp
@@ -62,7 +62,6 @@ private Q_SLOTS:
void boundingCircleTest();
void boundingBoxTest();
void searchAreaTest();
- void maximumCorrectionsTest();
void visibilityScopeTest();
void relevanceHintTest();
void operatorsTest();
@@ -165,16 +164,6 @@ void tst_QPlaceSearchRequest::searchAreaTest()
QVERIFY2(query->searchArea() == box, "New search area not assigned");
}
-void tst_QPlaceSearchRequest::maximumCorrectionsTest()
-{
- QPlaceSearchRequest testObj;
- QVERIFY2(testObj.maximumCorrections() == 0, "Wrong default value");
- testObj.setMaximumCorrections(10);
- QVERIFY2(testObj.maximumCorrections() == 10, "Wrong value returned");
- testObj.clear();
- QVERIFY2(testObj.maximumCorrections() == 0, "Wrong cleared value returned");
-}
-
void tst_QPlaceSearchRequest::visibilityScopeTest()
{
QPlaceSearchRequest query;
@@ -202,13 +191,13 @@ void tst_QPlaceSearchRequest::relevanceHintTest()
void tst_QPlaceSearchRequest::operatorsTest()
{
QPlaceSearchRequest testObj;
- testObj.setSearchTerm("testValue");
+ testObj.setSearchTerm(QLatin1String("testValue"));
QPlaceSearchRequest testObj2;
testObj2 = testObj;
QVERIFY2(testObj == testObj2, "Not copied correctly");
- testObj2.setMaximumCorrections(-5);
+ testObj2.setSearchTerm(QLatin1String("abc"));
QVERIFY2(testObj != testObj2, "Object should be different");
- testObj2.setMaximumCorrections(0);
+ testObj2.setSearchTerm(QLatin1String("testValue"));
QVERIFY(testObj == testObj2);
QGeoBoundingBox b1(QGeoCoordinate(20,20), QGeoCoordinate(10,30));
@@ -264,7 +253,6 @@ void tst_QPlaceSearchRequest::clearTest()
QPlaceCategory category;
category.setName("Fast Food");
req.setCategory(category);
- req.setMaximumCorrections(5);
req.setLimit(100);
req.setOffset(5);
@@ -272,7 +260,6 @@ void tst_QPlaceSearchRequest::clearTest()
QVERIFY(req.searchTerm().isEmpty());
QVERIFY(req.searchArea() == QGeoBoundingArea());
QVERIFY(req.categories().isEmpty());
- QVERIFY(req.maximumCorrections() == 0);
QVERIFY(req.limit() == -1);
QVERIFY(req.offset() == 0);
}
diff --git a/tests/auto/qplacesearchresult/tst_qplacesearchresult.cpp b/tests/auto/qplacesearchresult/tst_qplacesearchresult.cpp
index e73a5523..b6b6e54b 100644
--- a/tests/auto/qplacesearchresult/tst_qplacesearchresult.cpp
+++ b/tests/auto/qplacesearchresult/tst_qplacesearchresult.cpp
@@ -60,28 +60,25 @@ void tst_QPlaceSearchResult::test()
QCOMPARE(result.type(), QPlaceSearchResult::UnknownSearchResult);
QVERIFY(qIsNaN(result.distance()));
QCOMPARE(result.place(), QPlace());
- QVERIFY(result.correction().isEmpty());
QVERIFY(!result.isSponsored());
result.setType(QPlaceSearchResult::PlaceResult);
result.setDistance(2.0);
result.setPlace(QPlace());
- result.setCorrection(QLatin1String("suggestion"));
result.setSponsored(true);
QCOMPARE(result.type(), QPlaceSearchResult::PlaceResult);
QCOMPARE(result.distance(), 2.0);
QCOMPARE(result.place(), QPlace());
- QCOMPARE(result.correction(), QLatin1String("suggestion"));
QVERIFY(result.isSponsored());
QPlaceSearchResult result2(result);
QCOMPARE(result2, result);
- result2.setType(QPlaceSearchResult::CorrectionResult);
+ result2.setType(QPlaceSearchResult::UnknownSearchResult);
- QCOMPARE(result2.type(), QPlaceSearchResult::CorrectionResult);
+ QCOMPARE(result2.type(), QPlaceSearchResult::UnknownSearchResult);
QVERIFY(result2 != result);
View Lorry Controller Status