diff options
48 files changed, 219 insertions, 218 deletions
diff --git a/doc/src/cpp-qml.qdoc b/doc/src/cpp-qml.qdoc index 637221d5..204bec17 100644 --- a/doc/src/cpp-qml.qdoc +++ b/doc/src/cpp-qml.qdoc @@ -29,7 +29,7 @@ \page location-cpp-qml.html \title Interfaces between C++ and QML Code -\brief Some of the location QML elements providing interfaces to access and modify properties in C++. +\brief Some of the location QML types providing interfaces to access and modify properties in C++. \section2 Category - QPlaceCategory \target category diff --git a/doc/src/examples/declarative-flickr.qdoc b/doc/src/examples/declarative-flickr.qdoc index f10f47c1..29739c70 100644 --- a/doc/src/examples/declarative-flickr.qdoc +++ b/doc/src/examples/declarative-flickr.qdoc @@ -37,7 +37,7 @@ Qt Location API: the ability to retrieve and use the user's current geographic location. - Key QML elements shown in this example: + Key QML types shown in this example: \list \li \l{QtLocation5::PositionSource}{PositionSource} \li \l{XmlListModel}{XmlListModel} @@ -48,7 +48,7 @@ \section2 Retrieving the Current Location Retrieving the user's current location is achieved using the PositionSource - element. In this example, we instantiate the PositionSource as part of the + type. In this example, we instantiate the PositionSource as part of the GeoTab component (the floating "window" describing current location and status). diff --git a/doc/src/examples/declarative-mapviewer.qdoc b/doc/src/examples/declarative-mapviewer.qdoc index c234b5f6..492b26c3 100644 --- a/doc/src/examples/declarative-mapviewer.qdoc +++ b/doc/src/examples/declarative-mapviewer.qdoc @@ -50,7 +50,7 @@ parameters they support. The Nokia services plugin supplied with Qt requires an \e app_id and \e token pair. See "\l {Qt Location Nokia Plugin}" for details. - QML elements shown in this example: + QML types shown in this example: \list \li Displaying a map @@ -76,7 +76,7 @@ \section2 Displaying a Map - Drawing a map on-screen is accomplished using the Map element, as shown + Drawing a map on-screen is accomplished using the Map type, as shown below. \snippet examples/declarative/mapviewer/content/map/MapComponent.qml top @@ -84,7 +84,7 @@ \snippet examples/declarative/mapviewer/content/map/MapComponent.qml end In this example, we give the map an initial center coordinate from a - contained Coordinate element, with a set latitude and longitude. We also + contained Coordinate object, with a set latitude and longitude. We also set the initial zoom level to 50% (halfway between the maximum and minimum). The calls to "pinch" and "flick" are used to enable gestures on the map. @@ -101,7 +101,7 @@ To locate a certain address or place on the map uses a process called geocoding. In order to perform a geocode operation, we first need to adjust - our Map element to be able to receive the result. + our Map object to be able to receive the result. Receiving results of geocoding is done through a GeocodeModel, which is typically instantiated as a property of the Map component: @@ -120,7 +120,7 @@ \snippet examples/declarative/mapviewer/content/map/MapComponent.qml pointdel0 \snippet examples/declarative/mapviewer/content/map/MapComponent.qml pointdel1 - With these three elements, we have enough to receive Geocode responses and + With these three objects, we have enough to receive Geocode responses and display them on our Map. The final piece is to send the actual Geocode request. @@ -129,7 +129,7 @@ create a similar component yourself using Dialog.qml in this example as a reference, or drive the process using any other UI you wish. - To send a geocode request, first we create an Address element, and fill it + To send a geocode request, first we create an Address object, and fill it in with the desired parameters. Then we set "map.geocodeModel.query" to the filled in Address, and call update() on the GeocodeModel. @@ -139,7 +139,7 @@ \section2 Directions and Travel Routes - Similar to the GeocodeModel, Qt Location also features the RouteModel element, + Similar to the GeocodeModel, Qt Location also features the RouteModel type, which allows information about routes (for example driving directions) between two or more points, to be received and used with a Map. diff --git a/doc/src/examples/declarative-places.qdoc b/doc/src/examples/declarative-places.qdoc index 6ee12e00..2069a6eb 100644 --- a/doc/src/examples/declarative-places.qdoc +++ b/doc/src/examples/declarative-places.qdoc @@ -80,7 +80,7 @@ \snippet declarative/places/places.qml CategoryModel model - The \l CategoryModel element provides a model of the available categories. It can provide + The \l CategoryModel type provides a model of the available categories. It can provide either a flat list or a hierarchical tree model. In this example, we use a hierarchical tree model, by setting the \l {CategoryModel::hierarchical}{hierarchical} property to \e true. The \l {CategoryModel::plugin}{plugin} property is set to \e placesPlugin which is the \e identifier of the @@ -125,7 +125,7 @@ \target Presenting-Search-Suggestions \section1 Presenting Search Suggestions - The \l PlaceSearchSuggestionModel element is used to fetch suggested search terms based on a + The \l PlaceSearchSuggestionModel type is used to fetch suggested search terms based on a partially entered search term. A new suggestion search is triggered whenever the entered search term is changed. @@ -142,21 +142,21 @@ \snippet declarative/places/content/places/SearchBox.qml PlaceSearchSuggestionModel model - The main element in the "SuggestionsShown" state is the \l ListView showing the search + The main object in the "SuggestionsShown" state is the \l ListView showing the search suggestions. \snippet declarative/places/content/places/SearchBox.qml PlaceSearchSuggestionModel view 1 \codeline \snippet declarative/places/content/places/SearchBox.qml PlaceSearchSuggestionModel view 2 - A \l Text element is used as the delegate to display the suggestion text. Clicking on the + A \l Text object is used as the delegate to display the suggestion text. Clicking on the suggested search term updates the search term and triggers a place search using the search suggestion. \section1 Searching for Places - The \l PlaceSearchModel element is used to search for places. + The \l PlaceSearchModel type is used to search for places. \snippet declarative/places/places.qml PlaceSearchModel model @@ -174,7 +174,7 @@ \snippet declarative/places/content/places/SearchResultView.qml PlaceSearchModel place list The delegate used in the \l ListView, \e SearchResultDelegate, is designed to handle multiple - search result types via a \l Loader element. For results of type \e PlaceResult the delegate + search result types via a \l Loader object. For results of type \e PlaceResult the delegate is: \snippet declarative/places/content/places/SearchResultDelegate.qml PlaceSearchModel place delegate @@ -185,7 +185,7 @@ content is accessed via a set of models. Content models are generally not created directly by the application developer, instead models are obtained from the \l {Place::editorialModel}{editorialModel}, \l {Place::reviewModel}{reviewModel} and - \l {Place::imageModel}{imageModel} properties of the \l Place element. + \l {Place::imageModel}{imageModel} properties of the \l Place type. \snippet declarative/places/content/places/PlaceEditorials.qml PlaceEditorialModel view diff --git a/doc/src/imports/qtlocation5.qdoc b/doc/src/imports/qtlocation5.qdoc index b9f0f8c1..ca6ee104 100644 --- a/doc/src/imports/qtlocation5.qdoc +++ b/doc/src/imports/qtlocation5.qdoc @@ -52,29 +52,29 @@ API. \li Searching for and managing points of interest. \endtable -\section1 Common QML Elements +\section1 Common QML Types \annotatedlist qml-QtLocation5-common -\section1 Positioning QML Elements +\section1 Positioning QML Types \annotatedlist qml-QtLocation5-positioning -\section1 Maps QML Elements +\section1 Maps QML Types \annotatedlist qml-QtLocation5-maps -\section1 Navigation and Routing QML Elements +\section1 Navigation and Routing QML Types \annotatedlist qml-QtLocation5-routing -\section1 Geocoding QML Elements +\section1 Geocoding QML Types \annotatedlist qml-QtLocation5-geocoding -\section1 Places QML Elements +\section1 Places QML Types \annotatedlist qml-QtLocation5-places -\section1 Alphabetical Listing of all QML Elements +\section1 Alphabetical Listing of all QML Types */ diff --git a/doc/src/maps.qdoc b/doc/src/maps.qdoc index 4fba72cb..b0740572 100644 --- a/doc/src/maps.qdoc +++ b/doc/src/maps.qdoc @@ -34,28 +34,28 @@ \brief Provides QtQuick user interfaces for displaying, navigating and interacting with maps, as well as geocoding and navigation. -\b{Maps and Navigation} provides QtQuick user interface elements for +\b{Maps and Navigation} provides QtQuick user interface types for displaying geographic information on a map, as well as allowing user interaction with map overlay objects and the display itself. It also contains utilities for geocoding (finding a geographic coordinate from a street address) and navigation (including driving and walking directions). -It builds upon the API concepts and elements in the \l{Positioning (QML)}{QML Positioning API}. +It builds upon the API concepts and types in the \l{Positioning (QML)}{QML Positioning API}. \section1 Maps \section2 Displaying Maps -Displaying a map is done using the \l{QtLocation5::Map}{Map} QML element. The Map element supports -user interaction through the \l{QtLocation5::MapGestureArea}{MapGestureArea} QML element. The Map -element draws the map on-screen using OpenGL (ES), allowing for hardware-accelerated rendering +Displaying a map is done using the \l{QtLocation5::Map}{Map} QML types. The Map type supports +user interaction through the \l{QtLocation5::MapGestureArea}{MapGestureArea} QML type. The Map +object draws the map on-screen using OpenGL (ES), allowing for hardware-accelerated rendering where available. -\b{Key Elements} +\b{Key Types} \table \row \li \l{QtLocation5::Plugin}{Plugin} - \li A location-based services plugin provides data including map data which is then displayed in a Map element. + \li A location-based services plugin provides data including map data which is then displayed in a Map object. \row \li \l{QtLocation5::Map}{Map} \li QtQuick item to display a map on-screen. @@ -64,8 +64,8 @@ where available. \li Interaction helper for panning, flicking and pinch-to-zoom gesture on a Map. \endtable -Note that the client must create a \l{QtLocation5::Plugin}{Plugin} element -prior to using a \l{QtLocation5::Map}{Map} element in order to have access +Note that the client must create a \l{QtLocation5::Plugin}{Plugin} object +prior to using a \l{QtLocation5::Map}{Map} type in order to have access to map data to display. \section2 Putting Objects on a Map (Map Overlay Objects) @@ -73,23 +73,23 @@ to map data to display. Maps can also contain map overlay objects, which are used to display information on its surface. There is a set of basic pre-defined map overlay objects, as well as the ability to implement custom map overlay objects using the -\l{QtLocation5::MapQuickItem}{MapQuickItem} element, which can contain any +\l{QtLocation5::MapQuickItem}{MapQuickItem} type, which can contain any standard QtQuick item. -\b{Key Elements} +\b{Key Types} \table \row \li \l{QtLocation5::MapCircle}{MapCircle} \li A geographic circle (all points at a set distance from a center), optionally with a border. \row \li \l{QtLocation5::MapRectangle}{MapRectangle} - \li A rectangle whose top left and bottom right points are specified as Coordinate elements, optionally with a border. + \li A rectangle whose top left and bottom right points are specified as Coordinate types, optionally with a border. \row \li \l{QtLocation5::MapPolygon}{MapPolygon} - \li A polygon made of an arbitrary list of \l{QtLocation5::Coordinate}{Coordinate} elements. + \li A polygon made of an arbitrary list of \l{QtLocation5::Coordinate}{Coordinate} types. \row \li \l{QtLocation5::MapPolyline}{MapPolyline} - \li A polyline made of an arbitrary list of \l{QtLocation5::Coordinate}{Coordinate} elements. + \li A polyline made of an arbitrary list of \l{QtLocation5::Coordinate}{Coordinate} types. \row \li \l{QtLocation5::MapQuickItem}{MapQuickItem} \li Turns any arbitrary QtQuick Item into a map overlay object. MapQuickItem is an enabler for specifying custom map overlay objects. @@ -99,10 +99,10 @@ standard QtQuick item. To automatically generate map overlay objects based on the contents of a QtQuick model (for example a ListModel item), the \l{QtLocation5::MapItemView}{MapItemView} -element is available. It accepts any map overlay object as its delegate, and can +type is available. It accepts any map overlay object as its delegate, and can only be created within a \l{QtLocation5::Map}{Map}. -\b{Key Elements} +\b{Key Types} \table \row \li \l{QtLocation5::MapItemView}{MapItemView} @@ -112,8 +112,8 @@ only be created within a \l{QtLocation5::Map}{Map}. \section2 Interaction with Map Overlay Objects Interaction with the pre-defined map overlay object types is done using the -\l{QtLocation5::MapMouseArea}{MapMouseArea} element, which behaves much like a -normal QtQuick MouseArea. MapQuickItems can also contain MapMouseArea elements, +\l{QtLocation5::MapMouseArea}{MapMouseArea} type, which behaves much like a +normal QtQuick MouseArea. MapQuickItems can also contain MapMouseArea objects, but can additionally use normal QtQuick MouseAreas to provide interaction. Properties of map overlay objects that influence their appearance on the display can @@ -121,7 +121,7 @@ be changed at any time, and many can also be used in animations. Animating coordinate-based map overlay objects, such as MapPolygon and MapPolyline, is not yet available. -\b{Key Elements} +\b{Key Types} \table \row \li \l{QtLocation5::MapMouseArea}{MapMouseArea} @@ -143,14 +143,14 @@ or address being translated, as different areas of the Earth are mapped to varying degrees of accuracy. A geocoding query in QML is performed using the -\l{QtLocation5::GeocodeModel}{GeocodeModel} element. For an address-to-coordinate +\l{QtLocation5::GeocodeModel}{GeocodeModel} type. For an address-to-coordinate query, its \c{query} property may be set to either an -\l{QtLocation5::Address}{Address} element or a string containing the textual +\l{QtLocation5::Address}{Address} object or a string containing the textual form of the address to search for. To perform the reverse, the same property can be set to a Coordinate instead. Results are made available in the contents of the model. -\b{Key Elements} +\b{Key Types} \table \row \li \l{QtLocation5::Plugin}{Plugin} @@ -163,9 +163,9 @@ of the model. \li Structured address for use in queries and results of geocoding. \endtable -Note that the client must create a \l{QtLocation5::Plugin}{Plugin} element -prior to using a \l{QtLocation5::GeocodeModel}{GeocodeModel} element in order -to have access to geocoding translation services and thus data to display. +Note that the client must create a \l{QtLocation5::Plugin}{Plugin} object +prior to using a \l{QtLocation5::GeocodeModel}{GeocodeModel} object. This +will enable access to geocoding translation services and thus data to display. \section1 Routing and Navigation @@ -176,7 +176,7 @@ up the journey can be constructed. If these \l {RouteSegment}s are simple then w add navigation information at the connecting points, \l {RouteManeuver}s, between the segments. -\b{Key Elements} +\b{Key Types} \table \row \li \l{QtLocation5::Route}{Routing} diff --git a/doc/src/places.qdoc b/doc/src/places.qdoc index e09c99c6..3d4164b6 100644 --- a/doc/src/places.qdoc +++ b/doc/src/places.qdoc @@ -43,7 +43,7 @@ \section2 Plugin A \l Plugin is an abstraction for a backend. One \l Plugin might access places from a REST server while another may access places from a local database. The following - instantiates a \l Plugin element by providing a name of "nokia". The \l Plugin name + instantiates a \l Plugin object by providing a name of "nokia". The \l Plugin name identifies which backend to choose from. Plugins may also be provided with a set of \l {PluginParameter} {parameters}, which essentially takes the form of a set of key-value pairs. The \l {PluginParameter} {parameters} that can be specified vary @@ -190,13 +190,13 @@ \section2 Learn More The above snippets only exhibit a small subset of Places functionality. - Refer to the \l {Places Elements} shown below for richer content such as \l {ImageModel} {images}, \l {ReviewModel} {reviews} etc, as well as more indepth descriptions and explanations. + Refer to the \l {Places Types} shown below for richer content such as \l {ImageModel} {images}, \l {ReviewModel} {reviews} etc, as well as more indepth descriptions and explanations. See also the \l {Places (QML)}{Places (QML)} example for a more comprehensive demonstration on how to use the API. - \section1 Places Elements - \section2 Data Elements + \section1 Places Types + \section2 Data Types \annotatedlist qml-QtLocation5-places-data \section2 Models diff --git a/doc/src/plugins/qml-location.qdoc b/doc/src/plugins/qml-location.qdoc index 66743c43..5507c3d5 100644 --- a/doc/src/plugins/qml-location.qdoc +++ b/doc/src/plugins/qml-location.qdoc @@ -48,45 +48,45 @@ \section2 Coordinate - The \l Coordinate is a basic unit of geographical information. The \l Coordinate element includes properties to hold the coordinate values for \l {Coordinate::latitude}{latitude}, \l {Coordinate::longitude}{longitude} and \l {Coordinate::altitude}{altitude}. + The \l Coordinate is a basic unit of geographical information. The \l Coordinate type includes properties to hold the coordinate values for \l {Coordinate::latitude}{latitude}, \l {Coordinate::longitude}{longitude} and \l {Coordinate::altitude}{altitude}. \section2 Position - The three dimensional position of an object such as a mobile device can be specified by giving the latitude, longitude and altitude. That is the values held in the Coordinate element. Additionally for computation of future positions we would like to know if the object is moving, what \l {Position::speed}{speed} it is doing and what is the \l {Position::timestamp}{timestamp} of the last position data. Position therefore includes values for \l {Coordinate::latitude}{latitude}, \l {Coordinate::longitude}{longitude}, \l {Coordinate::altitude}{altitude}, \l {Position::speed}{speed} and a \l {Position::timestamp}{timestamp}. \l Position also takes responsibility for validation of sensible values for these properties: just as there is a \l {Coordinate::latitude}{latitude} there is a property \l {Position::latitudeValid}{latitudeValid}. Similarly for the other properties with the exception of the timestamp. + The three dimensional position of an object such as a mobile device can be specified by giving the latitude, longitude and altitude. That is the values held in the Coordinate type. Additionally for computation of future positions we would like to know if the object is moving, what \l {Position::speed}{speed} it is doing and what is the \l {Position::timestamp}{timestamp} of the last position data. Position therefore includes values for \l {Coordinate::latitude}{latitude}, \l {Coordinate::longitude}{longitude}, \l {Coordinate::altitude}{altitude}, \l {Position::speed}{speed} and a \l {Position::timestamp}{timestamp}. \l Position also takes responsibility for validation of sensible values for these properties: just as there is a \l {Coordinate::latitude}{latitude} there is a property \l {Position::latitudeValid}{latitudeValid}. Similarly for the other properties with the exception of the timestamp. \section2 PositionSource - We have a Position element, a Coordinate element but where do we get the + We have a Position type, a Coordinate type but where do we get the data from? It is a good idea to be able to indicate alternative sources. Perhaps instead of directly picking up GPS satellites you want to do some testing using a datafile. We may also need to manage our interaction with the source. - The \l PositionSource element provides the developer with control, + The \l PositionSource type provides the developer with control, within the limits allowed by the platform, of the source of the geographical data. The positional data can be sourced from a logfile which is in NMEA format. \l {http://en.wikipedia.org/wiki/NMEA}{NMEA} is a common text-based protocol for specifying navigational data. For convenience, the \l {PositionSource::nmeaSource}{nmeaSource} property is provided to enable QML applications to read NMEA data from a log file, the source will emit updates according to the time stamp of each NMEA sentence to produce a "replay" of the recorded data. - \section2 Positioning Elements + \section2 Positioning Types \annotatedlist qml-location \section1 Maps - The Map element can be used be used to display a map of the world. The + The Map type can be used be used to display a map of the world. The bulk of the functionality is provided by a mapping plugin described - by the plugin element associated with the Map. + by the plugin type associated with the Map. Various map objects can be added to the map. These map objects are specified in terms of coordinates and meters. Interaction with the map objects is done via the MapMouseArea item. - \section2 Map Elements + \section2 Map Types \annotatedlist qml-location-maps diff --git a/doc/src/qml-maps.qdoc b/doc/src/qml-maps.qdoc index ff8948db..39a8ed2f 100644 --- a/doc/src/qml-maps.qdoc +++ b/doc/src/qml-maps.qdoc @@ -41,7 +41,7 @@ \section1 Overview -The \l Map element allows the display of a map and placing objects within the map. +The \l Map type allows the display of a map and placing objects within the map. Various points of interest can be defined and added to the map for display. Also the \l Map has features to control how the map is displayed. With the Map item you can center the map, zoom, pinch and make the item flickable. @@ -56,11 +56,11 @@ children of the \section2 Position -The basic element of position information is the \l Coordinate. A coordinate +The basic type of position information is the \l Coordinate. A coordinate encapsulates data for the latitude, longitude and altitude of the location. Altitude is in meters. It also has a method to determine distance to another -Coordinate. The \l Coordinate element may also be held within a \l {QtLocation5::Location}{Location} -element, this will also have information on a bounding box size to determine +Coordinate. The \l Coordinate object may also be held within a \l {QtLocation5::Location}{Location} +object, this will also have information on a bounding box size to determine sufficient proximity to the location and a location address. \section2 Geocoding @@ -69,7 +69,7 @@ sufficient proximity to the location and a location address. geographical coordinates (latitude and longitude) from other geographical references to the locations. For example, this can be a street address. Reverse geocoding is also possible with a street address being used to determine a geographical coordinate. Geocoding -is performed by using the \l GeoCodeModel element. +is performed by using the \l GeoCodeModel type. The following code examples are a small part of the \c map component in the \l {Map Viewer (QML)}{Map Viewer (QML)} example. The snippets @@ -77,7 +77,7 @@ demonstrate the declaration of the \l GeocodeModel component. In the snippet we see that the \c geocodeModel property contains the plugin and two signal handlers. One for changes in status (\c onStatusChanged ) and -the other to update the centering of the Map element (\c onLocationsChanged ). +the other to update the centering of the Map object (\c onLocationsChanged ). \snippet examples/declarative/mapviewer/content/map/MapComponent.qml geocodemodel0 \snippet examples/declarative/mapviewer/content/map/MapComponent.qml geocodemodel0 body @@ -95,7 +95,7 @@ process and determine the geographical coordinates. \section2 Navigation -A very important function of the \l Map element is navigation +A very important function of the \l Map type is navigation from one place to a destination with possible waypoints along the route. The route will be divided up into a series of segments. At the end of each segment is a vertex called a \e maneuver. The \e segments contain information about @@ -184,16 +184,16 @@ The \l Map item also supports user interface interactions with the map using tactile and mouse gestures. That is features such as swiping to pan, pinching to zoom. -Enabling and configuring pinch and flickable is easy within the \l Map element. +Enabling and configuring pinch and flickable is easy within the \l Map type. \snippet examples/declarative/mapviewer/content/map/MapComponent.qml top \snippet examples/declarative/mapviewer/content/map/MapComponent.qml end -Zoom can also be controlled by other elements like sliders, as shown in the +Zoom can also be controlled by other objects like sliders, as shown in the example, by implementing the \c onValueChanged handler to update the Map \l {QtLocation5::Map::}{zoomLevel}. -\section1 Elements +\section1 Types \section3 Positioning \annotatedlist qml-QtLocation5-positioning diff --git a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp b/src/imports/location/declarativeplaces/qdeclarativecategory.cpp index 90054a01..768af90f 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativecategory.cpp @@ -60,7 +60,7 @@ QT_USE_NAMESPACE \since Qt Location 5.0 - \brief The Category element represents a category that a \l Place can be associated with. + \brief The Category type represents a category that a \l Place can be associated with. Categories are used to search for places based on the categories they are associated with. The list of available categories can be obtained from the \l CategoryModel. The @@ -274,7 +274,8 @@ void QDeclarativeCategory::setVisibility(Visibility visibility) /*! \qmlproperty PlaceIcon Category::icon - This property holds the image source associated with the category. To display the icon you can use the \l Image element. + This property holds the image source associated with the category. To display the icon you can use + the \l Image type. */ QDeclarativePlaceIcon *QDeclarativeCategory::icon() const { diff --git a/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp b/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp index c1c5c6a1..77cfc8f5 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp @@ -49,9 +49,9 @@ \ingroup qml-QtLocation5-places-data \since Qt Location 5.0 - \brief The ContactDetails element holds contact details for a \l Place. + \brief The ContactDetails type holds contact details for a \l Place. - The ContactDetails element is a map of \l {QtLocation5::ContactDetail}{ContactDetail} objects. + The ContactDetails type is a map of \l {QtLocation5::ContactDetail}{ContactDetail} objects. To access contact details in the map use the \l keys() method to get the list of keys stored in the map and then use the \c {[]} operator to access the \l {QtLocation5::ContactDetail}{ContactDetail} items. @@ -108,7 +108,7 @@ \ingroup qml-QtLocation5-places-data \since Qt Location 5.0 - \brief The ContactDetail element holds a contact detail such as a phone number or a website + \brief The ContactDetail type holds a contact detail such as a phone number or a website address. The ContactDetail provides a single detail on how one could contact a \l Place. The diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp index 6a0a0115..aff01076 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp @@ -66,26 +66,26 @@ QT_USE_NAMESPACE \ingroup qml-QtLocation5-places-data \since Qt Location 5.0 - \brief The Place element represents a place. + \brief The Place type represents a location that is a position of interest. - The Place element represents a physical location with additional metadata describing that - location. Contrasted with \l Location, \l Address, and \l Coordinate elements which are used - to describe where a location is. The basic properties of a Place are its \l name and + The Place type represents a physical location with additional metadata describing that + location. Contrasted with \l Location, \l Address, and \l Coordinate types which are used + to describe where a location is. The basic properties of a Place are its \l name and \l location. Place objects are typically obtained from a search model and will generally only have their - basic properties set. The \l detailsFetched property can be used to test if further property - values need to be fetched from the \l Plugin. This can be done by invoking the \l getDetails() + basic properties set. The \l detailsFetched property can be used to test if further property + values need to be fetched from the \l Plugin. This can be done by invoking the \l getDetails() method. Progress of the fetching operation can be monitored with the \l status property, which will be set to Place.Fetching when the details are being fetched. - The Place element has many properties holding information about the place. Details on how to + The Place type has many properties holding information about the location. Details on how to contact the place are available from the \l contactDetails property. Convenience properties for obtaining the primary \l {primaryPhone}{phone}, \l {primaryFax}{fax}, \l {primaryEmail}{email} and \l {primaryWebsite}{website} are also available. Each place is assigned zero or more \l categories. Categories are typically used when - searching for a particular type of place, such as a restaurant or hotel. Some places have a + searching for a particular kind of place, such as a restaurant or hotel. Some places have a \l ratings object, which gives an indication of the quality of the place. Place metadata is provided by a \l supplier who may require that an \l attribution message be @@ -110,7 +110,7 @@ QT_USE_NAMESPACE \section2 Saving a Place - If the \l Plugin supports it, the Place element can be used to save a place. First create a new + If the \l Plugin supports it, the Place type can be used to save a place. First create a new Place and set its properties: \snippet snippets/declarative/places.qml Place savePlace def @@ -752,7 +752,7 @@ void QDeclarativePlace::cleanupDeletedCategories() This method starts fetching place details. The \l status property will change to Place.Fetching while the fetch is in progress. On - success the element properties will be updated, \l status will be set to Place.Ready and + success the object's properties will be updated, \l status will be set to Place.Ready and \l detailsFetched will be set to true. On error \l status will be set to Place.Error. The \l errorString() method can be used to get the details of the error. */ diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp index 828133f0..5d838386 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp @@ -49,9 +49,9 @@ \ingroup qml-QtLocation5-places-data \since Qt Location 5.0 - \brief The ExtendedAttributes element holds additional data about a \l Place. + \brief The ExtendedAttributes type holds additional data about a \l Place. - The ExtendedAttributes element is a map of \l {PlaceAttribute}{PlaceAttributes}. To access + The ExtendedAttributes type is a map of \l {PlaceAttribute}{PlaceAttributes}. To access attributes in the map use the \l keys() method to get the list of keys stored in the map and use the \c {[]} operator to access the \l PlaceAttribute items. @@ -111,10 +111,10 @@ \ingroup qml-QtLocation5-places-data \since Qt Location 5.0 - \brief The PlaceAttribute element holds generic place attribute information. + \brief The PlaceAttribute type holds generic place attribute information. A place attribute stores an additional piece of information about a \l Place that is not - otherwise exposed through the \l Place element. A PlaceAttribute is a textural piece of data, + otherwise exposed through the \l Place type. A PlaceAttribute is a textural piece of data, accessible through the \l text property, and a \l label. Both the \l text and \l label properties are intended to be displayed to the user. PlaceAttributes are stored in an \l ExtendedAttributes map with a unique key. diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp index fc807e65..d3bea501 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-places-models \since Qt Location 5.0 - \brief The EditorialModel element provides a model of place editorials. + \brief The EditorialModel type provides a model of place editorials. The EditorialModel is a read-only model used to fetch editorials related to a \l Place. Binding a \l Place via \l EditorialModel::place initiates an initial fetch of editorials. diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp index 7fde1cce..bfffd131 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp @@ -57,13 +57,13 @@ QT_USE_NAMESPACE \ingroup qml-QtLocation5-places-data \since Qt Location 5.0 - \brief The Icon element represents an icon image source which can have multiple sizes. + \brief The Icon type represents an icon image source which can have multiple sizes. - The Icon element can be used in conjunction with an \l Image element to display an icon. + The Icon type can be used in conjunction with an \l Image type to display an icon. The \l url() function is used to construct an icon URL of a requested size, the icon which most closely matches the requested size is returned. - The Icon element also has a parameters map which is a set of key value pairs. The precise + The Icon type also has a parameters map which is a set of key value pairs. The precise keys to use depend on the \l {Qt Location Module#Plugin References and Parameters}{plugin} being used. The parameters map is used by the \l Plugin to determine which URL to return. diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp index 29ef758c..e78d4845 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-places-models \since Qt Location 5.0 - \brief The ImageModel element provides a model of place images. + \brief The ImageModel type provides a model of place images. The ImageModel is a read-only model used to fetch images related to a \l Place. Binding a \l Place via \l ImageModel::place initiates an initial fetch of images. diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp index c833e924..61b95233 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp @@ -51,9 +51,9 @@ QT_USE_NAMESPACE \ingroup qml-QtLocation5-places-data \since Qt Location 5.0 - \brief The User element identifies a user who contributed a particular \l Place content item. + \brief The User type identifies a user who contributed a particular \l Place content item. - Each \l Place content item has an associated user who contributed the content. This element + Each \l Place content item has an associated user who contributed the content. This type provides information about that user. \sa ImageModel, ReviewModel, EditorialModel diff --git a/src/imports/location/declarativeplaces/qdeclarativeratings.cpp b/src/imports/location/declarativeplaces/qdeclarativeratings.cpp index 47b7e2d9..c3621db0 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeratings.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeratings.cpp @@ -51,7 +51,7 @@ QT_USE_NAMESPACE \ingroup qml-QtLocation5-places-data \since Qt Location 5.0 - \brief The Ratings element holds place rating information. + \brief The Ratings type holds place rating information. Rating information is used to describe how \e good a place is conceived to be. Typically this information is visualized as a number of stars. The \l average property gives an aggregated diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp index 2e73940b..6db6afd0 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp @@ -260,7 +260,7 @@ QT_USE_NAMESPACE \qmlmethod PlaceSearchModel::update() Updates the model based on the provided query parameters. The model will be populated with a - list of places matching the search parameters specified by the element's properties. Search + list of places matching the search parameters specified by the type's properties. Search criteria is specified by setting properties such as the \l searchTerm, \l categories, \l limit and \l offset. Support for these properties may vary according to \l plugin. \c update() then submits the set of criteria to the \l plugin to process. diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp index 155cf9eb..37db220f 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp @@ -59,9 +59,9 @@ QT_USE_NAMESPACE \ingroup qml-QtLocation5-places-models \since Qt Location 5.0 - \brief The CategoryModel element provides a model of the categories supported by a \l Plugin. + \brief The CategoryModel type provides a model of the categories supported by a \l Plugin. - The CategoryModel element provides a model of the categories that are available from the + The CategoryModel type provides a model of the categories that are available from the current \l Plugin. The model supports both a flat list of categories and a hierarchical tree representing category groupings. This can be controlled by the \l hierarchical property. diff --git a/src/imports/location/mapnode.cpp b/src/imports/location/mapnode.cpp index 5f439f4e..1d3d79c4 100644 --- a/src/imports/location/mapnode.cpp +++ b/src/imports/location/mapnode.cpp @@ -152,7 +152,7 @@ void MapNode::updateFBO() // No stereo rendering, set the eye as neutral painter.setEye(QGL::NoEye); // TODO this needs to be figured out (or confirmed as invalid thing). - // Currently applied transforms for this Map3D element - how to get/apply current transforms? + // Currently applied transforms for this Map3D object - how to get/apply current transforms? // QTransform transform = painter->combinedTransform(); // Then we get the rectangle that is gotten by applying the QTransform on the rect // --> this is the viewport for Map3D diff --git a/src/imports/location/qdeclarativecirclemapitem.cpp b/src/imports/location/qdeclarativecirclemapitem.cpp index 6cd6087c..534a471f 100644 --- a/src/imports/location/qdeclarativecirclemapitem.cpp +++ b/src/imports/location/qdeclarativecirclemapitem.cpp @@ -61,9 +61,9 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-maps \since Qt Location 5.0 - \brief The MapCircle element displays a geographic circle on a Map. + \brief The MapCircle type displays a geographic circle on a Map. - The MapCircle element displays a geographic circle on a Map, which + The MapCircle type displays a geographic circle on a Map, which consists of all points that are within a set distance from one central point. Depending on map projection, a geographic circle may not always be a perfect circle on the screen: for instance, in @@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE Internally, a MapCircle is implemented as a many-sided polygon. To calculate the radius points it uses a spherical model of the Earth, similar to the atDistanceAndAzimuth method of the QML Coordinate - element. These two things can occasionally have implications for the + type. These two things can occasionally have implications for the accuracy of the circle's shape, depending on position and map projection. diff --git a/src/imports/location/qdeclarativecoordinate.cpp b/src/imports/location/qdeclarativecoordinate.cpp index c30b01f1..adc93876 100644 --- a/src/imports/location/qdeclarativecoordinate.cpp +++ b/src/imports/location/qdeclarativecoordinate.cpp @@ -52,13 +52,13 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-positioning \since Qt Location 5.0 - \brief The Coordinate element represents and stores a geographic position. + \brief The Coordinate type represents and stores a geographic position. - Coordinate elements represent a geographic location in the form of numbers: + Coordinate objects represent a geographic location in the form of numbers: in particular, \l latitude, \l longitude and \l altitude. These, together, specify a 3-dimensional position anywhere on or near the Earth's surface. - Coordinates are used by many other elements in the Qt Location module, for + Coordinates are used by many other types in the Qt Location module, for specifying the position of an object on a Map, the current position of a device and many other tasks. They also feature a number of important utility methods that make otherwise complex calculations simple to use, @@ -96,11 +96,11 @@ QT_BEGIN_NAMESPACE As an example, the value of \c{coord1.distanceTo(coord2)} would now be approximately 34790 (34.8 km). - \note if another element has a Coordinate property, a change notification + \note if another object has a Coordinate property, a change notification signal for that property will only be emitted if that property is assigned a new Coordinate, and \b{not} if the position data of the existing Coordinate assigned to the property changes. The only exception to this rule is that - the \l{Position} element does emit change signals if its coordinate property's values change. + the \l{Position} type does emit change signals if its coordinate property's values change. */ QDeclarativeCoordinate::QDeclarativeCoordinate(QObject *parent) diff --git a/src/imports/location/qdeclarativegeoaddress.cpp b/src/imports/location/qdeclarativegeoaddress.cpp index 637cdc2c..cdce250b 100644 --- a/src/imports/location/qdeclarativegeoaddress.cpp +++ b/src/imports/location/qdeclarativegeoaddress.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-positioning \since Qt Location 5.0 - \brief The Address QML element represents a specific location as a street address. + \brief The Address QML type represents a specific location as a street address. An Address is used as a unit of data for queries such as (Reverse) Geocoding or Places searches -- many of these operations either accept an Address diff --git a/src/imports/location/qdeclarativegeocircle.cpp b/src/imports/location/qdeclarativegeocircle.cpp index 66036059..a1d15122 100644 --- a/src/imports/location/qdeclarativegeocircle.cpp +++ b/src/imports/location/qdeclarativegeocircle.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-positioning \since Qt Location 5.0 - \brief The GeoCircle element represents a circular geographic area. + \brief The GeoCircle type represents a circular geographic area. The circle is defined in terms of a \l {Coordinate} which specifies the center of the circle and a qreal which specifies the radius of the circle in meters. @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE \section2 Example Usage - The following code snippet shows the declaration of a GeoCircle element. + The following code snippet shows the declaration of a GeoCircle object. \code GeoCircle { @@ -135,8 +135,8 @@ bool QDeclarativeGeoCircle::contains(QDeclarativeCoordinate *coordinate) This property holds the coordinate of the center of the bounding circle. - Note: this property's changed() signal is currently emitted only if the - whole element changes, not if only the contents of the element change. + \note this property's changed() signal is currently emitted only if the + whole object changes, not if only the contents of the object change. */ QDeclarativeCoordinate *QDeclarativeGeoCircle::center() { diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp index 9ebc3a83..524e517d 100644 --- a/src/imports/location/qdeclarativegeocodemodel.cpp +++ b/src/imports/location/qdeclarativegeocodemodel.cpp @@ -57,10 +57,10 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-geocoding \since Qt Location 5.0 - \brief The GeocodeModel element provides support for searching operations + \brief The GeocodeModel type provides support for searching operations related to geographic information. - The GeocodeModel element is used as part of a model/view grouping to + The GeocodeModel type is used as part of a model/view grouping to match addresses or search strings with geographic locations. How the geographic locations generated are used or displayed is decided by any Views attached to the GeocodeModel (for example a \l MapItemView or \l{ListView}). diff --git a/src/imports/location/qdeclarativegeolocation.cpp b/src/imports/location/qdeclarativegeolocation.cpp index ffea2e00..2d80da79 100644 --- a/src/imports/location/qdeclarativegeolocation.cpp +++ b/src/imports/location/qdeclarativegeolocation.cpp @@ -50,14 +50,14 @@ QT_USE_NAMESPACE \ingroup qml-QtLocation5-positioning \since Qt Location 5.0 - \brief The Location element holds location data. + \brief The Location type holds location data. - Location elements represent a geographic "location", in a human sense. This + Location types represent a geographic "location", in a human sense. This consists of a specific \l {coordinate}, an \l {address} and a \l {boundingBox}{bounding box}. The \l {boundingBox}{bounding box} represents the recommended region to display when viewing this location. - The Location element is most commonly seen as the contents of a search + The Location type is most commonly seen as the contents of a search model such as the GeocodeModel. When a GeocodeModel returns the list of locations found for a given query, it represents these as Location objects. @@ -167,8 +167,8 @@ QDeclarativeGeoAddress *QDeclarativeGeoLocation::address() This property holds the exact geographical coordinate of the location which can be used to retrieve the latitude, longitude and altitude of the location. - Note: this property's changed() signal is currently emitted only if the - whole element changes, not if only the contents of the element change. + \note this property's changed() signal is currently emitted only if the + whole object changes, not if only the contents of the object change. */ void QDeclarativeGeoLocation::setCoordinate(QDeclarativeCoordinate *coordinate) { @@ -196,7 +196,7 @@ QDeclarativeCoordinate *QDeclarativeGeoLocation::coordinate() context. Note: this property's changed() signal is currently emitted only if the - whole element changes, not if only the contents of the element change. + whole object changes, not if only the contents of the object change. */ void QDeclarativeGeoLocation::setBoundingBox(QDeclarativeGeoRectangle *boundingBox) { diff --git a/src/imports/location/qdeclarativegeomaneuver.cpp b/src/imports/location/qdeclarativegeomaneuver.cpp index c8af0b3f..f6081330 100644 --- a/src/imports/location/qdeclarativegeomaneuver.cpp +++ b/src/imports/location/qdeclarativegeomaneuver.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-routing \since Qt Location 5.0 - \brief The RouteManeuver element represents the information relevant to the + \brief The RouteManeuver type represents the information relevant to the point at which two RouteSegments meet. RouteSegment instances can be thought of as edges on a routing diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index 16d65a28..81433247 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -77,9 +77,9 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-maps \since Qt Location 5.0 - \brief The Map element displays a map. + \brief The Map type displays a map. - The Map element is used to display a map or image of the Earth, with + The Map type is used to display a map or image of the Earth, with the capability to also display interactive objects tied to the map's surface. @@ -89,13 +89,13 @@ QT_BEGIN_NAMESPACE and altitude) and 2D coordinates (X and Y in pixels) on the screen. Different sources of map data can use different projections, and from the - point of view of the Map element, we treat these as one replaceable unit: + point of view of the Map type, we treat these as one replaceable unit: the Map plugin. A Map plugin consists of a data source, as well as all other details needed to display its data on-screen. The current Map plugin in use is contained in the \l plugin property of the Map item. In order to display any image in a Map item, you will need - to set this property. See the \l Plugin element for a description of how + to set this property. See the \l Plugin type for a description of how to retrieve an appropriate plugin for use. The geographic region displayed in the Map item is referred to as its @@ -124,17 +124,17 @@ QT_BEGIN_NAMESPACE \section2 Interaction - The Map element includes support for pinch and flick gestures to control + The Map type includes support for pinch and flick gestures to control zooming and panning. These are enabled by default, and available at any time by using the \l gesture object. The actual GestureArea is constructed specially at startup and cannot be replaced or destroyed. Its properties can be altered, however, to control its behavior. Mouse and touch interaction with Maps and map objects is slightly different - to ordinary QML elements. In a Map or Map object, you will need to make use - of the \l MapMouseArea element instead of the normal Qt Quick MouseArea. + to ordinary QML types. In a Map or Map object, you will need to make use + of the \l MapMouseArea type instead of the normal Qt Quick MouseArea. MapMouseArea is, in almost all respects, a drop-in replacement for - MouseArea, but the documentation for that element should be referred to for + MouseArea, but the documentation for that type should be referred to for further details. \section2 Performance @@ -153,11 +153,11 @@ QT_BEGIN_NAMESPACE In general, large and complex Map items such as polygons and polylines with large numbers of vertices can have an adverse effect on UI performance. Further, more detailed notes on this are in the documentation for each - map item element. + map item type. \section2 Example Usage - The following snippet shows a simple Map and the necessary Plugin element + The following snippet shows a simple Map and the necessary Plugin type to use it. The map is centered near Brisbane, Australia, zoomed out to the minimum zoom level, with gesture interaction enabled. @@ -1019,7 +1019,7 @@ void QDeclarativeGeoMap::addMapItem(QDeclarativeGeoMapItemBase *item) Returns the list of all map items in no particular order. These items include items that were declared statically as part of - the element declaration, as well as dynamical items (\l addMapItem, + the type declaration, as well as dynamical items (\l addMapItem, \l MapItemView). \sa addMapItem, removeMapItem, clearMapItems diff --git a/src/imports/location/qdeclarativegeomapgesturearea.cpp b/src/imports/location/qdeclarativegeomapgesturearea.cpp index b0365437..932ad021 100644 --- a/src/imports/location/qdeclarativegeomapgesturearea.cpp +++ b/src/imports/location/qdeclarativegeomapgesturearea.cpp @@ -73,9 +73,9 @@ QT_BEGIN_NAMESPACE \instantiates QDeclarativeGeoMapPinchEvent \inqmlmodule QtLocation 5.0 - \brief MapPinchEvent element provides basic information about pinch event. + \brief MapPinchEvent type provides basic information about pinch event. - MapPinchEvent element provides basic information about pinch event. They are + MapPinchEvent type provides basic information about pinch event. They are present in handlers of MapPinch (for example pinchStarted/pinchUpdated). Events are only guaranteed to be valid for the duration of the handler. @@ -149,9 +149,9 @@ QT_BEGIN_NAMESPACE \inqmlmodule QtLocation 5.0 - \brief The MapGestureArea element provides Map gesture interaction. + \brief The MapGestureArea type provides Map gesture interaction. - MapGestureArea elements are used as part of a Map, to provide for panning, + MapGestureArea objects are used as part of a Map, to provide for panning, flicking and pinch-to-zoom gesture used on touch displays. A MapGestureArea is automatically created with a new Map and available with diff --git a/src/imports/location/qdeclarativegeomapitemview.cpp b/src/imports/location/qdeclarativegeomapitemview.cpp index 986bdae9..98111479 100644 --- a/src/imports/location/qdeclarativegeomapitemview.cpp +++ b/src/imports/location/qdeclarativegeomapitemview.cpp @@ -62,12 +62,12 @@ QT_BEGIN_NAMESPACE \brief The MapItemView is used to populate Map from a model. The MapItemView is used to populate Map with MapItems from a model. - The MapItemView element only makes sense when contained in a Map, + The MapItemView type only makes sense when contained in a Map, meaning that it has no standalone presentation. \section2 Example Usage - This example demonstrates how to use the MapViewItem element to display + This example demonstrates how to use the MapViewItem object to display a \l{Route}{route} on a \l{Map}{map}: \snippet snippets/declarative/maps.qml QtQuick import @@ -184,7 +184,7 @@ void QDeclarativeGeoMapItemView::itemModelRowsRemoved(QModelIndex, int start, in This property holds the delegate which defines how each item in the model should be displayed. The Component must contain exactly one - MapItem -derived element as the root element. + MapItem -derived object as the root object. */ QQmlComponent *QDeclarativeGeoMapItemView::delegate() const diff --git a/src/imports/location/qdeclarativegeomapmousearea.cpp b/src/imports/location/qdeclarativegeomapmousearea.cpp index e4214423..649f487a 100644 --- a/src/imports/location/qdeclarativegeomapmousearea.cpp +++ b/src/imports/location/qdeclarativegeomapmousearea.cpp @@ -66,10 +66,10 @@ QT_BEGIN_NAMESPACE provide this functionality instead. The only exception to this is the MapQuickItem, which can have normal - MouseArea elements defined within the sourceItem. See the documentation + MouseArea objects defined within the sourceItem. See the documentation for \l{MapQuickItem} for more details. - MapMouseArea elements should only ever be used within a map object, such as + MapMouseArea objects should only ever be used within a map object, such as a MapPolygon or MapQuickItem, and never within another Qt Quick component. The \l enabled property of the MapMouseArea is used to enable and disable @@ -196,7 +196,7 @@ void QDeclarativeGeoMapMouseArea::componentComplete() */ void QDeclarativeGeoMapMouseArea::mousePressEvent(QMouseEvent *event) { - // map element's flickable may use the event + // map object's flickable may use the event QQuickItem *pmi = parentMapItem(); if (pmi && qobject_cast<QDeclarativeGeoMap *>(pmi)) qobject_cast<QDeclarativeGeoMap *>(pmi)->mouseEvent(event); @@ -217,7 +217,7 @@ void QDeclarativeGeoMapMouseArea::mousePressEvent(QMouseEvent *event) */ void QDeclarativeGeoMapMouseArea::mouseReleaseEvent(QMouseEvent *event) { - // map element's flickable may use the event + // map object's flickable may use the event QQuickItem *pmi = parentMapItem(); if (pmi && qobject_cast<QDeclarativeGeoMap *>(pmi)) { @@ -245,7 +245,7 @@ void QDeclarativeGeoMapMouseArea::mouseDoubleClickEvent(QMouseEvent *event) */ void QDeclarativeGeoMapMouseArea::mouseMoveEvent(QMouseEvent *event) { - // map element's flickable may use the event + // map object's flickable may use the event QQuickItem *pmi = parentMapItem(); if (pmi && qobject_cast<QDeclarativeGeoMap *>(pmi)) qobject_cast<QDeclarativeGeoMap *>(pmi)->mouseEvent(event); diff --git a/src/imports/location/qdeclarativegeomapquickitem.cpp b/src/imports/location/qdeclarativegeomapquickitem.cpp index 3f8aa3ad..0ecfd7c4 100644 --- a/src/imports/location/qdeclarativegeomapquickitem.cpp +++ b/src/imports/location/qdeclarativegeomapquickitem.cpp @@ -57,16 +57,16 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-maps \since Qt Location 5.0 - \brief The MapQuickItem element displays an arbitrary Qt Quick element + \brief The MapQuickItem type displays an arbitrary Qt Quick object on a Map. - The MapQuickItem element is used to place an arbitrary Qt Quick element + The MapQuickItem type is used to place an arbitrary Qt Quick object on a Map at a specified location and size. Compared to floating an item above the Map, a MapQuickItem will follow the panning (and optionally, the zooming) of the Map as if it is on the Map surface. The \l{sourceItem} property contains the Qt Quick item to be drawn, which - can be any kind of visible element. + can be any kind of visible type. \section2 Positioning and Sizing @@ -91,8 +91,8 @@ QT_BEGIN_NAMESPACE \section2 Interaction - MapQuickItem is different to the other map object elements in that it can - accept "normal" QtQuick mouse and touch interaction elements as well as + MapQuickItem is different to the other map objects in that it can + accept "normal" QtQuick mouse and touch interaction types as well as the MapMouseArea and friends. For example, for a MapQuickItem, the following two situations are equivalent: @@ -125,7 +125,7 @@ QT_BEGIN_NAMESPACE \endcode Note, however, that using a MapMouseArea inside the sourceItem (in this - case, inside the Rectangle element), is unsupported, and may not work as + case, inside the Rectangle object), is unsupported, and may not work as desired. MouseAreas used inside a complex \l{sourceItem} can be used to create, for @@ -149,7 +149,7 @@ QT_BEGIN_NAMESPACE \section2 Example Usage - The following snippet shows a MapQuickItem containing an Image element, + The following snippet shows a MapQuickItem containing an Image object, to display a Marker on the Map. This strategy is used to show the map markers in the MapViewer example. diff --git a/src/imports/location/qdeclarativegeomaptype.cpp b/src/imports/location/qdeclarativegeomaptype.cpp index da822778..9dc6defe 100644 --- a/src/imports/location/qdeclarativegeomaptype.cpp +++ b/src/imports/location/qdeclarativegeomaptype.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-maps \since Qt Location 5.0 - \brief The MapType element holds information about a map type. + \brief The MapType type holds information about a map type. This includes the map type's \l name and \l description, the \l style and a flag to indicate if the map type is optimized for mobile devices (\l mobile). diff --git a/src/imports/location/qdeclarativegeorectangle.cpp b/src/imports/location/qdeclarativegeorectangle.cpp index 6461459e..7db79873 100644 --- a/src/imports/location/qdeclarativegeorectangle.cpp +++ b/src/imports/location/qdeclarativegeorectangle.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-positioning \since Qt Location 5.0 - \brief The GeoRectangle element represents a rectangular geographic area. + \brief The GeoRectangle type represents a rectangular geographic area. A GeoRectangle is described by a \l {Coordinate} which represents the top-left of the GeoRectangle and a second \l {Coordinate} which represents the bottom-right of GeoRectangle. @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE \section2 Example Usage - The following code snippet shows the declaration of a GeoRectangle element. + The following code snippet shows the declaration of a GeoRectangle object. \code GeoRectangle { @@ -154,8 +154,8 @@ QDeclarativeCoordinate *QDeclarativeGeoRectangle::bottomLeft() This property holds the bottom left coordinate of this geo rectangle. - Note: this property's changed() signal is currently emitted only if the - whole element changes, not if only the contents of the element change. + \note this property's changed() signal is currently emitted only if the + whole object changes, not if only the contents of the object change. \sa {QGeoRectangle} */ @@ -203,8 +203,8 @@ QDeclarativeCoordinate *QDeclarativeGeoRectangle::bottomRight() This property holds the bottom right coordinate of this geo rectangle. - Note: this property's changed() signal is currently emitted only if the - whole element changes, not if only the contents of the element change. + \note this property's changed() signal is currently emitted only if the + whole object changes, not if only the contents of the object change. \sa {QGeoRectangle} */ @@ -252,8 +252,8 @@ QDeclarativeCoordinate *QDeclarativeGeoRectangle::topLeft() This property holds the top left coordinate of this geo rectangle. - Note: this property's changed() signal is currently emitted only if the - whole element changes, not if only the contents of the element change. + \note this property's changed() signal is currently emitted only if the + whole object changes, not if only the contents of the object change. \sa {QGeoRectangle} */ @@ -301,8 +301,8 @@ QDeclarativeCoordinate *QDeclarativeGeoRectangle::topRight() This property holds the top right coordinate of this geo rectangle. - Note: this property's changed() signal is currently emitted only if the - whole element changes, not if only the contents of the element change. + \note this property's changed() signal is currently emitted only if the + whole type changes, not if only the contents of the type change. \sa {QGeoRectangle} */ @@ -350,8 +350,8 @@ QDeclarativeCoordinate *QDeclarativeGeoRectangle::center() This property holds the center coordinate of this geo rectangle. - Note: this property's changed() signal is currently emitted only if the - whole element changes, not if only the contents of the element change. + \note this property's changed() signal is currently emitted only if the + whole object changes, not if only the contents of the object change. \sa {QGeoRectangle} diff --git a/src/imports/location/qdeclarativegeoroute.cpp b/src/imports/location/qdeclarativegeoroute.cpp index a9b5760a..dc0886a0 100644 --- a/src/imports/location/qdeclarativegeoroute.cpp +++ b/src/imports/location/qdeclarativegeoroute.cpp @@ -50,9 +50,9 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-routing \since Qt Location 5.0 - \brief The Route element represents one geographical route. + \brief The Route type represents one geographical route. - A Route element contains high level information about a route, such + A Route type contains high level information about a route, such as the length the route, the estimated travel time for the route, and enough information to render a basic image of the route on a map. diff --git a/src/imports/location/qdeclarativegeoroutemodel.cpp b/src/imports/location/qdeclarativegeoroutemodel.cpp index 815d31b0..48e75b62 100644 --- a/src/imports/location/qdeclarativegeoroutemodel.cpp +++ b/src/imports/location/qdeclarativegeoroutemodel.cpp @@ -57,13 +57,13 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-routing \since Qt Location 5.0 - \brief The RouteModel element provides access to routes. + \brief The RouteModel type provides access to routes. - The RouteModel element is used as part of a model/view grouping to retrieve + The RouteModel type is used as part of a model/view grouping to retrieve geographic routes from a backend provider. Routes include data about driving directions between two points, walking directions with multiple waypoints, and various other similar concepts. It functions much like other Model - elements in QML (see for example \l {Models and Views in Qt Quick#ListModel}{ListModel} and + types in QML (see for example \l {Models and Views in Qt Quick#ListModel}{ListModel} and \l XmlListModel), and interacts with views such as \l MapItemView, and \l{ListView}. Like \l Map and \l GeocodeModel, all the data for a RouteModel to work comes @@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE \section2 Example Usage The following snippet is two-part, showing firstly the declaration of - elements, and secondly a short piece of procedural code using it. We set + objects, and secondly a short piece of procedural code using it. We set the routeModel's \l{autoUpdate} property to false, and call \l{update} once the query is set up, to avoid useless extra requests halfway through the set up of the query. @@ -594,7 +594,7 @@ void QDeclarativeGeoRouteModel::routingError(QGeoRouteReply *reply, \ingroup qml-QtLocation5-routing \since Qt Location 5.0 - \brief The RouteQuery element is used to provide query parameters to a + \brief The RouteQuery type is used to provide query parameters to a RouteModel. A RouteQuery contains all the parameters necessary to make a request @@ -627,7 +627,7 @@ void QDeclarativeGeoRouteModel::routingError(QGeoRouteReply *reply, \endcode For a more complete example, see the documentation for the \l{RouteModel} - element, and the Mapviewer example. + type, and the Mapviewer example. \sa RouteModel @@ -720,7 +720,7 @@ void QDeclarativeGeoRouteQuery::setNumberAlternativeRoutes(int numberAlternative The waypoints should be given in order from origin to destination. Two or more coordinates are needed. - Waypoints can be set as part of the RouteQuery element declaration or + Waypoints can be set as part of the RouteQuery type declaration or dynamically with the functions provided. \sa addWaypoint, removeWaypoint, clearWaypoints @@ -775,7 +775,7 @@ void QDeclarativeGeoRouteQuery::waypoints_clear(QQmlListProperty<QDeclarativeCoo Areas that the route must not cross. - Excluded areas can be set as part of the RouteQuery element declaration or + Excluded areas can be set as part of the \l RouteQuery type declaration or dynamically with the functions provided. \sa addExcludedArea, removeExcludedArea, clearExcludedAreas diff --git a/src/imports/location/qdeclarativegeoroutesegment.cpp b/src/imports/location/qdeclarativegeoroutesegment.cpp index ff07df81..5f83058d 100644 --- a/src/imports/location/qdeclarativegeoroutesegment.cpp +++ b/src/imports/location/qdeclarativegeoroutesegment.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-routing \since Qt Location 5.0 - \brief The RouteSegment element represents a segment of a Route. + \brief The RouteSegment type represents a segment of a Route. A RouteSegment instance has information about the physical layout of the route segment, the length of the route and estimated time required diff --git a/src/imports/location/qdeclarativegeoserviceprovider.cpp b/src/imports/location/qdeclarativegeoserviceprovider.cpp index 6616f82b..313215d8 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider.cpp +++ b/src/imports/location/qdeclarativegeoserviceprovider.cpp @@ -52,12 +52,12 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-common \since Qt Location 5.0 - \brief The Plugin element describes a Location based services plugin. + \brief The Plugin type describes a Location based services plugin. - The Plugin element is used to declaratively specify which available + The Plugin type is used to declaratively specify which available GeoServices plugin should be used for various tasks in the Location API. Plugins are used by \l Map, \l RouteModel, and \l GeocodeModel - elements, as well as a variety of others. + types, as well as a variety of others. Plugins recognized by the system have a \l name property, a simple string normally indicating the name of the service that the Plugin retrieves @@ -65,15 +65,15 @@ QT_BEGIN_NAMESPACE \l {supportsRouting()}, \l {supportsGeocoding()}, \l {supportsMapping()} and \l {supportsPlaces()} methods. - When a Plugin element is created, it is "detached" and not associated with + When a Plugin object is created, it is "detached" and not associated with any actual service plugin. Once it has received information via setting its \l name, \l preferred, or \l required properties, it will choose an - appropriate service plugin to attach to. Plugin elements can only be - attached once; to use multiple plugins, create multiple Plugin elements. + appropriate service plugin to attach to. Plugin objects can only be + attached once; to use multiple plugins, create multiple Plugin objects. \section2 Example Usage - The following snippet shows a Plugin element being created with the + The following snippet shows a Plugin object being created with the \l required and \l preferred properties set. This Plugin will attach to the first plugin found plugin that supports both mapping and geocoding, and will prefer plugins named "nokia" or "foo" to any others. @@ -385,7 +385,7 @@ bool QDeclarativeGeoServiceProvider::supportsPlaces(const PlacesFeatures &featur \qmlproperty enumeration Plugin::required This property contains the set of features that will be required by the - Plugin element when choosing which service plugin to attach to. If the + Plugin object when choosing which service plugin to attach to. If the \l name property is set, this has no effect. Any of the following values or a bitwise combination of multiple values @@ -748,14 +748,14 @@ bool QDeclarativeGeoServiceProviderRequirements::matches(const QGeoServiceProvid \ingroup qml-QtLocation5-common \since Qt Location 5.0 - \brief The PluginParameter element describes a parameter to a \l Plugin. + \brief The PluginParameter type describes a parameter to a \l Plugin. - The PluginParameter element is used to provide a parameter of some kind + The PluginParameter object is used to provide a parameter of some kind to a Plugin. Typically these parameters contain details like an application token for access to a service, or a proxy server to use for network access. To set such a parameter, declare a PluginParameter inside a \l Plugin - element, and give it \l{name} and \l{value} properties. A list of valid + object, and give it \l{name} and \l{value} properties. A list of valid parameter names for each plugin is available from the \l {Qt Location Module#Plugin References and Parameters}{plugin reference pages}. diff --git a/src/imports/location/qdeclarativegeoshape.cpp b/src/imports/location/qdeclarativegeoshape.cpp index c714123e..b65974dc 100644 --- a/src/imports/location/qdeclarativegeoshape.cpp +++ b/src/imports/location/qdeclarativegeoshape.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE \brief The GeoShape type represents an abstract geographic area. - The GeoShape element is not intended to be instantiated by the developer. Use GeoRectangle + The GeoShape type is not intended to be instantiated by the developer. Use GeoRectangle or GeoCircle instead. \sa GeoRectangle, GeoCircle diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp index 3864352d..596712b1 100644 --- a/src/imports/location/qdeclarativepolygonmapitem.cpp +++ b/src/imports/location/qdeclarativepolygonmapitem.cpp @@ -63,19 +63,19 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-maps \since Qt Location 5.0 - \brief The MapPolygon element displays a polygon on a Map + \brief The MapPolygon type displays a polygon on a Map - The MapPolygon element displays a polygon on a Map, specified in terms of - an ordered list of \l Coordinate elements. For best appearance and results, + The MapPolygon type displays a polygon on a Map, specified in terms of + an ordered list of \l Coordinate objects. For best appearance and results, polygons should be simple (not self-intersecting). - The Coordinate elements on the path can be changed after being added to + The Coordinate objects on the path can be changed after being added to the Polygon, and these changes will be reflected in the next frame on the display. Coordinates can also be added and removed at any time using the \l addCoordinate and \l removeCoordinate methods. For drawing rectangles with "straight" edges (same latitude across one - edge, same latitude across the other), the \l MapRectangle element provides + edge, same latitude across the other), the \l MapRectangle type provides a simpler, two-point API. By default, the polygon is displayed as a 1 pixel black border with no diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp index b375be57..bb4645ae 100644 --- a/src/imports/location/qdeclarativepolylinemapitem.cpp +++ b/src/imports/location/qdeclarativepolylinemapitem.cpp @@ -63,10 +63,10 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-maps \since Qt Location 5.0 - \brief The MapPolyline element displays a polyline on a map. + \brief The MapPolyline type displays a polyline on a map. - The MapPolyline element displays a polyline on a map, specified in terms - of an ordered list of \l Coordinate elements. The Coordinate elements + The MapPolyline type displays a polyline on a map, specified in terms + of an ordered list of \l Coordinate objects. The Coordinate objects on the path can be changed after being added to the Polyline, and these changes will be reflected in the next frame on the display. Coordinates can also be added and removed at any time using the \l addCoordinate and diff --git a/src/imports/location/qdeclarativeposition.cpp b/src/imports/location/qdeclarativeposition.cpp index 6daf7c01..7f1de309 100644 --- a/src/imports/location/qdeclarativeposition.cpp +++ b/src/imports/location/qdeclarativeposition.cpp @@ -53,10 +53,10 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-positioning \since Qt Location 5.0 - \brief The Position element holds positional data at a particular point in time, + \brief The Position type holds positional data at a particular point in time, such as coordinate (longitude, latitude, altitude) and speed. - The Position element holds values related to geographic location such as + The Position type holds values related to geographic location such as a \l coordinate (longitude, latitude, and altitude), the \l timestamp when the Position was obtained, the \l speed at that time, and the accuracy of the data. @@ -72,11 +72,11 @@ QT_BEGIN_NAMESPACE etc) to discern whether the data is available and valid in this position update. - Position elements are read-only and can only be produced by a PositionSource. + Position objects are read-only and can only be produced by a PositionSource. \section2 Example Usage - See the example given for the \l{PositionSource} element, or the + See the example given for the \l{PositionSource} type, or the \l{declarative/flickr}{Flickr} example application. \sa PositionSource, Coordinate @@ -104,7 +104,7 @@ QDeclarativePosition::~QDeclarativePosition() Note: due to its inherent changing nature, the coordinateChanged() signal is emitted also when the values of the coordinate change, - which enables easier data binding to Coordinate element instead of + which enables easier data binding to Coordinate objects instead of directly connecting to for example its latitude and longitude. \sa longitudeValid, latitudeValid, altitudeValid diff --git a/src/imports/location/qdeclarativepositionsource.cpp b/src/imports/location/qdeclarativepositionsource.cpp index 4cf8e78a..85e46315 100644 --- a/src/imports/location/qdeclarativepositionsource.cpp +++ b/src/imports/location/qdeclarativepositionsource.cpp @@ -58,10 +58,10 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-positioning \since Qt Location 5.0 - \brief The PositionSource element provides the device's current position. + \brief The PositionSource type provides the device's current position. - The PositionSource element provides information about the user device's - current position. The position is available as a \l{Position} element, which + The PositionSource type provides information about the user device's + current position. The position is available as a \l{Position} type, which contains all the standard parameters typically available from GPS and other similar systems, including longitude, latitude, speed and accuracy details. @@ -185,7 +185,7 @@ void QDeclarativePositionSource::setName(const QString &name) /*! \qmlproperty bool PositionSource::valid - This property is true if the PositionSource element has acquired a valid + This property is true if the PositionSource object has acquired a valid backend plugin to provide data. If false, other methods on the PositionSource will have no effect. @@ -289,7 +289,7 @@ void QDeclarativePositionSource::setUpdateInterval(int updateInterval) meaning that the data and time information in the NMEA source data is used to provide positional updates at the rate at which the data was originally recorded. - If nmeaSource has been set for a PositionSource element, there is no way to revert + If nmeaSource has been set for a PositionSource object, there is no way to revert back to non-file sources. */ @@ -490,7 +490,7 @@ bool QDeclarativePositionSource::isActive() const This property holds the last known positional data. It is a read-only property. - The Position element has different positional member variables, + The Position type has different positional member variables, whose validity can be checked with appropriate validity functions (for example sometimes an update does not have speed or altitude data). diff --git a/src/imports/location/qdeclarativerectanglemapitem.cpp b/src/imports/location/qdeclarativerectanglemapitem.cpp index bce0c9ea..6e27b766 100644 --- a/src/imports/location/qdeclarativerectanglemapitem.cpp +++ b/src/imports/location/qdeclarativerectanglemapitem.cpp @@ -57,9 +57,9 @@ QT_BEGIN_NAMESPACE \ingroup qml-QtLocation5-maps \since Qt Location 5.0 - \brief The MapRectangle element displays a rectangle on a Map. + \brief The MapRectangle type displays a rectangle on a Map. - The MapRectangle element displays a rectangle on a Map. Rectangles are a + The MapRectangle type displays a rectangle on a Map. Rectangles are a special case of Polygon with exactly 4 vertices and 4 "straight" edges. In this case, "straight" means that the top-left point has the same latitude as the top-right point (the top edge), and the bottom-left point has the @@ -68,13 +68,13 @@ QT_BEGIN_NAMESPACE right side have the same longitude. To specify the rectangle, it requires a \l topLeft and \l bottomRight point, - both given by \l Coordinate elements. + both given by \l Coordinate types. By default, the rectangle is displayed with transparent fill and a 1-pixel thick black border. This can be changed using the \l color, \l border.color and \l border.width properties. - \note Similar to the \l MapPolygon element, MapRectangles are geographic + \note Similar to the \l MapPolygon type, MapRectangles are geographic items, thus dragging a MapRectangle causes its vertices to be recalculated in the geographic coordinate space. Apparent stretching of the item occurs when dragged to the a different latitude, however, its edges diff --git a/src/imports/location/qdeclarativeroutemapitem.cpp b/src/imports/location/qdeclarativeroutemapitem.cpp index 72332898..7d9c6f5f 100644 --- a/src/imports/location/qdeclarativeroutemapitem.cpp +++ b/src/imports/location/qdeclarativeroutemapitem.cpp @@ -54,9 +54,9 @@ \ingroup qml-QtLocation5-maps \since Qt Location 5.0 - \brief The MapRoute element displays a Route on a Map. + \brief The MapRoute type displays a Route on a Map. - The MapRoute element displays a Route obtained through a RouteModel or + The MapRoute type displays a Route obtained through a RouteModel or other means, on the Map as a Polyline following the path of the Route. MapRoute is really a \l MapPolyline, but with the path specified using the diff --git a/src/location/maps/qgeorouterequest.cpp b/src/location/maps/qgeorouterequest.cpp index 4866aa31..abb408d1 100644 --- a/src/location/maps/qgeorouterequest.cpp +++ b/src/location/maps/qgeorouterequest.cpp @@ -221,7 +221,7 @@ QT_BEGIN_NAMESPACE /*! Constructs a request to calculate a route through the coordinates \a waypoints. - The route will traverse the elements of \a waypoints in order. + The route will traverse the objects of \a waypoints in order. */ QGeoRouteRequest::QGeoRouteRequest(const QList<QGeoCoordinate> &waypoints) : d_ptr(new QGeoRouteRequestPrivate()) diff --git a/tests/auto/qplacemanager_jsondb/jsondbutils.cpp b/tests/auto/qplacemanager_jsondb/jsondbutils.cpp index 71950b97..a85e39d4 100644 --- a/tests/auto/qplacemanager_jsondb/jsondbutils.cpp +++ b/tests/auto/qplacemanager_jsondb/jsondbutils.cpp @@ -88,7 +88,7 @@ const QLatin1String JsonDbUtils::AllCategoryUuids("allCategoryUuids"); const QLatin1String JsonDbUtils::CategoryType("com.nokia.mt.location.PlaceCategory"); //includes all ancestor category ids and also the current category id -//as the last element. The first category is a top level category id. +//as the last object. The first category is a top level category id. const QLatin1String JsonDbUtils::Lineage("lineageUuids"); const QLatin1String JsonDbUtils::CategoryParentId("parentUuid"); |