Rename positioning/flickr example to geoflickr

This makes it more compliant with standard naming conventions and more
easily distinguishes this example from flickr examples in other modules.

Task-number: QTBUG-41831
Change-Id: Id4953777326a0463d57d52df92c70860addc61ff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

6 files changed, 13 insertions, 13 deletions

diff --git a/src/imports/positioning/qdeclarativeposition.cpp b/src/imports/positioning/qdeclarativeposition.cpp
index 04b42cbc..ee971c01 100644
--- a/src/imports/positioning/qdeclarativeposition.cpp
+++ b/src/imports/positioning/qdeclarativeposition.cpp
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
     \section2 Example Usage
 
     See the example given for the \l{PositionSource} type, or the
-    \l{flickr}{Flickr} example application.
+    \l{geoflickr}{GeoFlickr} example application.
 
     \sa PositionSource, coordinate
 */
diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp
index a770e664..b688758a 100644
--- a/src/imports/positioning/qdeclarativepositionsource.cpp
+++ b/src/imports/positioning/qdeclarativepositionsource.cpp
@@ -99,7 +99,7 @@ QT_BEGIN_NAMESPACE
     }
     \endcode
 
-    The \l{flickr}{Flickr} example application shows how to use
+    The \l{geoflickr}{GeoFlickr} example application shows how to use
     a PositionSource in your application to retrieve local data for users
     from a REST web service.
 
diff --git a/src/positioning/doc/images/qml-flickr-1.jpg b/src/positioning/doc/images/qml-flickr-1.jpg
index 14fc5c92..42514ff0 100644
--- a/src/positioning/doc/images/qml-flickr-1.jpg
+++ b/src/positioning/doc/images/qml-flickr-1.jpg
diff --git a/src/positioning/doc/src/examples/declarative-flickr.qdoc b/src/positioning/doc/src/examples/geoflickr.qdoc
index a1d0bb58..af47461b 100644
--- a/src/positioning/doc/src/examples/declarative-flickr.qdoc
+++ b/src/positioning/doc/src/examples/geoflickr.qdoc
@@ -26,11 +26,11 @@
 ****************************************************************************/
 
 /*!
-    \example flickr
-    \title Flickr (QML)
+    \example geoflickr
+    \title GeoFlickr (QML)
     \ingroup qtpositioning-examples
 
-    \brief The Flickr example shows how to use the user's current position to
+    \brief The GeoFlickr example shows how to use the user's current position to
            fetch local content from a web service.
 
     This is a small example, illustrating one of the very core parts of the
@@ -54,20 +54,20 @@
     GeoTab component (the floating "window" describing current position and
     status).
 
-    \snippet flickr/flickrmobile/GeoTab.qml possrc
+    \snippet geoflickr/flickrmobile/GeoTab.qml possrc
 
     When the "Locate and update" button is pressed, we first interrogate the
     PositionSource to check if it has an available backend for positioning
     data. If it does not, we fall back to using a pre-recorded NMEA log
     for demonstration. We then instruct the PositionSource to update.
 
-    \snippet flickr/flickrmobile/GeoTab.qml locatebutton-top
-    \snippet flickr/flickrmobile/GeoTab.qml locatebutton-clicked
+    \snippet geoflickr/flickrmobile/GeoTab.qml locatebutton-top
+    \snippet geoflickr/flickrmobile/GeoTab.qml locatebutton-clicked
 
     To share the new position data with the rest of the application, we use
     properties that we have created on the GeoTab component:
 
-    \snippet flickr/flickrmobile/GeoTab.qml props
+    \snippet geoflickr/flickrmobile/GeoTab.qml props
 
     \section1 Using the Current Position
 
@@ -79,7 +79,7 @@
     In this case, it retrieves data from the Flickr REST API online, based on
     our current position
 
-    \snippet flickr/flickrcommon/RestModel.qml restmodel
+    \snippet geoflickr/flickrcommon/RestModel.qml restmodel
 
     This model data is then shown in a variety of Qt Quick views to produce
     the example application.
diff --git a/src/positioning/doc/src/qml-position.qdoc b/src/positioning/doc/src/qml-position.qdoc
index 3ccac326..ec1cf47a 100644
--- a/src/positioning/doc/src/qml-position.qdoc
+++ b/src/positioning/doc/src/qml-position.qdoc
@@ -111,9 +111,9 @@ PositionSource {
 
 
 
-\section2 \b{Flickr Example}
+\section2 \b{GeoFlickr Example}
 
-The \l{Flickr (QML)}{Flickr Example} uses the Location to download thumbnail
+The \l{GeoFlickr (QML)}{GeoFlickr Example} uses the Location to download thumbnail
 images from Flickr relevant to the current location.
 
 */
diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc
index ae74f89c..5662b0aa 100644
--- a/src/positioning/doc/src/qtpositioning.qdoc
+++ b/src/positioning/doc/src/qtpositioning.qdoc
@@ -114,7 +114,7 @@ such as speed and direction. This provides the fundamental location information
 \section2 Examples
 
 \list
-    \li \l {Flickr (QML)}
+    \li \l {GeoFlickr (QML)}
     \li \l {Log File Position Source (C++)}
     \li \l {SatelliteInfo (C++/QML)}
     \li \l {Weather Info (C++/QML)}