Rename QGeoSearchManager to QGeocodingManager

Also do related renames like QGeoSearchReply to QGeocodeReply

Change-Id: I31cc6da4fda03299e905b4938cdfcff3c20aa8c7
Reviewed-on: http://codereview.qt.nokia.com/2710
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: abcd <qt_abcd1@ovi.com>

4 files changed, 286 insertions, 0 deletions

diff --git a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
new file mode 100644
index 00000000..171c2b12
--- /dev/null
+++ b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGEOCODINGMANAGERENGINE_TEST_H
+#define QGEOCODINGMANAGERENGINE_TEST_H
+
+#include <qgeoserviceprovider.h>
+#include <qgeocodingmanagerengine.h>
+#include <QLocale>
+#include <qlandmarkmanager.h>
+#include <qgeoaddress.h>
+#include <qgeolocation.h>
+#include <qgeocodereply.h>
+
+
+QT_USE_NAMESPACE
+
+
+class GeocodeReplyTest :public QGeocodeReply
+{
+    Q_OBJECT
+public:
+    GeocodeReplyTest(QObject *parent=0):QGeocodeReply (parent) {}
+
+    void  callAddLocation ( const QGeoLocation & location ) {addLocation(location);}
+    void  callSetError ( Error error, const QString & errorString ) {setError(error, errorString);}
+    void  callSetFinished ( bool finished ) {setFinished(finished);}
+    void  callSetLimit ( int limit ) {setLimit(limit);}
+    void  callSetOffset ( int offset ) {setOffset(offset);}
+    void  callSetLocations ( const QList<QGeoLocation> & locations ) {setLocations(locations);}
+    void  callSetViewport ( QGeoBoundingArea * viewport ) {setViewport(viewport);}
+
+};
+
+class QGeocodingManagerEngineTest: public QGeocodingManagerEngine
+
+{
+Q_OBJECT
+public:
+    QGeocodingManagerEngineTest(const QMap<QString, QVariant> &parameters,
+        QGeoServiceProvider::Error *error, QString *errorString) :
+        QGeocodingManagerEngine(parameters)
+    {
+        Q_UNUSED(error)
+        Q_UNUSED(errorString)
+        setSupportsGeocoding(true);
+        setSupportsReverseGeocoding(true);
+        setLocale(*(new QLocale (QLocale::German, QLocale::Germany)));
+    }
+
+    QGeocodeReply*  geocode ( const QString & searchString, int limit, int offset, QGeoBoundingArea * bounds )
+    {
+        GeocodeReplyTest *geocodereply = new GeocodeReplyTest();
+        geocodereply->callSetLimit(limit);
+        geocodereply->callSetOffset(offset);
+        geocodereply->callSetViewport(bounds);
+        geocodereply->callSetError(QGeocodeReply::NoError,searchString);
+        geocodereply->callSetFinished(true);
+        emit(this->finished(geocodereply));
+
+        return static_cast<QGeocodeReply*>(geocodereply);
+    }
+
+    QGeocodeReply*  geocode ( const QGeoAddress & address, QGeoBoundingArea * bounds )
+    {
+        GeocodeReplyTest *geocodereply = new GeocodeReplyTest();
+        geocodereply->callSetViewport(bounds);
+        geocodereply->callSetError(QGeocodeReply::NoError,address.city());
+        geocodereply->callSetFinished(true);
+        emit(this->finished(geocodereply));
+
+        return static_cast<QGeocodeReply*>(geocodereply);
+    }
+
+    QGeocodeReply*  reverseGeocode ( const QGeoCoordinate & coordinate, QGeoBoundingArea * bounds )
+    {
+        GeocodeReplyTest *geocodereply = new GeocodeReplyTest();
+        geocodereply->callSetViewport(bounds);
+        geocodereply->callSetError(QGeocodeReply::NoError,coordinate.toString());
+        geocodereply->callSetFinished(true);
+        emit(this->finished(geocodereply));
+        return static_cast<QGeocodeReply*>(geocodereply);
+    }
+};
+
+#endif
diff --git a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerplugins.pro b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerplugins.pro
new file mode 100644
index 00000000..54897097
--- /dev/null
+++ b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerplugins.pro
@@ -0,0 +1,24 @@
+load(qt_module)
+
+TEMPLATE = lib
+CONFIG += plugin testplugin
+TARGET = qtgeoservices_geocodingplugin
+PLUGIN_TYPE=geoservices
+QT += location
+
+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri)
+# TODO not sure where to put test plugins in Qt 5
+DESTDIR = $$QT.location.plugins/geoservices
+
+HEADERS += qgeocodingmanagerengine_test.h \
+           qgeoserviceproviderplugin_test.h
+
+SOURCES += qgeoserviceproviderplugin_test.cpp
+
+
+INCLUDEPATH += ../../../src/location \
+               ../../../src/location/maps \
+               ../../../src/location/landmarks
+
+target.path += $$[QT_INSTALL_PLUGINS]/geoservices
+INSTALLS += target
diff --git a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp
new file mode 100644
index 00000000..5039da7c
--- /dev/null
+++ b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qgeoserviceproviderplugin_test.h"
+#include "qgeocodingmanagerengine_test.h"
+
+#include <QtPlugin>
+
+QGeoServiceProviderFactoryTest::QGeoServiceProviderFactoryTest()
+{
+}
+
+QGeoServiceProviderFactoryTest::~QGeoServiceProviderFactoryTest()
+{
+}
+
+QString QGeoServiceProviderFactoryTest::providerName() const
+{
+    return "static.geocode.test.plugin";
+}
+
+int QGeoServiceProviderFactoryTest::providerVersion() const
+{
+    return 3;
+}
+
+QGeocodingManagerEngine* QGeoServiceProviderFactoryTest::createGeocodingManagerEngine(const QMap<
+    QString, QVariant> &parameters, QGeoServiceProvider::Error *error, QString *errorString) const
+{
+    return new QGeocodingManagerEngineTest(parameters, error, errorString);
+}
+
+Q_EXPORT_PLUGIN2(qtgeoservices_staticgeocodingplugin, QGeoServiceProviderFactoryTest)
diff --git a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h
new file mode 100644
index 00000000..b597359d
--- /dev/null
+++ b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGEOSERVICEPROVIDER_TEST_H
+#define QGEOSERVICEPROVIDER_TEST_H
+
+#include <qgeoserviceproviderfactory.h>
+#include <QObject>
+
+QT_USE_NAMESPACE
+
+class QGeoServiceProviderFactoryTest: public QObject, public QGeoServiceProviderFactory
+{
+    Q_OBJECT
+    Q_INTERFACES(QGeoServiceProviderFactory)
+public:
+    QGeoServiceProviderFactoryTest();
+    ~QGeoServiceProviderFactoryTest();
+
+    QString providerName() const;
+    int providerVersion() const;
+
+    QGeocodingManagerEngine* createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
+        QGeoServiceProvider::Error *error, QString *errorString) const;
+};
+
+#endif
+
+