diff options
44 files changed, 684 insertions, 684 deletions
diff --git a/doc/config/compat.qdocconf b/doc/config/compat.qdocconf index 0b59629e..53a26136 100644 --- a/doc/config/compat.qdocconf +++ b/doc/config/compat.qdocconf @@ -5,24 +5,24 @@ macro.0 = "\\\\0" macro.b = "\\\\b" macro.n = "\\\\n" macro.r = "\\\\r" -macro.i = "\\o" -macro.i11 = "\\o{1,1}" -macro.i12 = "\\o{1,2}" -macro.i13 = "\\o{1,3}" -macro.i14 = "\\o{1,4}" -macro.i15 = "\\o{1,5}" -macro.i16 = "\\o{1,6}" -macro.i17 = "\\o{1,7}" -macro.i18 = "\\o{1,8}" -macro.i19 = "\\o{1,9}" -macro.i21 = "\\o{2,1}" -macro.i31 = "\\o{3,1}" -macro.i41 = "\\o{4,1}" -macro.i51 = "\\o{5,1}" -macro.i61 = "\\o{6,1}" -macro.i71 = "\\o{7,1}" -macro.i81 = "\\o{8,1}" -macro.i91 = "\\o{9,1}" +macro.i = "\\li" +macro.i11 = "\\li{1,1}" +macro.i12 = "\\li{1,2}" +macro.i13 = "\\li{1,3}" +macro.i14 = "\\li{1,4}" +macro.i15 = "\\li{1,5}" +macro.i16 = "\\li{1,6}" +macro.i17 = "\\li{1,7}" +macro.i18 = "\\li{1,8}" +macro.i19 = "\\li{1,9}" +macro.i21 = "\\li{2,1}" +macro.i31 = "\\li{3,1}" +macro.i41 = "\\li{4,1}" +macro.i51 = "\\li{5,1}" +macro.i61 = "\\li{6,1}" +macro.i71 = "\\li{7,1}" +macro.i81 = "\\li{8,1}" +macro.i91 = "\\li{9,1}" macro.img = "\\image" macro.endquote = "\\endquotation" macro.relatesto = "\\relates" diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf index 7648b54d..d8b96c0b 100644 --- a/doc/config/macros.qdocconf +++ b/doc/config/macros.qdocconf @@ -2,17 +2,17 @@ macro.aacute.HTML = "á" macro.Aring.HTML = "Å" macro.aring.HTML = "å" macro.Auml.HTML = "Ä" -macro.author = "\\bold{Author:}" +macro.author = "\\b{Author:}" macro.br.HTML = "<br />" macro.BR.HTML = "<br />" macro.copyright.HTML = "©" macro.eacute.HTML = "é" -macro.gui = "\\bold" +macro.gui = "\\b" macro.hr.HTML = "<hr />" macro.iacute.HTML = "í" -macro.key = "\\bold" -macro.menu = "\\bold" -macro.note = "\\bold{Note:}" +macro.key = "\\b" +macro.menu = "\\b" +macro.note = "\\b{Note:}" macro.oslash.HTML = "ø" macro.ouml.HTML = "ö" macro.QA = "\\e{Qt Assistant}" diff --git a/doc/src/examples/declarative-flickr.qdoc b/doc/src/examples/declarative-flickr.qdoc index ccdd95be..9ed4c365 100644 --- a/doc/src/examples/declarative-flickr.qdoc +++ b/doc/src/examples/declarative-flickr.qdoc @@ -39,8 +39,8 @@ Key QML elements shown in this example: \list - \o \l{QtLocation5::PositionSource}{PositionSource} - \o \l{XmlListModel}{XmlListModel} + \li \l{QtLocation5::PositionSource}{PositionSource} + \li \l{XmlListModel}{XmlListModel} \endlist \image qml-flickr-1.jpg diff --git a/doc/src/examples/declarative-mapviewer.qdoc b/doc/src/examples/declarative-mapviewer.qdoc index 30f73a07..cc34043e 100644 --- a/doc/src/examples/declarative-mapviewer.qdoc +++ b/doc/src/examples/declarative-mapviewer.qdoc @@ -40,23 +40,23 @@ QML elements shown in this example: \list - \o Displaying a map + \li Displaying a map \list - \o \l{QtLocation5::Map}{Map} - \o \l{QtLocation5::MapFlickable}{MapFlickable} - \o \l{QtLocation5::MapPinchArea}{MapPinchArea} - \o \l{QtLocation5::Coordinate}{Coordinate} + \li \l{QtLocation5::Map}{Map} + \li \l{QtLocation5::MapFlickable}{MapFlickable} + \li \l{QtLocation5::MapPinchArea}{MapPinchArea} + \li \l{QtLocation5::Coordinate}{Coordinate} \endlist - \o Finding an address + \li Finding an address \list - \o \l{QtLocation5::GeocodeModel}{GeocodeModel} - \o \l{QtLocation5::MapItemView}{MapItemView} - \o \l{QtLocation5::MapCircle}{MapCircle} + \li \l{QtLocation5::GeocodeModel}{GeocodeModel} + \li \l{QtLocation5::MapItemView}{MapItemView} + \li \l{QtLocation5::MapCircle}{MapCircle} \endlist - \o Directions and travel routes + \li Directions and travel routes \list - \o \l{QtLocation5::RouteModel}{RouteModel} - \o \l{QtLocation5::MapRoute}{MapRoute} + \li \l{QtLocation5::RouteModel}{RouteModel} + \li \l{QtLocation5::MapRoute}{MapRoute} \endlist \endlist diff --git a/doc/src/examples/declarative-places.qdoc b/doc/src/examples/declarative-places.qdoc index 4ae6d00d..05459154 100644 --- a/doc/src/examples/declarative-places.qdoc +++ b/doc/src/examples/declarative-places.qdoc @@ -95,7 +95,7 @@ categories \l {Category::remove()}{remove()} method. The \e onEditClicked handler will display a dialog to edit the category. - The \e CategoryDelegate displays the category name and emits the \bold clicked() signal when + The \e CategoryDelegate displays the category name and emits the \b clicked() signal when the text is clicked: \snippet declarative/places/content/places/CategoryDelegate.qml CategoryModel delegate text @@ -150,7 +150,7 @@ \e searchRegion object which is a \l BoundingCircle with a center that is linked to the current location displayed on the \l Map. - Finally, we define two helper functions \bold searchForCategory() and \bold {searchForText()}, + Finally, we define two helper functions \b searchForCategory() and \b {searchForText()}, which set either the \l {PlaceSearchModel::categories}{categories} or \l {PlaceSearchModel::searchTerm}{searchTerm} properties and invokes the \l {PlaceSearchModel::execute()}{execute()} method to start the place search. The search diff --git a/doc/src/examples/weatherinfo.qdoc b/doc/src/examples/weatherinfo.qdoc index b517785b..b1c3726b 100644 --- a/doc/src/examples/weatherinfo.qdoc +++ b/doc/src/examples/weatherinfo.qdoc @@ -37,8 +37,8 @@ Key QtLocation classes used in this example: \list - \o \l{QGeoPositionInfo} - \o \l{QGeoPositionInfoSource} + \li \l{QGeoPositionInfo} + \li \l{QGeoPositionInfoSource} \endlist \image ../images/example-weatherinfo.png diff --git a/doc/src/maps.qdoc b/doc/src/maps.qdoc index 8750a333..11a1ff85 100644 --- a/doc/src/maps.qdoc +++ b/doc/src/maps.qdoc @@ -34,7 +34,7 @@ \brief Provides QtQuick user interfaces for displaying, navigating and interacting with maps, as well as geocoding and navigation. -\bold{Maps & Navigation} provides QtQuick user interface elements for +\b{Maps & Navigation} provides QtQuick user interface elements for displaying geographic information on a map, as well as allowing user interaction with map objects and the display itself. It also contains utilities for geocoding (finding a geographic coordinate from a street @@ -54,20 +54,20 @@ which comes provided with many basic interaction utilities including the on-screen using OpenGL (ES), allowing for hardware-accelerated rendering where available. -\bold{Key elements} +\b{Key elements} \table \row - \o \l{QtLocation5::Plugin}{Plugin} - \o A plugin element is necessary before creating a Map. + \li \l{QtLocation5::Plugin}{Plugin} + \li A plugin element is necessary before creating a Map. \row - \o \l{QtLocation5::Map}{Map} - \o QtQuick item to display a map on-screen + \li \l{QtLocation5::Map}{Map} + \li QtQuick item to display a map on-screen \row - \o \l{QtLocation5::MapFlickable}{MapFlickable} - \o Interaction helper for the "flick" panning gesture on a Map. + \li \l{QtLocation5::MapFlickable}{MapFlickable} + \li Interaction helper for the "flick" panning gesture on a Map. \row - \o \l{QtLocation5::MapPinchArea}{MapPinchArea} - \o Interaction helper for the "pinch to zoom" gesture on a Map. + \li \l{QtLocation5::MapPinchArea}{MapPinchArea} + \li Interaction helper for the "pinch to zoom" gesture on a Map. \endtable \section2 Putting objects on a Map @@ -78,25 +78,25 @@ ability to implement custom objects using the \l{QtLocation5::MapQuickItem}{MapQuickItem} element, which can contain any standard QtQuick item. -\bold{Key elements} +\b{Key elements} \table \row - \o \l{QtLocation5::MapCircle}{MapCircle} - \o Geographic circle (all points at a set distance from a center), optionally with a border. + \li \l{QtLocation5::MapCircle}{MapCircle} + \li Geographic circle (all points at a set distance from a center), optionally with a border. \row - \o \l{QtLocation5::MapRectangle}{MapRectangle} - \o Rectangle in lat/lon space, optional border + \li \l{QtLocation5::MapRectangle}{MapRectangle} + \li Rectangle in lat/lon space, optional border \row - \o \l{QtLocation5::MapPolygon}{MapPolygon} - \o Polygon made of an arbitrary list of \l{QtLocation5::Coordinate}{Coordinate} elements + \li \l{QtLocation5::MapPolygon}{MapPolygon} + \li Polygon made of an arbitrary list of \l{QtLocation5::Coordinate}{Coordinate} elements \row - \o \l{QtLocation5::MapPolyline}{MapPolyline} - \o Polyline made of an arbitrary list of \l{QtLocation5::Coordinate}{Coordinate} elements + \li \l{QtLocation5::MapPolyline}{MapPolyline} + \li Polyline made of an arbitrary list of \l{QtLocation5::Coordinate}{Coordinate} elements \endtable \table \row - \o \l{QtLocation5::MapQuickItem}{MapQuickItem} - \o Turns any arbitrary QtQuick Item into a map object. + \li \l{QtLocation5::MapQuickItem}{MapQuickItem} + \li Turns any arbitrary QtQuick Item into a map object. \endtable \section2 Model-view design with Map objects @@ -106,11 +106,11 @@ model (eg a ListModel item), the \l{QtLocation5::MapItemView}{MapItemView} element is available. It accepts any Map object as its delegate, and can only be created within a \l{QtLocation5::Map}{Map}. -\bold{Key elements} +\b{Key elements} \table \row - \o \l{QtLocation5::MapItemView}{MapItemView} - \o Populates a Map with Map objects based on a model. + \li \l{QtLocation5::MapItemView}{MapItemView} + \li Populates a Map with Map objects based on a model. \endtable \section2 Interaction with Map objects @@ -125,14 +125,14 @@ be changed at any time, and many can also be used in animations. Animating coordinate-based map objects, such as MapPolygon and MapPolyline, is not yet available. -\bold{Key elements} +\b{Key elements} \table \row - \o \l{QtLocation5::MapMouseArea}{MapMouseArea} - \o Accepts mouse events for a pre-defined Map object (eg MapCircle) + \li \l{QtLocation5::MapMouseArea}{MapMouseArea} + \li Accepts mouse events for a pre-defined Map object (eg MapCircle) \row - \o \l{QtLocation5::MapMouseEvent}{MapMouseEvent} - \o Provides additional information unique to mouse events on a Map. + \li \l{QtLocation5::MapMouseEvent}{MapMouseEvent} + \li Provides additional information unique to mouse events on a Map. \endtable \section1 Geocoding -- address to coordinate and vice versa @@ -145,17 +145,17 @@ 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. -\bold{Key elements} +\b{Key elements} \table \row - \o \l{QtLocation5::Plugin}{Plugin} - \o A Plugin element is necessary before creating a GeocodeModel + \li \l{QtLocation5::Plugin}{Plugin} + \li A Plugin element is necessary before creating a GeocodeModel \row - \o \l{QtLocation5::GeocodeModel}{GeocodeModel} - \o Performs geocoding queries and gives results as a model + \li \l{QtLocation5::GeocodeModel}{GeocodeModel} + \li Performs geocoding queries and gives results as a model \row - \o \l{QtLocation5::Address}{Address} - \o Structured address for use in queries and results of geocoding + \li \l{QtLocation5::Address}{Address} + \li Structured address for use in queries and results of geocoding \endtable \section1 Routing and navigation @@ -170,7 +170,7 @@ of the model. \brief Provides C++ classes for Geocoding and Navigation. -\bold{Maps & Navigation} provides C++ utilities for geocoding (finding a +\b{Maps & Navigation} provides C++ utilities for geocoding (finding a geographic coordinate from a street address) and navigation (including driving and walking directions). @@ -183,16 +183,16 @@ class. For coordinate-to-address queries, the on the same class. Instances of QGeocodingManager are available via \l{QGeoServiceProvider}. -\bold{Key classes} +\b{Key classes} \table \row - \o \l{QGeoServiceProvider} - \o Provides a QGeocodingManager instance ready for use + \li \l{QGeoServiceProvider} + \li Provides a QGeocodingManager instance ready for use \row - \o \l{QGeocodingManager} - \o Accepts queries and produces QGeocodeReply objects + \li \l{QGeocodingManager} + \li Accepts queries and produces QGeocodeReply objects \row - \o \l{QGeocodeReply} - \o Contains the results of a geocoding query + \li \l{QGeocodeReply} + \li Contains the results of a geocoding query \endtable */ diff --git a/doc/src/place-caveats.qdocinc b/doc/src/place-caveats.qdocinc index 751467bd..61eefd18 100644 --- a/doc/src/place-caveats.qdocinc +++ b/doc/src/place-caveats.qdocinc @@ -4,13 +4,13 @@ The Places API only supports saving of the following \e {core details}: \list - \o name - \o place id - \o location - \o contact details - \o icon - \o categories - \o visibility scope + \li name + \li place id + \li location + \li contact details + \li icon + \li categories + \li visibility scope \endlist It is possible that providers may only support a subset of these. diff --git a/doc/src/place-definition.qdocinc b/doc/src/place-definition.qdocinc index 87bf7fd0..17d1e81d 100644 --- a/doc/src/place-definition.qdocinc +++ b/doc/src/place-definition.qdocinc @@ -4,8 +4,8 @@ A QPlace object represents a place by acting as a container for various informat This information can be divided into 2 broad classifications \list -\o Details -\o Rich content +\li Details +\li Rich content \endlist The place details consist of properties of the place, such as the name, location, contact information etc. diff --git a/doc/src/places.qdoc b/doc/src/places.qdoc index f5fed5a2..c1126098 100644 --- a/doc/src/places.qdoc +++ b/doc/src/places.qdoc @@ -139,7 +139,7 @@ \snippet snippets/places/requesthandler.h Search for places handler cpp - \bold {Note:} Depending upon the plugin backend that was chosen, the search results may contain places + \b {Note:} Depending upon the plugin backend that was chosen, the search results may contain places which have further details that can be fetched on a place by place basis. To fetch these other details see \l {Fetching Place Details}. @@ -262,10 +262,10 @@ After the categories have been initialized we can then use these category functions. \list - \o QPlaceManager::childCategories() - \o QPlaceManager::category() - \o QPlaceManager::parentCategoryId() - \o QPlaceManager::childCategoryIds(); + \li QPlaceManager::childCategories() + \li QPlaceManager::category() + \li QPlaceManager::parentCategoryId() + \li QPlaceManager::childCategoryIds(); \endlist To retrieve the top level categories diff --git a/doc/src/plugins/jsondb.qdoc b/doc/src/plugins/jsondb.qdoc index cd26f9f6..d5a020c8 100644 --- a/doc/src/plugins/jsondb.qdoc +++ b/doc/src/plugins/jsondb.qdoc @@ -49,73 +49,73 @@ capabilities are outlined below: \section2 Capabilities \table \row - \o Storage - \o local + \li Storage + \li local \row - \o Read/Write - \o read/write + \li Read/Write + \li read/write \row - \o Icons - \o yes + \li Icons + \li yes \row - \o Search term suggestions - \o no + \li Search term suggestions + \li no \row - \o Recommendations - \o no + \li Recommendations + \li no \row - \o Category structure - \o Hierarchical + \li Category structure + \li Hierarchical \row - \o (Rich) Content images - \o no + \li (Rich) Content images + \li no \row - \o (Rich) Content reviews - \o no + \li (Rich) Content reviews + \li no \row - \o (Rich) Content editorials - \o no + \li (Rich) Content editorials + \li no \row - \o All details fetched during search - \o yes + \li All details fetched during search + \li yes \row - \o Paging offset index - \o yes + \li Paging offset index + \li yes \row - \o Paging limit - \o yes + \li Paging limit + \li yes \row - \o Distance relevance hint - \o yes + \li Distance relevance hint + \li yes \row - \o Lexical name relevance hint - \o yes + \li Lexical name relevance hint + \li yes \row - \o Search term corrections - \o no + \li Search term corrections + \li no \row - \o Extended Attributes - \o no + \li Extended Attributes + \li no \row - \o Notifications for added/removed places/categories - \o yes + \li Notifications for added/removed places/categories + \li yes \row - \o visibility scopes - \o device + \li visibility scopes + \li device \row - \o favorites matching/(usable as favoritesPlugin) - \o yes + \li favorites matching/(usable as favoritesPlugin) + \li yes \endtable \section2 Plugin specific behaviours \section3 Search The following list shows what core place data is returned during a place search: \list -\o name -\o location -\o contact information -\o icon -\o categories +\li name +\li location +\li contact information +\li icon +\li categories \endlist The JsonDb plugin does not support any other details so all @@ -127,44 +127,44 @@ does not support saving of any other details. The JsonDbPlugin supports the following icon parameter values \table \header - \o Key - \o Value + \li Key + \li Value \row - \o smallUrl - \o Holds the URL for the small icon + \li smallUrl + \li Holds the URL for the small icon \row - \o smallSize - \o Holds the dimensions of the small icon + \li smallSize + \li Holds the dimensions of the small icon \row - \o smallSourceUrl - \o Holds the source URL from which the small icon is to be copied from. + \li smallSourceUrl + \li Holds the source URL from which the small icon is to be copied from. \row - \o mediumUrl - \o Holds the URL for the medium sized icon. + \li mediumUrl + \li Holds the URL for the medium sized icon. \row - \o mediumSize - \o Holds the dimensions of the medium sized icon. + \li mediumSize + \li Holds the dimensions of the medium sized icon. \row - \o mediumSourceUrl - \o Holds the source URL from which the medium icon is to be copied from. + \li mediumSourceUrl + \li Holds the source URL from which the medium icon is to be copied from. \row - \o largeUrl - \o Holds the URL for the large icon. + \li largeUrl + \li Holds the URL for the large icon. \row - \o largeSize - \o Holds the dimensions of the large icon. + \li largeSize + \li Holds the dimensions of the large icon. \row - \o largeSourceUrl - \o Holds the source URL from which the large icon is to be copied from. + \li largeSourceUrl + \li Holds the source URL from which the large icon is to be copied from. \row - \o fullscreenUrl - \o Holds the URL for the fullscreen icon. + \li fullscreenUrl + \li Holds the URL for the fullscreen icon. \row - \o fullscreenSize - \o Holds the dimensions of the fullscreen icon. + \li fullscreenSize + \li Holds the dimensions of the fullscreen icon. \row - \o fullscreenSourceUrl - \o Holds the source URL from which the fullscreen icon is to be copied from. + \li fullscreenSourceUrl + \li Holds the source URL from which the fullscreen icon is to be copied from. \endtable In C++ the value of the URLs must always be a QUrl. @@ -265,13 +265,13 @@ The JsonDb plugin can be used as a favorites store and thus supports the followi parameters. \table \header - \o key - \o value + \li key + \li value \row - \o "alternativeId" (aka QPlaceMatchRequest::AlternativeId) - \o alternative id attribute type, of the form "x_id_<provider name>" eg "x_id_nokia" + \li "alternativeId" (aka QPlaceMatchRequest::AlternativeId) + \li alternative id attribute type, of the form "x_id_<provider name>" eg "x_id_nokia" \row - \o "proximity" - \o The distance (m) allowed between places in order to be considered a match. + \li "proximity" + \li The distance (m) allowed between places in order to be considered a match. \endtable */ diff --git a/doc/src/plugins/nokia.qdoc b/doc/src/plugins/nokia.qdoc index f5a40227..98ed1f40 100644 --- a/doc/src/plugins/nokia.qdoc +++ b/doc/src/plugins/nokia.qdoc @@ -53,23 +53,23 @@ The online plugin uses the tiled map classes, which cache tile data in heap memo The following table lists optional parameters that can be passed to the Nokia plugin. \table \header - \o Parameter - \o Description + \li Parameter + \li Description \row - \o mapping.proxy - \o Proxy server URL used by mapping manager. + \li mapping.proxy + \li Proxy server URL used by mapping manager. \row - \o mapping.host - \o Map tile service URL used by mapping manager. + \li mapping.host + \li Map tile service URL used by mapping manager. \row - \o mapping.app_id - \o Client app_id part of the app_id/token pair used for authentication by mapping manager. + \li mapping.app_id + \li Client app_id part of the app_id/token pair used for authentication by mapping manager. \row - \o mapping.token - \o Client token part of the app_id/token pair for the service used for authentication by mapping manager. + \li mapping.token + \li Client token part of the app_id/token pair for the service used for authentication by mapping manager. \row - \o mapping.cache.directory - \o Map tile cache directory used as network disk cache. + \li mapping.cache.directory + \li Map tile cache directory used as network disk cache. Default place for the cache is "maptiles" directory in system temp. @@ -78,29 +78,29 @@ The following table lists optional parameters that can be passed to the Nokia pl Map tiles will expire and are refetched 14 days after download. \row - \o mapping.cache.size - \o Map tile cache size. Maximum size of the cache is 50MB. + \li mapping.cache.size + \li Map tile cache size. Maximum size of the cache is 50MB. \row - \o routing.proxy - \o Proxy server URL used by routing manager. + \li routing.proxy + \li Proxy server URL used by routing manager. \row - \o routing.host - \o Routing service URL used by routing manager. + \li routing.host + \li Routing service URL used by routing manager. \row - \o routing.referer - \o Referer for the routing token used for authentication by routing manager. + \li routing.referer + \li Referer for the routing token used for authentication by routing manager. \row - \o routing.token - \o Client token for the service used for authentication by routing manager. + \li routing.token + \li Client token for the service used for authentication by routing manager. \row - \o places.proxy - \o Proxy server URL used by search manager. + \li places.proxy + \li Proxy server URL used by search manager. \row - \o places.host - \o Search service URL used by search manager. + \li places.host + \li Search service URL used by search manager. \row - \o places.api_version - \o Version of the REST API used by the places manager. Currently versions 1 and 2 are + \li places.api_version + \li Version of the REST API used by the places manager. Currently versions 1 and 2 are supported. The default is version 1. \endtable @@ -137,82 +137,82 @@ and behaviours are outlined below: \section2 Capabilities \table \row - \o Storage - \o remote + \li Storage + \li remote \row - \o Read/Write - \o read-only + \li Read/Write + \li read-only \row - \o Icons - \o No + \li Icons + \li No \row - \o Search term suggestions - \o yes + \li Search term suggestions + \li yes \row - \o Recommendations - \o yes + \li Recommendations + \li yes \row - \o Category structure - \o Hierarchical + \li Category structure + \li Hierarchical \row - \o (Rich) Content images - \o yes + \li (Rich) Content images + \li yes \row - \o (Rich) Content reviews - \o yes + \li (Rich) Content reviews + \li yes \row - \o (Rich) Content editorials - \o yes + \li (Rich) Content editorials + \li yes \row - \o All details fetched during search - \o no + \li All details fetched during search + \li no \row - \o Paging offset index - \o no + \li Paging offset index + \li no \row - \o Paging limit - \o yes + \li Paging limit + \li yes \row - \o Distance relevance hint - \o no + \li Distance relevance hint + \li no \row - \o Lexical name relevance hint - \o no + \li Lexical name relevance hint + \li no \row - \o Search term corrections - \o no + \li Search term corrections + \li no \row - \o Extended Attributes - \o no + \li Extended Attributes + \li no \row - \o Notifications for added/removed places/categories - \o no + \li Notifications for added/removed places/categories + \li no \row - \o visibility scopes - \o public + \li visibility scopes + \li public \row - \o favorites matching/(usable as favoritesPlugin) - \o no + \li favorites matching/(usable as favoritesPlugin) + \li no \endtable \section2 Plugin specific behaviours \section3 Search The following list shows what core place data is returned during a place search: \list -\o name -\o location -\o contact information -\o attribution -\o categories -\o rating -\o visibility +\li name +\li location +\li contact information +\li attribution +\li categories +\li rating +\li visibility \endlist The following list shows further details that may be retrieved via QPlaceManager::getDetails() \list -\o supplier -\o extended attributes +\li supplier +\li extended attributes \endlist \section3 Addresses vs POIs diff --git a/doc/src/position.qdoc b/doc/src/position.qdoc index 559579f7..9df79422 100644 --- a/doc/src/position.qdoc +++ b/doc/src/position.qdoc @@ -41,10 +41,10 @@ surface \unicode {0x2014} as provided by a latitude-longitude coordinate \unicode {0x2014} along with associated data, such as: \list - \o The date and time at which the position was reported - \o The velocity of the device that reported the position - \o The altitude of the reported position (height above sea level) - \o The bearing of the device in degrees, relative to true north + \li The date and time at which the position was reported + \li The velocity of the device that reported the position + \li The altitude of the reported position (height above sea level) + \li The bearing of the device in degrees, relative to true north \endlist This data can be extracted through a variety of methods. One of the most @@ -192,9 +192,9 @@ Here is the definition of the \c LogFilePositionSource class: The main methods overrided by the subclass are: \list - \o \l{QGeoPositionInfoSource::startUpdates()}{startUpdates()}: called by client applications to start regular position updates - \o \l{QGeoPositionInfoSource::stopUpdates()}{stopUpdates()}: called by client applications to stop regular position updates - \o \l{QGeoPositionInfoSource::requestUpdate()}{requestUpdate()}: called by client applications to request a single update, with a specified timeout + \li \l{QGeoPositionInfoSource::startUpdates()}{startUpdates()}: called by client applications to start regular position updates + \li \l{QGeoPositionInfoSource::stopUpdates()}{stopUpdates()}: called by client applications to stop regular position updates + \li \l{QGeoPositionInfoSource::requestUpdate()}{requestUpdate()}: called by client applications to request a single update, with a specified timeout \endlist When a position update is available, the subclass emits the @@ -225,7 +225,7 @@ and \tt {make install}. \section1 Examples -\section3 \bold{Flickr Example} +\section3 \b{Flickr Example} The \l{Flickr QML}{Flickr Example} uses the Location to download thumbnail images from Flickr relevant to the current location. diff --git a/doc/src/qml-maps.qdoc b/doc/src/qml-maps.qdoc index 640b1484..7edd4c85 100644 --- a/doc/src/qml-maps.qdoc +++ b/doc/src/qml-maps.qdoc @@ -159,29 +159,29 @@ The \l RouteQuery properties can include \table 60% \row - \o \l {RouteQuery::}{numberAlternativeRoutes} - \o The number of alternative routes + \li \l {RouteQuery::}{numberAlternativeRoutes} + \li The number of alternative routes \row - \o \l {RouteQuery::}{travelModes} - \o Travel modes + \li \l {RouteQuery::}{travelModes} + \li Travel modes \row - \o \l {RouteQuery::}{routeOptimizations} - \o Required route optimizations + \li \l {RouteQuery::}{routeOptimizations} + \li Required route optimizations \row - \o \l {RouteQuery::}{segmentDetails} - \o Level of detail in segments + \li \l {RouteQuery::}{segmentDetails} + \li Level of detail in segments \row - \o \l {RouteQuery::}{maneuverDetails} - \o Level of detail in maneuvers between segments + \li \l {RouteQuery::}{maneuverDetails} + \li Level of detail in maneuvers between segments \row - \o \l {RouteQuery::}{waypoints} - \o A list of waypoints + \li \l {RouteQuery::}{waypoints} + \li A list of waypoints \row - \o \l {RouteQuery::}{excludedAreas} - \o A list of excluded areas that the route must not cross + \li \l {RouteQuery::}{excludedAreas} + \li A list of excluded areas that the route must not cross \row - \o \l {RouteQuery::}{featureTypes} - \o Relevant map features, e.g. highway, ferry + \li \l {RouteQuery::}{featureTypes} + \li Relevant map features, e.g. highway, ferry \endtable diff --git a/doc/src/qml-position.qdoc b/doc/src/qml-position.qdoc index e142063b..6cb3e089 100644 --- a/doc/src/qml-position.qdoc +++ b/doc/src/qml-position.qdoc @@ -41,10 +41,10 @@ surface \unicode {0x2014} as provided by a latitude-longitude coordinate \unicode {0x2014} along with associated data, such as: \list - \o The date and time at which the position was reported - \o The velocity of the device that reported the position - \o The altitude of the reported position (height above sea level) - \o The bearing of the device in degrees, relative to true north + \li The date and time at which the position was reported + \li The velocity of the device that reported the position + \li The altitude of the reported position (height above sea level) + \li The bearing of the device in degrees, relative to true north \endlist This data can be extracted through a variety of methods. One of the most @@ -81,7 +81,7 @@ Rectangle { \endcode -\section2 \bold{Flickr Example} +\section2 \b{Flickr Example} The \l{Flickr (QML)}{Flickr Example} uses the Location to download thumbnail images from Flickr relevant to the current location. diff --git a/doc/src/qtlocation-cpp.qdoc b/doc/src/qtlocation-cpp.qdoc index 681670b9..614f28f4 100644 --- a/doc/src/qtlocation-cpp.qdoc +++ b/doc/src/qtlocation-cpp.qdoc @@ -51,14 +51,14 @@ QtLocation C++ API. \table \row - \o \l {Location Positioning} - \o Retrieving information about the current position. + \li \l {Location Positioning} + \li Retrieving information about the current position. \row - \o \l {Maps}{Maps and Navigation} - \o Displaying maps and finding routes. + \li \l {Maps}{Maps and Navigation} + \li Displaying maps and finding routes. \row - \o \l {Places} - \o Searching for and managing points of interest. + \li \l {Places} + \li Searching for and managing points of interest. \endtable diff --git a/doc/src/qtlocation.qdoc b/doc/src/qtlocation.qdoc index 477bf398..36b294f7 100644 --- a/doc/src/qtlocation.qdoc +++ b/doc/src/qtlocation.qdoc @@ -46,9 +46,9 @@ coordinates, including working out the user's current position on the Earth's su using GPS, GLONASS, or other available services. \table \row - \o Positioning introduction & overview: - \o \l{location-positioning-qml.html}{for QML} - \o \l{location-positioning-cpp.html}{for C++} + \li Positioning introduction & overview: + \li \l{location-positioning-qml.html}{for QML} + \li \l{location-positioning-cpp.html}{for C++} \endtable \section3 Places @@ -60,9 +60,9 @@ reviews and other rich content, and integrate with platform sources of a user's favorites. \table \row - \o Places introduction & overview: - \o \l{location-places-qml.html}{for QML} - \o \l{location-places-cpp.html}{for C++} + \li Places introduction & overview: + \li \l{location-places-qml.html}{for QML} + \li \l{location-places-cpp.html}{for C++} \endtable \section3 Maps & Navigation @@ -74,9 +74,9 @@ from a street address) and navigation (including driving and walking directions). \table \row - \o Maps and Nav. introduction & overview: - \o \l{location-maps-qml.html}{for QML} - \o \l{location-maps-cpp.html}{for C++} + \li Maps and Nav. introduction & overview: + \li \l{location-maps-qml.html}{for QML} + \li \l{location-maps-cpp.html}{for C++} \endtable @@ -87,14 +87,14 @@ example applications to demonstrate their usage. \table \row - \o \l {QtLocation 5.x}{QML API Reference} - \o Full list of QML elements in the QtLocation API + \li \l {QtLocation 5.x}{QML API Reference} + \li Full list of QML elements in the QtLocation API \row - \o \l {QtLocation C++ API}{C++ API Reference} - \o Full list of C++ classes and methods in the QtLocation API + \li \l {QtLocation C++ API}{C++ API Reference} + \li Full list of C++ classes and methods in the QtLocation API \row - \o \l {QtLocation Examples}{Example Apps} - \o Examples demonstrating use of the QtLocation APIs + \li \l {QtLocation Examples}{Example Apps} + \li Examples demonstrating use of the QtLocation APIs \endtable \section1 Plugin references and parameters @@ -111,10 +111,10 @@ QtLocation available for a new platform. \table \row - \o \l {QtLocation GeoServices}{GeoServices} - \o Information about the QtLocation GeoServices plugins + \li \l {QtLocation GeoServices}{GeoServices} + \li Information about the QtLocation GeoServices plugins \row - \o \l {Places Backend} {Places} - \o Information for \l {Places Backend} Implementors + \li \l {Places Backend} {Places} + \li Information for \l {Places Backend} Implementors \endtable */ diff --git a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp b/src/imports/location/declarativeplaces/qdeclarativecategory.cpp index 3263865a..f4b5b83c 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativecategory.cpp @@ -226,20 +226,20 @@ QString QDeclarativeCategory::name() const \table \row - \o Category.UnspecifiedVisibility - \o The visibility of the category is unspecified, the default visibility of the plugin + \li Category.UnspecifiedVisibility + \li The visibility of the category is unspecified, the default visibility of the plugin will be used. \row - \o Category.DeviceVisibility - \o The category is limited to the current device. The category will not be transferred + \li Category.DeviceVisibility + \li The category is limited to the current device. The category will not be transferred off of the device. \row - \o Category.PrivateVisibility - \o The category is private to the current user. The category may be transferred to an + \li Category.PrivateVisibility + \li The category is private to the current user. The category may be transferred to an online service but is only ever visible to the current user. \row - \o Category.PublicVisibility - \o The category is public. + \li Category.PublicVisibility + \li The category is public. \endtable */ QDeclarativeCategory::Visibility QDeclarativeCategory::visibility() const @@ -296,20 +296,20 @@ QString QDeclarativeCategory::errorString() const \table \row - \o Category.Ready - \o No Error occurred during the last operation, further operations may be performed on + \li Category.Ready + \li No Error occurred during the last operation, further operations may be performed on the category. \row - \o Category.Saving - \o The category is currently being saved, no other operations may be performed until the + \li Category.Saving + \li The category is currently being saved, no other operations may be performed until the current operation completes. \row - \o Category.Removing - \o The category is currently being removed, no other operations can be performed until + \li Category.Removing + \li The category is currently being removed, no other operations can be performed until the current operation completes. \row - \o Category.Error - \o An error occurred during the last operation, further operations can still be + \li Category.Error + \li An error occurred during the last operation, further operations can still be performed on the category. \endtable */ diff --git a/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp b/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp index df61e57d..e2c3e04f 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp @@ -59,10 +59,10 @@ additional keys. \list - \o phone - \o fax - \o email - \o website + \li phone + \li fax + \li email + \li website \endlist \section1 Examples diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp index 06ae6962..9617c8f0 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp @@ -604,24 +604,24 @@ bool QDeclarativePlace::detailsFetched() const \table \row - \o Place.Ready - \o No Error occurred during the last operation, further operations may be performed on + \li Place.Ready + \li No Error occurred during the last operation, further operations may be performed on the place. \row - \o Place.Saving - \o The place is currently being saved, no other operation may be performed until + \li Place.Saving + \li The place is currently being saved, no other operation may be performed until complete. \row - \o Place.Fetching - \o The place details are currently being fetched, no other operations may be performed + \li Place.Fetching + \li The place details are currently being fetched, no other operations may be performed until complete. \row - \o Place.Removing - \o The place is currently being removed, no other operations can be performed until + \li Place.Removing + \li The place is currently being removed, no other operations can be performed until complete. \row - \o Place.Error - \o An error occurred during the last operation, further operations can still be + \li Place.Error + \li An error occurred during the last operation, further operations can still be performed on the place. \endtable @@ -937,20 +937,20 @@ void QDeclarativePlace::synchronizeCategories() \table \row - \o Place.UnspecifiedVisibility - \o The visibility of the place is unspecified, the default visibility of the \l plugin + \li Place.UnspecifiedVisibility + \li The visibility of the place is unspecified, the default visibility of the \l plugin will be used. \row - \o Place.DeviceVisibility - \o The place is limited to the current device. The place will not be transferred off + \li Place.DeviceVisibility + \li The place is limited to the current device. The place will not be transferred off of the device. \row - \o Place.PrivateVisibility - \o The place is private to the current user. The place may be transferred to an online + \li Place.PrivateVisibility + \li The place is private to the current user. The place may be transferred to an online service but is only ever visible to the current user. \row - \o Place.PublicVisibility - \o The place is public. + \li Place.PublicVisibility + \li The place is public. \endtable */ QDeclarativePlace::Visibility QDeclarativePlace::visibility() const diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp index 96b041d3..27995e5d 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp @@ -59,20 +59,20 @@ be qualified by a unique prefix to avoid clashes. \table \header - \o key - \o description + \li key + \li description \row - \o openingHours - \o The trading hours of the place + \li openingHours + \li The trading hours of the place \row - \o payment - \o The types of payment the place accepts, e.g. visa, mastercard etc. + \li payment + \li The types of payment the place accepts, e.g. visa, mastercard etc. \row - \o x_provider - \o The name of the provider that a place is sourced from + \li x_provider + \li The name of the provider that a place is sourced from \row - \o x_id_<provider> (e.g x_id_nokia) - \o An alternative id which identifies the place from the + \li x_id_<provider> (e.g x_id_nokia) + \li An alternative id which identifies the place from the perspective of the specified provider. \endtable diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp index d8913972..2ac4735f 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp @@ -64,34 +64,34 @@ QT_BEGIN_NAMESPACE \table \header - \o Role - \o Type - \o Description + \li Role + \li Type + \li Description \row - \o text - \o string - \o The editorial's textual description of the place. It can be either rich (HTML based) text or plain text + \li text + \li string + \li The editorial's textual description of the place. It can be either rich (HTML based) text or plain text depending upon the provider. \row - \o title - \o string - \o The title of the editorial. + \li title + \li string + \li The title of the editorial. \row - \o language - \o string - \o The language that the editorial is written in. + \li language + \li string + \li The language that the editorial is written in. \row - \o supplier - \o \l Supplier - \o The supplier of the editorial. + \li supplier + \li \l Supplier + \li The supplier of the editorial. \row - \o user - \o \l {QtLocation5::User}{User} - \o The user who contributed the editorial. + \li user + \li \l {QtLocation5::User}{User} + \li The user who contributed the editorial. \row - \o attribution - \o string - \o Attribution text which must be displayed when displaying the editorial. + \li attribution + \li string + \li Attribution text which must be displayed when displaying the editorial. \endtable \section Example diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp index 9284ea5c..fbec59cd 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp @@ -65,33 +65,33 @@ QT_BEGIN_NAMESPACE \table \header - \o Role - \o Type - \o Description + \li Role + \li Type + \li Description \row - \o url - \o url - \o The URL of the image. + \li url + \li url + \li The URL of the image. \row - \o imageId - \o string - \o The id of the image. + \li imageId + \li string + \li The id of the image. \row - \o mimeType - \o string - \o The MIME type of the image. + \li mimeType + \li string + \li The MIME type of the image. \row - \o supplier - \o \l Supplier - \o The supplier of the editorial. + \li supplier + \li \l Supplier + \li The supplier of the editorial. \row - \o user - \o \l {QtLocation5::User}{User} - \o The user who contributed the editorial. + \li user + \li \l {QtLocation5::User}{User} + \li The user who contributed the editorial. \row - \o attribution - \o string - \o Attribution text which must be displayed when displaying the editorial. + \li attribution + \li string + \li Attribution text which must be displayed when displaying the editorial. \endtable diff --git a/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp index 12758922..a67d267c 100644 --- a/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp @@ -73,17 +73,17 @@ QT_USE_NAMESPACE \table \header - \o Role - \o Type - \o Description + \li Role + \li Type + \li Description \row - \o distance - \o real - \o The distance to the place. + \li distance + \li real + \li The distance to the place. \row - \o place - \o \l Place - \o The place. + \li place + \li \l Place + \li The place. \endtable The following example shows how to use the PlaceRecommendationModel to search for recommendations in @@ -166,14 +166,14 @@ QT_USE_NAMESPACE \table \row - \o PlaceRecommendationModel.Ready - \o The search query has completed and the result are available. + \li PlaceRecommendationModel.Ready + \li The search query has completed and the result are available. \row - \o PlaceRecommendationModel.Executing - \o A search query is currently being executed. + \li PlaceRecommendationModel.Executing + \li A search query is currently being executed. \row - \o PlaceRecommendationModel.Error - \o An error occurred when executing the previous search query. + \li PlaceRecommendationModel.Error + \li An error occurred when executing the previous search query. \endtable */ diff --git a/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp index 0ae1e7be..34d24c7e 100644 --- a/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp @@ -65,46 +65,46 @@ QT_BEGIN_NAMESPACE \table \header - \o Role - \o Type - \o Description + \li Role + \li Type + \li Description \row - \o dateTime - \o datetime - \o The date and time that the review was posted. + \li dateTime + \li datetime + \li The date and time that the review was posted. \row - \o text - \o string - \o The review's textual description of the place. It can be either rich (HTML based) text or plain text + \li text + \li string + \li The review's textual description of the place. It can be either rich (HTML based) text or plain text depending on the provider. \row - \o language - \o string - \o The language that the review is written in. + \li language + \li string + \li The language that the review is written in. \row - \o rating - \o real - \o The rating that the reviewer gave to the place. + \li rating + \li real + \li The rating that the reviewer gave to the place. \row - \o reviewId - \o string - \o The id of the review. + \li reviewId + \li string + \li The id of the review. \row - \o title - \o string - \o The title of the review. + \li title + \li string + \li The title of the review. \row - \o supplier - \o \l Supplier - \o The supplier of the editorial. + \li supplier + \li \l Supplier + \li The supplier of the editorial. \row - \o user - \o \l {QtLocation5::User}{User} - \o The user who contributed the editorial. + \li user + \li \l {QtLocation5::User}{User} + \li The user who contributed the editorial. \row - \o attribution - \o string - \o Attribution text which must be displayed when displaying the editorial. + \li attribution + \li string + \li Attribution text which must be displayed when displaying the editorial. \endtable */ diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp index f5cc282e..6b78fa1a 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp @@ -82,31 +82,31 @@ QT_USE_NAMESPACE \table \header - \o Role - \o Type - \o Description + \li Role + \li Type + \li Description \row - \o type - \o enum - \o The type of search result. + \li type + \li enum + \li The type of search result. \row - \o distance - \o real - \o Valid only when the \c type role is \c PlaceResult, the distance to the place. + \li distance + \li real + \li Valid only when the \c type role is \c PlaceResult, the distance to the place. \row - \o place - \o \l Place - \o Valid only when the \c type role is \c PlaceResult, an object representing the + \li place + \li \l Place + \li Valid only when the \c type role is \c PlaceResult, an object representing the place. \row - \o sponsored - \o bool - \o Valid only when the \c type role is \c PlaceResult, true if the search result is a + \li sponsored + \li bool + \li Valid only when the \c type role is \c PlaceResult, true if the search result is a sponsored result. \row - \o correction - \o string - \o Valid only when the \c type role is \c CorrectionResult, a suggested correction to + \li correction + \li string + \li Valid only when the \c type role is \c CorrectionResult, a suggested correction to the search term. \endtable @@ -208,14 +208,14 @@ QT_USE_NAMESPACE \table \row - \o PlaceSearchModel.Ready - \o The search query has completed and the result are available. + \li PlaceSearchModel.Ready + \li The search query has completed and the result are available. \row - \o PlaceSearchModel.Executing - \o A search query is currently being executed. + \li PlaceSearchModel.Executing + \li A search query is currently being executed. \row - \o PlaceSearchModel.Error - \o An error occurred when executing the previous search query. + \li PlaceSearchModel.Error + \li An error occurred when executing the previous search query. \endtable */ @@ -355,15 +355,15 @@ void QDeclarativeSearchResultModel::categories_clear(QDeclarativeListProperty<QD \table \row - \o SearchResultModel.UnspecifiedHint - \o No relevance hint is given to the provider. + \li SearchResultModel.UnspecifiedHint + \li No relevance hint is given to the provider. \row - \o SearchResultModel.DistanceHint - \o The distance of the place from the user's current location is important to the user. + \li SearchResultModel.DistanceHint + \li The distance of the place from the user's current location is important to the user. This hint is only meaningful when a circular search area is used. \row - \o SearchResultModel.LexicalPlaceNameHint - \o The lexical ordering of place names (in ascending alphabetical order) is relevant to + \li SearchResultModel.LexicalPlaceNameHint + \li The lexical ordering of place names (in ascending alphabetical order) is relevant to the user. This hint is useful for providers based on a local data store. \endtable */ @@ -409,18 +409,18 @@ void QDeclarativeSearchResultModel::setMaximumCorrections(int corrections) \table \row - \o Place.UnspecifiedVisibility - \o No explicit visibility scope specified, places with any visibility may be part of + \li Place.UnspecifiedVisibility + \li No explicit visibility scope specified, places with any visibility may be part of search results. \row - \o Place.DeviceVisibility - \o Only places stored on the local device will be part of the search results. + \li Place.DeviceVisibility + \li Only places stored on the local device will be part of the search results. \row - \o Place.PrivateVisibility - \o Only places that are private to the current user will be part of the search results. + \li Place.PrivateVisibility + \li Only places that are private to the current user will be part of the search results. \row - \o Place.PublicVisibility - \o Only places that are public will be part of the search results. + \li Place.PublicVisibility + \li Only places that are public will be part of the search results. \endtable */ QDeclarativePlace::Visibility QDeclarativeSearchResultModel::visibilityScope() const diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp index 3e8a2c56..a5dc587b 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp @@ -77,13 +77,13 @@ QT_USE_NAMESPACE \table \header - \o Role - \o Type - \o Description + \li Role + \li Type + \li Description \row - \o suggestion - \o string - \o Suggested search term. + \li suggestion + \li string + \li Suggested search term. \endtable The following example shows how to use the PlaceSearchSuggestionModel to get suggested search terms @@ -138,14 +138,14 @@ QT_USE_NAMESPACE \table \row - \o SearchSuggestionModel.Ready - \o The search query has completed and the result are available. + \li SearchSuggestionModel.Ready + \li The search query has completed and the result are available. \row - \o SearchSuggestionModel.Executing - \o A search query is currently being executed. + \li SearchSuggestionModel.Executing + \li A search query is currently being executed. \row - \o SearchSuggestionModel.Error - \o An error occurred when executing the previous search query. + \li SearchSuggestionModel.Error + \li An error occurred when executing the previous search query. \endtable */ diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp index f468e036..eb6b4957 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp @@ -66,13 +66,13 @@ QT_USE_NAMESPACE \table \header - \o Role - \o Type - \o Description + \li Role + \li Type + \li Description \row - \o category - \o \l Category - \o Category object for the current item. + \li category + \li \l Category + \li Category object for the current item. \endtable The following example displays a flat list of all available categories: @@ -501,15 +501,15 @@ QString QDeclarativeSupportedCategoriesModel::errorString() const \table \row - \o CategoryModel.Ready - \o No Error occurred during the last operation, further operations may be performed on + \li CategoryModel.Ready + \li No Error occurred during the last operation, further operations may be performed on the model. \row - \o CategoryModel.Updating - \o The model is being updated, no other operations may be performed until complete. + \li CategoryModel.Updating + \li The model is being updated, no other operations may be performed until complete. \row - \o CategoryModel.Error - \o An error occurred during the last operation, further operations can still be + \li CategoryModel.Error + \li An error occurred during the last operation, further operations can still be performed on the model. \endtable */ diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp index 1529d738..1a7dfe83 100644 --- a/src/imports/location/qdeclarativegeocodemodel.cpp +++ b/src/imports/location/qdeclarativegeocodemodel.cpp @@ -380,10 +380,10 @@ void QDeclarativeGeocodeModel::geocodeError(QGeocodeReply *reply, This read-only property holds the current status of the model. \list - \o GeocodeModel.Null - No geocode requests have been issued or \l reset has been called. - \o GeocodeModel.Ready - Geocode request(s) have finished successfully. - \o GeocodeModel.Loading - Geocode request has been issued but not yet finished - \o GeocodeModel.Error - Geocoding error has occurred, details are in \l error and \l errorString + \li GeocodeModel.Null - No geocode requests have been issued or \l reset has been called. + \li GeocodeModel.Ready - Geocode request(s) have finished successfully. + \li GeocodeModel.Loading - Geocode request has been issued but not yet finished + \li GeocodeModel.Error - Geocoding error has occurred, details are in \l error and \l errorString \endlist */ @@ -406,13 +406,13 @@ void QDeclarativeGeocodeModel::setStatus(QDeclarativeGeocodeModel::Status status This read-only property holds the latest error value of the geocoding request. \list - \o GeocodeModel.NoError - No error has occurred - \o GeocodeModel.EngineNotSetError - The plugin/service provider used does not support (reverse) geocoding - \o GeocodeModel.CommunicationError - An error occurred while communicating with the service provider - \o GeocodeModel.ParseError - The response from the service provider was in an unrecognizable format - \o GeocodeModel.UnsupportedOptionError - The requested operation or one of the options for the operation are not supported by the service provider. - \o GeocodeModel.CombinationError - An error occurred while results where being combined from multiple sources - \o GeocodeModel.UnknownError - An error occurred which does not fit into any of the other categories + \li GeocodeModel.NoError - No error has occurred + \li GeocodeModel.EngineNotSetError - The plugin/service provider used does not support (reverse) geocoding + \li GeocodeModel.CommunicationError - An error occurred while communicating with the service provider + \li GeocodeModel.ParseError - The response from the service provider was in an unrecognizable format + \li GeocodeModel.UnsupportedOptionError - The requested operation or one of the options for the operation are not supported by the service provider. + \li GeocodeModel.CombinationError - An error occurred while results where being combined from multiple sources + \li GeocodeModel.UnknownError - An error occurred which does not fit into any of the other categories \endlist */ @@ -589,9 +589,9 @@ void QDeclarativeGeocodeModel::reset() the type of action to be performed: \list - \o Address - Geocoding (address to coordinate) - \o Coordinate - Reverse geocoding (coordinate to address) - \o string - Geocoding (address to coordinate) + \li Address - Geocoding (address to coordinate) + \li Coordinate - Reverse geocoding (coordinate to address) + \li string - Geocoding (address to coordinate) \endlist */ diff --git a/src/imports/location/qdeclarativegeomaneuver.cpp b/src/imports/location/qdeclarativegeomaneuver.cpp index 07ace5c0..dc7a44cb 100644 --- a/src/imports/location/qdeclarativegeomaneuver.cpp +++ b/src/imports/location/qdeclarativegeomaneuver.cpp @@ -132,18 +132,18 @@ QString QDeclarativeGeoManeuver::instructionText() const that is associated with a RouteManeuver. \list - \o RouteModel.NoDirection - There is no direction associated with the instruction text - \o RouteModel.DirectionForward - The instruction indicates that the direction of travel does not need to change - \o RouteModel.DirectionBearRight - The instruction indicates that the direction of travel should bear to the right - \o RouteModel.DirectionLightRight - The instruction indicates that a light turn to the right is required - \o RouteModel.DirectionRight - The instruction indicates that a turn to the right is required - \o RouteModel.DirectionHardRight - The instruction indicates that a hard turn to the right is required - \o RouteModel.DirectionUTurnRight - The instruction indicates that a u-turn to the right is required - \o RouteModel.DirectionUTurnLeft - The instruction indicates that a u-turn to the left is required - \o RouteModel.DirectionHardLeft - The instruction indicates that a hard turn to the left is required - \o RouteModel.DirectionLeft - The instruction indicates that a turn to the left is required - \o RouteModel.DirectionLightLeft - The instruction indicates that a light turn to the left is required - \o RouteModel.DirectionBearLeft - The instruction indicates that the direction of travel should bear to the left + \li RouteModel.NoDirection - There is no direction associated with the instruction text + \li RouteModel.DirectionForward - The instruction indicates that the direction of travel does not need to change + \li RouteModel.DirectionBearRight - The instruction indicates that the direction of travel should bear to the right + \li RouteModel.DirectionLightRight - The instruction indicates that a light turn to the right is required + \li RouteModel.DirectionRight - The instruction indicates that a turn to the right is required + \li RouteModel.DirectionHardRight - The instruction indicates that a hard turn to the right is required + \li RouteModel.DirectionUTurnRight - The instruction indicates that a u-turn to the right is required + \li RouteModel.DirectionUTurnLeft - The instruction indicates that a u-turn to the left is required + \li RouteModel.DirectionHardLeft - The instruction indicates that a hard turn to the left is required + \li RouteModel.DirectionLeft - The instruction indicates that a turn to the left is required + \li RouteModel.DirectionLightLeft - The instruction indicates that a light turn to the left is required + \li RouteModel.DirectionBearLeft - The instruction indicates that the direction of travel should bear to the left \endlist */ diff --git a/src/imports/location/qdeclarativegeomapmousearea.cpp b/src/imports/location/qdeclarativegeomapmousearea.cpp index 7683ca8d..f3191048 100644 --- a/src/imports/location/qdeclarativegeomapmousearea.cpp +++ b/src/imports/location/qdeclarativegeomapmousearea.cpp @@ -107,14 +107,14 @@ QT_BEGIN_NAMESPACE Some important limitations apply to the use of a MapMouseArea: \list - \i The mouse event is guaranteed only to be valid for the + \li The mouse event is guaranteed only to be valid for the duration of the signal handler (e.g. onPositionChanged, onClicked). Consequently the mouse event itself should not be stored. The main reason for this is to optimize memory usage; we do not want to allocate heap memory every time the mouse moves. - \i Nested mouse areas are not supported (MapMouseArea { MapMouseArea {} } - \i If two or more MapMouseAreas overlap, the declaration order is significant (not e.g. 'z' value) - \i Only one MapMouseArea per MapItem is supported, and it always fills the whole MapItem + \li Nested mouse areas are not supported (MapMouseArea { MapMouseArea {} } + \li If two or more MapMouseAreas overlap, the declaration order is significant (not e.g. 'z' value) + \li Only one MapMouseArea per MapItem is supported, and it always fills the whole MapItem \endlist \sa MapMouseEvent @@ -319,9 +319,9 @@ QQuickItem* QDeclarativeGeoMapMouseArea::parentMapItem() It contains a bitwise combination of: \list - \o Qt.LeftButton - \o Qt.RightButton - \o Qt.MiddleButton + \li Qt.LeftButton + \li Qt.RightButton + \li Qt.MiddleButton \endlist \sa acceptedButtons @@ -333,9 +333,9 @@ QQuickItem* QDeclarativeGeoMapMouseArea::parentMapItem() The available buttons are: \list - \o Qt.LeftButton - \o Qt.RightButton - \o Qt.MiddleButton + \li Qt.LeftButton + \li Qt.RightButton + \li Qt.MiddleButton \endlist To accept more than one button the flags can be combined with the diff --git a/src/imports/location/qdeclarativegeomapmouseevent.cpp b/src/imports/location/qdeclarativegeomapmouseevent.cpp index b6c3ba39..ae583f72 100644 --- a/src/imports/location/qdeclarativegeomapmouseevent.cpp +++ b/src/imports/location/qdeclarativegeomapmouseevent.cpp @@ -100,9 +100,9 @@ bool QDeclarativeGeoMapMouseEvent::accepted() const This property holds the button that caused the event. It can be one of: \list - \o Qt.LeftButton - \o Qt.RightButton - \o Qt.MiddleButton + \li Qt.LeftButton + \li Qt.RightButton + \li Qt.MiddleButton \endlist \sa buttons @@ -130,9 +130,9 @@ int QDeclarativeGeoMapMouseEvent::button() const It contains a bitwise combination of: \list - \o Qt.LeftButton - \o Qt.RightButton - \o Qt.MiddleButton + \li Qt.LeftButton + \li Qt.RightButton + \li Qt.MiddleButton \endlist \sa button @@ -156,12 +156,12 @@ int QDeclarativeGeoMapMouseEvent::buttons() const It contains a bitwise combination of: \list - \o Qt.NoModifier - No modifier key is pressed. - \o Qt.ShiftModifier - A Shift key on the keyboard is pressed. - \o Qt.ControlModifier - A Ctrl key on the keyboard is pressed. - \o Qt.AltModifier - An Alt key on the keyboard is pressed. - \o Qt.MetaModifier - A Meta key on the keyboard is pressed. - \o Qt.KeypadModifier - A keypad button is pressed. + \li Qt.NoModifier - No modifier key is pressed. + \li Qt.ShiftModifier - A Shift key on the keyboard is pressed. + \li Qt.ControlModifier - A Ctrl key on the keyboard is pressed. + \li Qt.AltModifier - An Alt key on the keyboard is pressed. + \li Qt.MetaModifier - A Meta key on the keyboard is pressed. + \li Qt.KeypadModifier - A keypad button is pressed. \endlist */ diff --git a/src/imports/location/qdeclarativegeoroutemodel.cpp b/src/imports/location/qdeclarativegeoroutemodel.cpp index 38cc8696..5fbe4771 100644 --- a/src/imports/location/qdeclarativegeoroutemodel.cpp +++ b/src/imports/location/qdeclarativegeoroutemodel.cpp @@ -384,10 +384,10 @@ void QDeclarativeGeoRouteModel::setStatus(QDeclarativeGeoRouteModel::Status stat This read-only property holds the current status of the model. \list - \o RouteModel.Null - No route requests have been issued or \l reset has been called. - \o RouteModel.Ready - Route request(s) have finished successfully. - \o RouteModel.Loading - Route request has been issued but not yet finished - \o RouteModel.Error - Routing error has occurred, details are in \l error and \l errorString + \li RouteModel.Null - No route requests have been issued or \l reset has been called. + \li RouteModel.Ready - Route request(s) have finished successfully. + \li RouteModel.Loading - Route request has been issued but not yet finished + \li RouteModel.Error - Routing error has occurred, details are in \l error and \l errorString \endlist */ @@ -428,12 +428,12 @@ QString QDeclarativeGeoRouteModel::errorString() const This read-only property holds the latest error value of the routing request. \list - \o RouteModel.NoError - No error has occurred - \o RouteModel.EngineNotSetError - The plugin/service provider used does not support routing - \o RouteModel.CommunicationError - An error occurred while communicating with the service provider - \o RouteModel.ParseError - The response from the service provider was in an unrecognizable format - \o RouteModel.UnsupportedOptionError - The requested operation or one of the options for the operation are not supported by the service provider. - \o RouteModel.UnknownError - An error occurred which does not fit into any of the other categories + \li RouteModel.NoError - No error has occurred + \li RouteModel.EngineNotSetError - The plugin/service provider used does not support routing + \li RouteModel.CommunicationError - An error occurred while communicating with the service provider + \li RouteModel.ParseError - The response from the service provider was in an unrecognizable format + \li RouteModel.UnsupportedOptionError - The requested operation or one of the options for the operation are not supported by the service provider. + \li RouteModel.UnknownError - An error occurred which does not fit into any of the other categories \endlist */ @@ -611,15 +611,15 @@ void QDeclarativeGeoRouteQuery::componentComplete() route. Features with a weight of NeutralFeatureWeight will not be returned. \list - \o RouteModel.NoFeature - No features will be taken into account when planning the route - \o RouteModel.TollFeature - Consider tollways when planning the route - \o RouteModel.HighwayFeature - Consider highways when planning the route - \o RouteModel.PublicTransitFeature - Consider public transit when planning the route - \o RouteModel.FerryFeature - Consider ferries when planning the route - \o RouteModel.TunnelFeature - Consider tunnels when planning the route - \o RouteModel.DirtRoadFeature - Consider dirt roads when planning the route - \o RouteModel.ParksFeature - Consider parks when planning the route - \o RouteModel.MotorPoolLaneFeature - Consider motor pool lanes when planning the route + \li RouteModel.NoFeature - No features will be taken into account when planning the route + \li RouteModel.TollFeature - Consider tollways when planning the route + \li RouteModel.HighwayFeature - Consider highways when planning the route + \li RouteModel.PublicTransitFeature - Consider public transit when planning the route + \li RouteModel.FerryFeature - Consider ferries when planning the route + \li RouteModel.TunnelFeature - Consider tunnels when planning the route + \li RouteModel.DirtRoadFeature - Consider dirt roads when planning the route + \li RouteModel.ParksFeature - Consider parks when planning the route + \li RouteModel.MotorPoolLaneFeature - Consider motor pool lanes when planning the route \endlist \sa setFeatureWeight featureWeight @@ -910,11 +910,11 @@ void QDeclarativeGeoRouteQuery::clearWaypoints() Following lists the possible feature weights: \list - \o RouteModel.NeutralFeatureWeight - The presence or absence of the feature will not affect the planning of the route - \o RouteModel.PreferFeatureWeight - Routes which contain the feature will be preferred over those that do not - \o RouteModel.RequireFeatureWeight - Only routes which contain the feature will be considered, otherwise no route will be returned - \o RouteModel.AvoidFeatureWeight - Routes which do not contain the feature will be preferred over those that do - \o RouteModel.DisallowFeatureWeight - Only routes which do not contain the feature will be considered, otherwise no route will be returned + \li RouteModel.NeutralFeatureWeight - The presence or absence of the feature will not affect the planning of the route + \li RouteModel.PreferFeatureWeight - Routes which contain the feature will be preferred over those that do not + \li RouteModel.RequireFeatureWeight - Only routes which contain the feature will be considered, otherwise no route will be returned + \li RouteModel.AvoidFeatureWeight - Routes which do not contain the feature will be preferred over those that do + \li RouteModel.DisallowFeatureWeight - Only routes which do not contain the feature will be considered, otherwise no route will be returned \endlist \sa featureTypes, resetFeatureWeights, featureWeight @@ -1010,8 +1010,8 @@ void QDeclarativeGeoRouteQuery::setTravelModes(QDeclarativeGeoRouteQuery::Travel Values can be combined with OR ('|') -operator. \list - \o RouteModel.NoSegmentData - No segment data should be included with the route - \o RouteModel.BasicSegmentData - Basic segment data will be included with the route + \li RouteModel.NoSegmentData - No segment data should be included with the route + \li RouteModel.BasicSegmentData - Basic segment data will be included with the route \endlist The default value is RouteModel.BasicSegmentData @@ -1040,8 +1040,8 @@ QDeclarativeGeoRouteQuery::SegmentDetail QDeclarativeGeoRouteQuery::segmentDetai Values can be combined with OR ('|') -operator. \list - \o RouteModel.NoManeuvers - No maneuvers should be included with the route - \o RouteModel.BasicManeuvers - Basic maneuvers will be included with the route + \li RouteModel.NoManeuvers - No maneuvers should be included with the route + \li RouteModel.BasicManeuvers - Basic maneuvers will be included with the route \endlist The default value is RouteModel.BasicManeuvers @@ -1070,11 +1070,11 @@ QDeclarativeGeoRouteQuery::ManeuverDetail QDeclarativeGeoRouteQuery::maneuverDet Values can be combined with OR ('|') -operator. \list - \o RouteModel.CarTravel - The route will be optimized for someone who is driving a car - \o RouteModel.PedestrianTravel - The route will be optimized for someone who is walking - \o RouteModel.BicycleTravel - The route will be optimized for someone who is riding a bicycle - \o RouteModel.PublicTransitTravel - The route will be optimized for someone who is making use of public transit - \o RouteModel.TruckTravel - The route will be optimized for someone who is driving a truck + \li RouteModel.CarTravel - The route will be optimized for someone who is driving a car + \li RouteModel.PedestrianTravel - The route will be optimized for someone who is walking + \li RouteModel.BicycleTravel - The route will be optimized for someone who is riding a bicycle + \li RouteModel.PublicTransitTravel - The route will be optimized for someone who is making use of public transit + \li RouteModel.TruckTravel - The route will be optimized for someone who is driving a truck \endlist The default value is RouteQuery.CarTravel @@ -1130,10 +1130,10 @@ void QDeclarativeGeoRouteQuery::setRouteOptimizations(QDeclarativeGeoRouteQuery: Values can be combined with OR ('|') -operator. \list - \o RouteModel.ShortestRoute - Minimize the length of the journey - \o RouteModel.FastestRoute - Minimize the traveling time for the journey - \o RouteModel.MostEconomicRoute - Minimize the cost of the journey - \o RouteModel.MostScenicRoute - Maximize the scenic potential of the journey + \li RouteModel.ShortestRoute - Minimize the length of the journey + \li RouteModel.FastestRoute - Minimize the traveling time for the journey + \li RouteModel.MostEconomicRoute - Minimize the cost of the journey + \li RouteModel.MostScenicRoute - Maximize the scenic potential of the journey \endlist The default value is RouteQuery.FastestRoute diff --git a/src/imports/location/qdeclarativegeoserviceprovider.cpp b/src/imports/location/qdeclarativegeoserviceprovider.cpp index 305b6b09..13654bbe 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider.cpp +++ b/src/imports/location/qdeclarativegeoserviceprovider.cpp @@ -283,12 +283,12 @@ QDeclarativeGeoServiceProvider::PluginFeatures QDeclarativeGeoServiceProvider::s may be set: \list - \o Plugin.NoFeatures - \o Plugin.GeocodingFeature - \o Plugin.ReverseGeocodingFeature - \o Plugin.RoutingFeature - \o Plugin.MappingFeature - \o Plugin.AnyPlacesFeature + \li Plugin.NoFeatures + \li Plugin.GeocodingFeature + \li Plugin.ReverseGeocodingFeature + \li Plugin.RoutingFeature + \li Plugin.MappingFeature + \li Plugin.AnyPlacesFeature \endlist */ QDeclarativeGeoServiceProvider::PluginFeatures QDeclarativeGeoServiceProvider::requiredFeatures() const @@ -333,38 +333,38 @@ bool QDeclarativeGeoServiceProvider::ready() const \table \row - \o Plugin.NoFeatures - \o No features specified/supported (value: 0x0). + \li Plugin.NoFeatures + \li No features specified/supported (value: 0x0). \row - \o Plugin.SavePlaceFeature - \o The plugin can be used to save places (value: 0x1). + \li Plugin.SavePlaceFeature + \li The plugin can be used to save places (value: 0x1). \row - \o Plugin.RemovePlaceFeature - \o The plugin can be used to remove places (value: 0x2). + \li Plugin.RemovePlaceFeature + \li The plugin can be used to remove places (value: 0x2). \row - \o Plugin.SaveCategoryFeature - \o The plugin can be used to save categories (value: 0x4). + \li Plugin.SaveCategoryFeature + \li The plugin can be used to save categories (value: 0x4). \row - \o Plugin.RemoveCategoryFeature - \o The plugin can be used to remove categories (value: 0x8). + \li Plugin.RemoveCategoryFeature + \li The plugin can be used to remove categories (value: 0x8). \row - \o Plugin.RecommendationsFeature - \o The plugin can provide recommendations (value: 0x10). + \li Plugin.RecommendationsFeature + \li The plugin can provide recommendations (value: 0x10). \row - \o Plugin.SearchSuggestionsFeature\ - \o The plugin can be used to provide search term suggestions (value: 0x20). + \li Plugin.SearchSuggestionsFeature\ + \li The plugin can be used to provide search term suggestions (value: 0x20). \row - \o Plugin.CorrectionsFeature - \o The plugin can provide search term corrections (value: 0x40). + \li Plugin.CorrectionsFeature + \li The plugin can provide search term corrections (value: 0x40). \row - \o Plugin.LocaleFeature - \o The plugin can provide place data information localized according to a set of preferred locales (value: 0x80). + \li Plugin.LocaleFeature + \li The plugin can provide place data information localized according to a set of preferred locales (value: 0x80). \row - \o Plugin.NotificationsFeature - \o The plugin has notification mechanisms for when places/categories are added/modified/removed (value: 0x100). + \li Plugin.NotificationsFeature + \li The plugin has notification mechanisms for when places/categories are added/modified/removed (value: 0x100). \row - \o Plugin.FavoritesMatchingFeature - \o The plugin has a mechanism to match places against places from other plugins (value: 0x200). + \li Plugin.FavoritesMatchingFeature + \li The plugin has a mechanism to match places against places from other plugins (value: 0x200). \endtable */ QDeclarativeGeoServiceProvider::PlacesFeatures QDeclarativeGeoServiceProvider::supportedPlacesFeatures() const @@ -392,9 +392,9 @@ QGeoServiceProvider *QDeclarativeGeoServiceProvider::sharedGeoServiceProvider() "language[_script][_country]" or "C", where: \list - \i language is a lowercase, two-letter, ISO 639 language code, - \i script is a titlecase, four-letter, ISO 15924 script code, - \i country is an uppercase, two- or three-letter, ISO 3166 country code (also "419" as defined by United Nations), + \li language is a lowercase, two-letter, ISO 639 language code, + \li script is a titlecase, four-letter, ISO 15924 script code, + \li country is an uppercase, two- or three-letter, ISO 3166 country code (also "419" as defined by United Nations), \endlist diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp index 5a5fa32a..304c3848 100644 --- a/src/imports/location/qdeclarativepolylinemapitem.cpp +++ b/src/imports/location/qdeclarativepolylinemapitem.cpp @@ -82,7 +82,7 @@ QT_BEGIN_NAMESPACE blended, which decreases performance considerably depending on the hardware in use. - \bold{NOTE:} MapPolylines are implemented using the OpenGL GL_LINES + \b{NOTE:} MapPolylines are implemented using the OpenGL GL_LINES primitive. There have been occasional reports of issues and rendering inconsistencies on some (particularly quite old) platforms. No workaround is yet available for these issues. diff --git a/src/imports/location/qdeclarativepositionsource.cpp b/src/imports/location/qdeclarativepositionsource.cpp index 5219068b..fa075518 100644 --- a/src/imports/location/qdeclarativepositionsource.cpp +++ b/src/imports/location/qdeclarativepositionsource.cpp @@ -267,10 +267,10 @@ void QDeclarativePositionSource::setPreferredPositioningMethods(QGeoPositionInfo current source. \list - \o NoPositioningMethod - No positioning methods supported (no source). - \o SatellitePositioningMethod - Satellite-based positioning methods such as GPS is supported. - \o NonSatellitePositioningMethod - Non satellite methods are supported. - \o AllPositioningMethods - Combination of methods are supported. + \li NoPositioningMethod - No positioning methods supported (no source). + \li SatellitePositioningMethod - Satellite-based positioning methods such as GPS is supported. + \li NonSatellitePositioningMethod - Non satellite methods are supported. + \li AllPositioningMethods - Combination of methods are supported. \endlist */ @@ -297,9 +297,9 @@ QDeclarativePositionSource::PositioningMethods QDeclarativePositionSource::suppo current source. \list - \o SatellitePositioningMethod - Satellite-based positioning methods such as GPS is supported. - \o NonSatellitePositioningMethod - Non satellite methods are supported. - \o AllPositioningMethods - Combination of methods are supported. + \li SatellitePositioningMethod - Satellite-based positioning methods such as GPS is supported. + \li NonSatellitePositioningMethod - Non satellite methods are supported. + \li AllPositioningMethods - Combination of methods are supported. \endlist */ @@ -484,12 +484,12 @@ QDeclarativePositionSource::SourceError QDeclarativePositionSource::sourceError( This property holds the error which last occured with the PositionSource. \list - \o AccessError - The connection setup to the remote positioning backend failed because the + \li AccessError - The connection setup to the remote positioning backend failed because the application lacked the required privileges. - \o ClosedError - The remote positioning backend closed the connection, which happens e.g. in case + \li ClosedError - The remote positioning backend closed the connection, which happens e.g. in case the user is switching location services to off. This object becomes invalid and should be deleted. A new source can be declared later on to check whether the positioning backend is up again. - \o UnknownSourceError - An unidentified error occurred. + \li UnknownSourceError - An unidentified error occurred. \endlist */ diff --git a/src/location/places/qplace.cpp b/src/location/places/qplace.cpp index 27fa1781..b90bb1d2 100644 --- a/src/location/places/qplace.cpp +++ b/src/location/places/qplace.cpp @@ -74,10 +74,10 @@ QT_BEGIN_NAMESPACE For convenience there are a set of functions which return the value of the first contact detail of each type. \list - \o QPlace::primaryPhone() - \o QPlace::primaryEmail() - \o QPlace::primaryWebsite() - \o QPlace::primaryFax() + \li QPlace::primaryPhone() + \li QPlace::primaryEmail() + \li QPlace::primaryWebsite() + \li QPlace::primaryFax() \endlist \section2 Extended Attributes diff --git a/src/location/places/qplaceattribute.cpp b/src/location/places/qplaceattribute.cpp index b96a9428..d5423283 100644 --- a/src/location/places/qplaceattribute.cpp +++ b/src/location/places/qplaceattribute.cpp @@ -82,9 +82,9 @@ bool QPlaceAttributePrivate::operator== (const QPlaceAttributePrivate &other) co \section2 Attribute Types The QPlaceAttribute class defines some constant strings which characterize standard \e {attribute types}. \list - \o QPlaceAttribute::OpeningHours - \o QPlaceAttribute::Payment - \o QPlaceAttribute::Provider + \li QPlaceAttribute::OpeningHours + \li QPlaceAttribute::Payment + \li QPlaceAttribute::Provider \endlist There is a class of attribute types of the format x_id_<provider> e.g. x_id_nokia. @@ -93,10 +93,10 @@ bool QPlaceAttributePrivate::operator== (const QPlaceAttributePrivate &other) co The above types are used to access and modify attributes in QPlace via: \list - \o QPlace::extendedAttribute() - \o QPlace::setExtendedAttribute() - \o QPlace::removeExtendedAttribute() - \o QPlace::removeExtendedAttribute() + \li QPlace::extendedAttribute() + \li QPlace::setExtendedAttribute() + \li QPlace::removeExtendedAttribute() + \li QPlace::removeExtendedAttribute() \endlist The \e {attribute type} is a string type so that providers are able to introduce diff --git a/src/location/places/qplacecontactdetail.cpp b/src/location/places/qplacecontactdetail.cpp index fdf7d15f..c18c2af0 100644 --- a/src/location/places/qplacecontactdetail.cpp +++ b/src/location/places/qplacecontactdetail.cpp @@ -72,18 +72,18 @@ to the end user that describes that detail value which is the actual phone numbe The QPlaceContactDetail class defines some constant strings which characterize standard \e {contact types}. \list - \o QPlaceContactDetail::Phone - \o QPlaceContactDetail::Email - \o QPlaceContactDetail::Website - \o QPlaceContactDetail::Fax + \li QPlaceContactDetail::Phone + \li QPlaceContactDetail::Email + \li QPlaceContactDetail::Website + \li QPlaceContactDetail::Fax \endlist These types are used to access and modify contact details in QPlace via: \list - \o QPlace::contactDetails() - \o QPlace::setContactDetails() - \o QPlace::appendContactDetail() - \o QPlace::contactTypes() + \li QPlace::contactDetails() + \li QPlace::setContactDetails() + \li QPlace::appendContactDetail() + \li QPlace::contactTypes() \endlist The \e {contact type} is intended to be a string type so that providers are able to introduce new contact diff --git a/src/location/places/qplacecontent.cpp b/src/location/places/qplacecontent.cpp index 47ce1501..9d839386 100644 --- a/src/location/places/qplacecontent.cpp +++ b/src/location/places/qplacecontent.cpp @@ -87,7 +87,7 @@ bool QPlaceContentPrivate::compare(const QPlaceContentPrivate *other) const a user from a supplier is contributing content, hence both fields could be filled in simultaneously. - \bold {Note:} Some providers may \e {require} that the attribution string be displayed + \b {Note:} Some providers may \e {require} that the attribution string be displayed to the user whenever a piece of content is viewed. Conversion between QPlaceContent and it's subclasses can be easily performed without @@ -240,7 +240,7 @@ void QPlaceContent::setUser(const QPlaceUser &user) /*! Returns a rich text attribution string. - \bold {Note}: Some providers may require that the attribution + \b {Note}: Some providers may require that the attribution of a particular content item always be displayed when the content item is shown. */ diff --git a/src/location/places/qplacemanager.cpp b/src/location/places/qplacemanager.cpp index 158c8bae..cfbb5137 100644 --- a/src/location/places/qplacemanager.cpp +++ b/src/location/places/qplacemanager.cpp @@ -59,35 +59,35 @@ QT_BEGIN_NAMESPACE The following table gives an overview of the functionality provided by the QPlaceManager \table \header - \o Functionality - \o Description + \li Functionality + \li Description \row - \o Searching for places - \o Using set of parameters such as a search term and search area, relevant places + \li Searching for places + \li Using set of parameters such as a search term and search area, relevant places can be returned to the user. \row - \o Categories - \o Places can be classified as belonging to different categories. The + \li Categories + \li Places can be classified as belonging to different categories. The manager supports access to these categories. \row - \o Search term suggestions - \o Given a partially complete search term, a list of potential + \li Search term suggestions + \li Given a partially complete search term, a list of potential search terms can be given. \row - \o Recommendations - \o Given an existing place, a set of similar recommended places can + \li Recommendations + \li Given an existing place, a set of similar recommended places can be suggested to the user. \row - \o Rich Content - \o Rich content such as images, reviews etc can be retrieved in a paged + \li Rich Content + \li Rich content such as images, reviews etc can be retrieved in a paged fashion. \row - \o Place/Category management - \o Places and categories may be saved and removed. It is possible + \li Place/Category management + \li Places and categories may be saved and removed. It is possible for notifications to be given when this happens. \row - \o Localization - \o Different locales may be specified to return place + \li Localization + \li Different locales may be specified to return place data in different languages. \endtable @@ -119,10 +119,10 @@ QT_BEGIN_NAMESPACE following functions: \list - \o QPlaceManager::childCategories() - \o QPlaceManager::category() - \o QPlaceManager::parentCategoryId() - \o QPlaceManager::childCategoryIds(); + \li QPlaceManager::childCategories() + \li QPlaceManager::category() + \li QPlaceManager::parentCategoryId() + \li QPlaceManager::childCategoryIds(); \endlist If the categories need to be refreshed or reloaded, the initializeCategories() function diff --git a/src/location/qgeocoordinate.cpp b/src/location/qgeocoordinate.cpp index 86d78961..4902a493 100644 --- a/src/location/qgeocoordinate.cpp +++ b/src/location/qgeocoordinate.cpp @@ -454,26 +454,26 @@ QGeoCoordinate QGeoCoordinate::atDistanceAndAzimuth(qreal distance, qreal azimut \table \header - \o \a format value - \o Returned string + \li \a format value + \li Returned string \row - \o \l Degrees - \o -27.46758\unicode{0xB0}, 153.02789\unicode{0xB0}, 28.1m + \li \l Degrees + \li -27.46758\unicode{0xB0}, 153.02789\unicode{0xB0}, 28.1m \row - \o \l DegreesWithHemisphere - \o 27.46758\unicode{0xB0} S, 153.02789\unicode{0xB0} E, 28.1m + \li \l DegreesWithHemisphere + \li 27.46758\unicode{0xB0} S, 153.02789\unicode{0xB0} E, 28.1m \row - \o \l DegreesMinutes - \o -27\unicode{0xB0} 28.054', 153\unicode{0xB0} 1.673', 28.1m + \li \l DegreesMinutes + \li -27\unicode{0xB0} 28.054', 153\unicode{0xB0} 1.673', 28.1m \row - \o \l DegreesMinutesWithHemisphere - \o 27\unicode{0xB0} 28.054 S', 153\unicode{0xB0} 1.673' E, 28.1m + \li \l DegreesMinutesWithHemisphere + \li 27\unicode{0xB0} 28.054 S', 153\unicode{0xB0} 1.673' E, 28.1m \row - \o \l DegreesMinutesSeconds - \o -27\unicode{0xB0} 28' 3.2", 153\unicode{0xB0} 1' 40.4", 28.1m + \li \l DegreesMinutesSeconds + \li -27\unicode{0xB0} 28' 3.2", 153\unicode{0xB0} 1' 40.4", 28.1m \row - \o \l DegreesMinutesSecondsWithHemisphere - \o 27\unicode{0xB0} 28' 3.2" S, 153\unicode{0xB0} 1' 40.4" E, 28.1m + \li \l DegreesMinutesSecondsWithHemisphere + \li 27\unicode{0xB0} 28' 3.2" S, 153\unicode{0xB0} 1' 40.4" E, 28.1m \endtable The altitude field is omitted if no altitude is set. diff --git a/src/location/qgeopositioninfosource.cpp b/src/location/qgeopositioninfosource.cpp index 61bdda15..30f2631c 100644 --- a/src/location/qgeopositioninfosource.cpp +++ b/src/location/qgeopositioninfosource.cpp @@ -334,7 +334,7 @@ int QGeoPositionInfoSource::updateInterval() const If \a methods does not include any methods supported by the source, the preferred methods will be set to the set of methods which the source supports. - \bold {Note:} When reimplementing this method, subclasses must call the + \b {Note:} When reimplementing this method, subclasses must call the base method implementation to ensure preferredPositioningMethods() returns the correct value. \sa supportedPositioningMethods() diff --git a/src/location/qnmeapositioninfosource.cpp b/src/location/qnmeapositioninfosource.cpp index 760a06d4..6cc22384 100644 --- a/src/location/qnmeapositioninfosource.cpp +++ b/src/location/qnmeapositioninfosource.cpp @@ -518,7 +518,7 @@ QNmeaPositionInfoSource::UpdateMode QNmeaPositionInfoSource::updateMode() const The source device can only be set once and must be set before calling startUpdates() or requestUpdate(). - \bold {Note:} The \a device must emit QIODevice::readyRead() for the + \b {Note:} The \a device must emit QIODevice::readyRead() for the source to be notified when data is available for reading. QNmeaPositionInfoSource does not assume the ownership of the device, and hence does not deallocate it upon destruction. |