From a44a63e8c35aedc364548ee93a3409c60c0e3360 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Wed, 25 Sep 2013 13:09:56 +0200 Subject: Doc: Fixed broken Positioning links due to version number. -Links and documentation with type version number no longer recommended because it is a maintainability and consistency issue. Use :: to link to a QML type. Change-Id: I0f5dcb833c32c3845fc48c18fa29a2c89b13f1d0 Reviewed-by: Alex Blasche --- src/imports/location/declarativeplaces/qdeclarativeplace.cpp | 2 +- src/imports/positioning/qdeclarativepositionsource.cpp | 2 +- src/location/doc/src/maps.qdoc | 4 ++-- src/location/doc/src/qml-maps.qdoc | 2 +- src/positioning/doc/src/cpp-qml-positioning.qdoc | 2 +- src/positioning/doc/src/examples/declarative-flickr.qdoc | 2 +- src/positioning/doc/src/qtpositioning-qml.qdoc | 2 +- src/positioning/qdeclarativegeoaddress.cpp | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp index cdf61a1f..49e61769 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp @@ -441,7 +441,7 @@ QPlace QDeclarativePlace::place() } /*! - \qmlproperty QtPositioning5::Location Place::location + \qmlproperty QtPositioning::Location Place::location This property holds the location of the place which can be used to retrieve the coordinate, address and the bounding box. diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp index a9bdbd88..694e0e8f 100644 --- a/src/imports/positioning/qdeclarativepositionsource.cpp +++ b/src/imports/positioning/qdeclarativepositionsource.cpp @@ -111,7 +111,7 @@ QT_BEGIN_NAMESPACE a PositionSource in your application to retrieve local data for users from a REST web service. - \sa {QtPositioning5::Position}, {QGeoPositionInfoSource} + \sa {QtPositioning::Position}, {QGeoPositionInfoSource} */ diff --git a/src/location/doc/src/maps.qdoc b/src/location/doc/src/maps.qdoc index a97f28f9..acd5cefb 100644 --- a/src/location/doc/src/maps.qdoc +++ b/src/location/doc/src/maps.qdoc @@ -147,7 +147,7 @@ varying degrees of accuracy. A geocoding query in QML is performed using the \l{QtLocation5::GeocodeModel}{GeocodeModel} type. For an address-to-coordinate query, its \c{query} property may be set to either an -\l{QtPositioning5::Address}{Address} object or a string containing the textual +\l{QtPositioning::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 \l {coordinate} instead. Results are made available in the contents of the model. @@ -161,7 +161,7 @@ contents of the model. \li \l{QtLocation5::GeocodeModel}{GeocodeModel} \li Queries the Plugin for geocoding translations and provides access to results via indexes in the model. \row - \li \l{QtPositioning5::Address}{Address} + \li \l{QtPositioning::Address}{Address} \li Structured address for use in queries and results of geocoding. \endtable diff --git a/src/location/doc/src/qml-maps.qdoc b/src/location/doc/src/qml-maps.qdoc index f63cc5a4..78e11a04 100644 --- a/src/location/doc/src/qml-maps.qdoc +++ b/src/location/doc/src/qml-maps.qdoc @@ -60,7 +60,7 @@ The basic piece 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 \l {coordinate}. The \l {coordinate} type may -also be held within a \l {QtPositioning5::Location}{Location} element, this will also have information +also be held within a \l {QtPositioning::Location}{Location} element, this will also have information on a bounding box size to determine sufficient proximity to the location and a location address. diff --git a/src/positioning/doc/src/cpp-qml-positioning.qdoc b/src/positioning/doc/src/cpp-qml-positioning.qdoc index 4ccd8510..55eeaff9 100644 --- a/src/positioning/doc/src/cpp-qml-positioning.qdoc +++ b/src/positioning/doc/src/cpp-qml-positioning.qdoc @@ -33,7 +33,7 @@ \section2 Address - QGeoAddress \target geoaddress -The \l {QtPositioning5::Address::address} {Address.address} property is used to provide an interface between C++ and QML code. First a pointer to a +The \l {QtPositioning::Address::address} {Address.address} property is used to provide an interface between C++ and QML code. First a pointer to a Address object must be obtained from C++, then use the \l {QObject::property()}{property()} and \l {QObject::setProperty()}{setProperty()} functions to get and set the \c address property. The following gets the QGeoAddress representing this object from C++: diff --git a/src/positioning/doc/src/examples/declarative-flickr.qdoc b/src/positioning/doc/src/examples/declarative-flickr.qdoc index c68797b0..46cc8d22 100644 --- a/src/positioning/doc/src/examples/declarative-flickr.qdoc +++ b/src/positioning/doc/src/examples/declarative-flickr.qdoc @@ -39,7 +39,7 @@ Key QML types shown in this example: \list - \li \l{QtPositioning5::PositionSource}{PositionSource} + \li \l{QtPositioning::PositionSource}{PositionSource} \li \l{XmlListModel}{XmlListModel} \endlist diff --git a/src/positioning/doc/src/qtpositioning-qml.qdoc b/src/positioning/doc/src/qtpositioning-qml.qdoc index ba35cb89..e9a57870 100644 --- a/src/positioning/doc/src/qtpositioning-qml.qdoc +++ b/src/positioning/doc/src/qtpositioning-qml.qdoc @@ -46,7 +46,7 @@ the longitude, and the altitude in meters. For more information see \l {http://en.wikipedia.org/wiki/Geographic_coordinate}{Geographic Coordinate}. The QML position is stored in a \l {coordinate} which contains the -latitude, longitude and altitude of the device. The \l {QtPositioning5::Location}{Location} contains +latitude, longitude and altitude of the device. The \l {QtPositioning::Location}{Location} contains this \l {coordinate} and adds an address, it also has a bounding box which defines the recommended viewing region when displaying the location. diff --git a/src/positioning/qdeclarativegeoaddress.cpp b/src/positioning/qdeclarativegeoaddress.cpp index b773bc95..8d875383 100644 --- a/src/positioning/qdeclarativegeoaddress.cpp +++ b/src/positioning/qdeclarativegeoaddress.cpp @@ -99,7 +99,7 @@ QDeclarativeGeoAddress::QDeclarativeGeoAddress(const QGeoAddress &address, QObje } /*! - \qmlproperty QGeoAddress QtPositioning5::Address::address + \qmlproperty QGeoAddress QtPositioning::Address::address For details on how to use this property to interface between C++ and QML see "\l {positioning-cpp-qml.html#geoaddress} {Interfaces between C++ and QML Code}". @@ -125,7 +125,7 @@ void QDeclarativeGeoAddress::setAddress(const QGeoAddress &address) } /*! - \qmlproperty string QtPositioning5::Address::text + \qmlproperty string QtPositioning::Address::text This property holds the address as a single formatted string. It is the recommended string to use to display the address to the user. It typically takes the format of -- cgit v1.2.1