summaryrefslogtreecommitdiff
path: root/src/location/maps/qgeoserviceprovider.h
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2012-06-20 13:48:58 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-20 06:04:26 +0200
commite3c6bc638f400193b2046bcad423e18c6b227af6 (patch)
tree34c81d5f954c58ef6c6e3397a35590f0f88fa0ad /src/location/maps/qgeoserviceprovider.h
parent400bb40ae96e9902c2f65970a69e99a8234f5b6f (diff)
downloadqtlocation-e3c6bc638f400193b2046bcad423e18c6b227af6.tar.gz
Add missing QGeoServiceProvider documentation.
This modifies the signature of the QGeoServiceProvider contructor to use QVariantMap instead of QMap<QString, QVariant>. They are equivalent and the former is shorter and qdoc was failing to parse / truncating the the latter. Add documentation for the feature enums and functions. Change-Id: Ie3a92dc0d28d55d7c7f13e2f54d77b5e4620bb0b Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
Diffstat (limited to 'src/location/maps/qgeoserviceprovider.h')
-rw-r--r--src/location/maps/qgeoserviceprovider.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h
index 51e23aff..412aada2 100644
--- a/src/location/maps/qgeoserviceprovider.h
+++ b/src/location/maps/qgeoserviceprovider.h
@@ -42,11 +42,9 @@
#ifndef QGEOSERVICEPROVIDER_H
#define QGEOSERVICEPROVIDER_H
-#include <QMap>
-#include <QVariant>
-#include <QString>
-#include <QObject>
-
+#include <QtCore/QVariant>
+#include <QtCore/QString>
+#include <QtCore/QObject>
#include <QtLocation/qlocationglobal.h>
QT_BEGIN_HEADER
@@ -136,7 +134,7 @@ public:
static QStringList availableServiceProviders();
QGeoServiceProvider(const QString &providerName,
- const QMap<QString,QVariant> &parameters = (QMap<QString,QVariant>()),
+ const QVariantMap &parameters = QVariantMap(),
bool allowExperimental = false);
~QGeoServiceProvider();
@@ -154,7 +152,7 @@ public:
Error error() const;
QString errorString() const;
- void setParameters(const QMap<QString, QVariant> &parameters);
+ void setParameters(const QVariantMap &parameters);
void setLocale(const QLocale &locale);
void setAllowExperimental(bool allow);