diff options
Diffstat (limited to 'src/plugins/geoservices/nokia')
10 files changed, 266 insertions, 72 deletions
diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro index 1aa31123..c60bc7af 100644 --- a/src/plugins/geoservices/nokia/nokia.pro +++ b/src/plugins/geoservices/nokia/nokia.pro @@ -2,12 +2,6 @@ TARGET = qtgeoservices_nokia QT += location-private positioning-private network -contains(QT_CONFIG, location-china-support) { - # China support - DEFINES += USE_CHINA_NETWORK_REGISTRATION - QT += systeminfo -} - HEADERS += \ qgeocodereply_nokia.h \ qgeocodejsonparser.h \ @@ -26,7 +20,8 @@ HEADERS += \ uri_constants.h \ qgeoerror_messages.h \ qgeomapversion.h \ - qgeotiledmap_nokia.h + qgeotiledmap_nokia.h \ + qgeofiletilecachenokia.h SOURCES += \ @@ -45,7 +40,8 @@ SOURCES += \ uri_constants.cpp \ qgeoerror_messages.cpp \ qgeomapversion.cpp \ - qgeotiledmap_nokia.cpp + qgeotiledmap_nokia.cpp \ + qgeofiletilecachenokia.cpp include(placesv2/placesv2.pri) diff --git a/src/plugins/geoservices/nokia/qgeofiletilecachenokia.cpp b/src/plugins/geoservices/nokia/qgeofiletilecachenokia.cpp new file mode 100644 index 00000000..8b795325 --- /dev/null +++ b/src/plugins/geoservices/nokia/qgeofiletilecachenokia.cpp @@ -0,0 +1,124 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtLocation module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later 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 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qgeofiletilecachenokia.h" +#include <QtLocation/private/qgeotilespec_p.h> +#include <QDir> + +QT_BEGIN_NAMESPACE + +QGeoFileTileCacheNokia::QGeoFileTileCacheNokia(int ppi, const QString &directory, QObject *parent) + :QGeoFileTileCache(directory, parent) +{ + m_ppi = QString::number(ppi) + QLatin1String("p"); +} + +QGeoFileTileCacheNokia::~QGeoFileTileCacheNokia() +{ + +} + +QString QGeoFileTileCacheNokia::tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const +{ + QString filename = spec.plugin(); + filename += QLatin1String("-"); + filename += QString::number(spec.mapId()); + filename += QLatin1String("-"); + filename += QString::number(spec.zoom()); + filename += QLatin1String("-"); + filename += QString::number(spec.x()); + filename += QLatin1String("-"); + filename += QString::number(spec.y()); + + //Append version if real version number to ensure backwards compatibility and eviction of old tiles + if (spec.version() != -1) { + filename += QLatin1String("-"); + filename += QString::number(spec.version()); + } + + filename += QLatin1String("-"); + filename += m_ppi; + + filename += QLatin1String("."); + filename += format; + + QDir dir = QDir(directory); + + return dir.filePath(filename); +} + +QGeoTileSpec QGeoFileTileCacheNokia::filenameToTileSpec(const QString &filename) const +{ + QGeoTileSpec emptySpec; + + QStringList parts = filename.split('.'); + + if (parts.length() != 2) + return emptySpec; + + QString name = parts.at(0); + QStringList fields = name.split('-'); + + int length = fields.length(); + if (length != 6 && length != 7) + return emptySpec; + else if (fields.last() != m_ppi) + return QGeoTileSpec(); + + QList<int> numbers; + + bool ok = false; + for (int i = 1; i < length-1; ++i) { // skipping -<ppi> + ok = false; + int value = fields.at(i).toInt(&ok); + if (!ok) + return emptySpec; + numbers.append(value); + } + + //File name without version, append default + if (numbers.length() < 5) + numbers.append(-1); + + return QGeoTileSpec(fields.at(0), + numbers.at(0), + numbers.at(1), + numbers.at(2), + numbers.at(3), + numbers.at(4)); +} + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h b/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h new file mode 100644 index 00000000..aba232f5 --- /dev/null +++ b/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtLocation module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later 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 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QGEOFILETILECACHENOKIA_H +#define QGEOFILETILECACHENOKIA_H + +#include <QtLocation/private/qgeofiletilecache_p.h> + +QT_BEGIN_NAMESPACE + +class QGeoFileTileCacheNokia : public QGeoFileTileCache +{ + Q_OBJECT +public: + QGeoFileTileCacheNokia(int ppi, const QString &directory = QString(), QObject *parent = 0); + ~QGeoFileTileCacheNokia(); + +protected: + virtual QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const Q_DECL_OVERRIDE; + virtual QGeoTileSpec filenameToTileSpec(const QString &filename) const Q_DECL_OVERRIDE; + + QString m_ppi; +}; + +QT_END_NAMESPACE + +#endif // QGEOFILETILECACHENOKIA_H diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp index f6d05c36..4deac4ee 100644 --- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp @@ -81,7 +81,11 @@ namespace token = parameters.value(QStringLiteral("here.token")).toString(); if (isValidParameter(appId) && isValidParameter(token)) - return; + return; + else if (!isValidParameter(appId)) + qWarning() << "Invalid here.app_id"; + else + qWarning() << "Invalid here.token"; if (parameters.contains(QStringLiteral("app_id")) || parameters.contains(QStringLiteral("token"))) qWarning() << QStringLiteral("Please prefix 'app_id' and 'token' with prefix 'here' (e.g.: 'here.app_id')"); diff --git a/src/plugins/geoservices/nokia/qgeotiledmap_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.cpp index d83ad0f9..5179fff4 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmap_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.cpp @@ -72,13 +72,13 @@ void QGeoTiledMapNokia::evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTile const QString copyrightsString = m_engine->evaluateCopyrightsText(activeMapType(), cameraData().zoomLevel(), visibleTiles); - if (width() > 0 && height() > 0 && ((copyrightsString.isNull() && m_copyrightsSlab.isNull()) || copyrightsString != m_lastCopyrightsString)) { + if (viewportWidth() > 0 && viewportHeight() > 0 && ((copyrightsString.isNull() && m_copyrightsSlab.isNull()) || copyrightsString != m_lastCopyrightsString)) { QFont font("Sans Serif"); font.setPixelSize(fontSize); font.setStyleHint(QFont::SansSerif); font.setWeight(QFont::Bold); - QRect textBounds = QFontMetrics(font).boundingRect(0, 0, width(), height(), Qt::AlignBottom | Qt::AlignLeft | Qt::TextWordWrap, copyrightsString); + QRect textBounds = QFontMetrics(font).boundingRect(0, 0, viewportWidth(), viewportHeight(), Qt::AlignBottom | Qt::AlignLeft | Qt::TextWordWrap, copyrightsString); m_copyrightsSlab = QImage(m_logo.width() + textBounds.width() + spaceToLogo + blurRate * 2, qMax(m_logo.height(), textBounds.height() + blurRate * 2), diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp index 4f44e5fd..6548aa2b 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp @@ -39,7 +39,7 @@ #include "qgeotiledmap_nokia.h" #include "qgeotilefetcher_nokia.h" #include "qgeotilespec_p.h" -#include "qgeofiletilecache_p.h" +#include "qgeofiletilecachenokia.h" #include <QDebug> #include <QDir> @@ -95,22 +95,40 @@ QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia( types << QGeoMapType(QGeoMapType::CarNavigationMap, tr("Car Navigation Map"), tr("Normal map view in daylight mode for car navigation"), false, false, 21); setSupportedMapTypes(types); - QGeoTileFetcherNokia *fetcher = new QGeoTileFetcherNokia(parameters, networkManager, this, tileSize()); + int ppi = 72; + if (parameters.contains(QStringLiteral("here.mapping.highdpi_tiles"))) { + const QString param = parameters.value(QStringLiteral("here.mapping.highdpi_tiles")).toString().toLower(); + if (param == "true") + ppi = 250; + } + + QGeoTileFetcherNokia *fetcher = new QGeoTileFetcherNokia(parameters, networkManager, this, tileSize(), ppi); setTileFetcher(fetcher); + /* TILE CACHE */ // TODO: do this in a plugin-neutral way so that other tiled map plugins // don't need this boilerplate or hardcode plugin name - if (parameters.contains(QStringLiteral("here.mapping.cache.directory"))) { m_cacheDirectory = parameters.value(QStringLiteral("here.mapping.cache.directory")).toString(); } else { // managerName() is not yet set, we have to hardcode the plugin name below - m_cacheDirectory = QAbstractGeoTileCache::baseCacheDirectory() + QLatin1String("here"); + m_cacheDirectory = QAbstractGeoTileCache::baseLocationCacheDirectory() + QLatin1String("here"); } - QAbstractGeoTileCache *tileCache = new QGeoFileTileCache(m_cacheDirectory); - setTileCache(tileCache); - + QGeoFileTileCache *tileCache = new QGeoFileTileCacheNokia(ppi, m_cacheDirectory); + + /* + * Disk cache setup -- defaults to ByteSize (old behavior) + */ + if (parameters.contains(QStringLiteral("here.mapping.cache.disk.cost_strategy"))) { + QString cacheStrategy = parameters.value(QStringLiteral("here.mapping.cache.disk.cost_strategy")).toString().toLower(); + if (cacheStrategy == QLatin1String("bytesize")) + tileCache->setCostStrategyDisk(QGeoFileTileCache::ByteSize); + else + tileCache->setCostStrategyDisk(QGeoFileTileCache::Unitary); + } else { + tileCache->setCostStrategyDisk(QGeoFileTileCache::ByteSize); + } if (parameters.contains(QStringLiteral("here.mapping.cache.disk.size"))) { bool ok = false; int cacheSize = parameters.value(QStringLiteral("here.mapping.cache.disk.size")).toString().toInt(&ok); @@ -118,6 +136,18 @@ QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia( tileCache->setMaxDiskUsage(cacheSize); } + /* + * Memory cache setup -- defaults to ByteSize (old behavior) + */ + if (parameters.contains(QStringLiteral("here.mapping.cache.memory.cost_strategy"))) { + QString cacheStrategy = parameters.value(QStringLiteral("here.mapping.cache.memory.cost_strategy")).toString().toLower(); + if (cacheStrategy == QLatin1String("bytesize")) + tileCache->setCostStrategyMemory(QGeoFileTileCache::ByteSize); + else + tileCache->setCostStrategyMemory(QGeoFileTileCache::Unitary); + } else { + tileCache->setCostStrategyMemory(QGeoFileTileCache::ByteSize); + } if (parameters.contains(QStringLiteral("here.mapping.cache.memory.size"))) { bool ok = false; int cacheSize = parameters.value(QStringLiteral("here.mapping.cache.memory.size")).toString().toInt(&ok); @@ -125,6 +155,18 @@ QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia( tileCache->setMaxMemoryUsage(cacheSize); } + /* + * Texture cache setup -- defaults to ByteSize (old behavior) + */ + if (parameters.contains(QStringLiteral("here.mapping.cache.texture.cost_strategy"))) { + QString cacheStrategy = parameters.value(QStringLiteral("here.mapping.cache.texture.cost_strategy")).toString().toLower(); + if (cacheStrategy == QLatin1String("bytesize")) + tileCache->setCostStrategyTexture(QGeoFileTileCache::ByteSize); + else + tileCache->setCostStrategyTexture(QGeoFileTileCache::Unitary); + } else { + tileCache->setCostStrategyTexture(QGeoFileTileCache::ByteSize); + } if (parameters.contains(QStringLiteral("here.mapping.cache.texture.size"))) { bool ok = false; int cacheSize = parameters.value(QStringLiteral("here.mapping.cache.texture.size")).toString().toInt(&ok); @@ -132,6 +174,7 @@ QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia( tileCache->setExtraTextureUsage(cacheSize); } + setTileCache(tileCache); populateMapSchemes(); loadMapVersion(); QMetaObject::invokeMethod(fetcher, "fetchCopyrightsData", Qt::QueuedConnection); diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp index 50acc2a0..a55f71c0 100644 --- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp @@ -56,11 +56,11 @@ QT_BEGIN_NAMESPACE namespace { - QString sizeToStr(const QSize &size) + QString sizeToStr(int size) { - if (size.height() >= 512 || size.width() >= 512) + if (size > 256) return QStringLiteral("512"); - else if (size.height() >= 256 || size.width() >= 256) + else if (size > 128) return QStringLiteral("256"); else return QStringLiteral("128"); // 128 pixel tiles are deprecated. @@ -74,13 +74,14 @@ namespace QGeoTileFetcherNokia::QGeoTileFetcherNokia(const QVariantMap ¶meters, QGeoNetworkAccessManager *networkManager, QGeoTiledMappingManagerEngineNokia *engine, - const QSize &tileSize) -: QGeoTileFetcher(engine), m_engineNokia(engine), m_networkManager(networkManager), - m_tileSize(tileSize), m_copyrightsReply(0), + const QSize &tileSize, + int ppi) +: QGeoTileFetcher(engine), m_engineNokia(engine), m_networkManager(networkManager), m_ppi(ppi), m_copyrightsReply(0), m_baseUriProvider(new QGeoUriProvider(this, parameters, QStringLiteral("here.mapping.host"), MAP_TILES_HOST)), m_aerialUriProvider(new QGeoUriProvider(this, parameters, QStringLiteral("here.mapping.host.aerial"), MAP_TILES_HOST_AERIAL)) { Q_ASSERT(networkManager); + m_tileSize = qMax(tileSize.width(), tileSize.height()); m_networkManager->setParent(this); m_applicationId = parameters.value(QStringLiteral("here.app_id")).toString(); @@ -94,7 +95,11 @@ QGeoTileFetcherNokia::~QGeoTileFetcherNokia() QGeoTiledMapReply *QGeoTileFetcherNokia::getTileImage(const QGeoTileSpec &spec) { // TODO add error detection for if request.connectivityMode() != QGraphicsGeoMap::OnlineMode - QString rawRequest = getRequestString(spec); + int ppi = m_ppi; + if ((spec.mapId() == 2) || (spec.mapId() == 12) || (spec.mapId() == 21)) + ppi = 72; // HiDpi apparently not supported for these maps + + QString rawRequest = getRequestString(spec, ppi); if (rawRequest.isEmpty()) { return new QGeoTiledMapReply(QGeoTiledMapReply::UnknownError, tr("Mapping manager no longer exists"), this); @@ -110,7 +115,7 @@ QGeoTiledMapReply *QGeoTileFetcherNokia::getTileImage(const QGeoTileSpec &spec) return mapReply; } -QString QGeoTileFetcherNokia::getRequestString(const QGeoTileSpec &spec) +QString QGeoTileFetcherNokia::getRequestString(const QGeoTileSpec &spec, int ppi) { if (!m_engineNokia) return QString(); @@ -136,11 +141,11 @@ QString QGeoTileFetcherNokia::getRequestString(const QGeoTileSpec &spec) requestString += slash; requestString += QString::number(spec.y()); requestString += slash; - requestString += sizeToStr(m_tileSize); + requestString += ((ppi > 72)) ? sizeToStr(m_tileSize * 2) : sizeToStr(m_tileSize); static const QString slashpng("/png8"); requestString += slashpng; - if (!m_token.isEmpty() && !m_applicationId.isEmpty()) { + if (!m_token.isEmpty() && !m_applicationId.isEmpty()) { // TODO: remove the if requestString += "?token="; requestString += m_token; @@ -148,9 +153,10 @@ QString QGeoTileFetcherNokia::getRequestString(const QGeoTileSpec &spec) requestString += m_applicationId; } + requestString += "&ppi=" + QString::number(ppi); + requestString += "&lg="; requestString += getLanguageString(); - return requestString; } diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h index 44f2ad07..06d1bba9 100644 --- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h +++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h @@ -57,7 +57,7 @@ class QGeoTileFetcherNokia : public QGeoTileFetcher public: QGeoTileFetcherNokia(const QVariantMap ¶meters, QGeoNetworkAccessManager *networkManager, - QGeoTiledMappingManagerEngineNokia *engine, const QSize &tileSize); + QGeoTiledMappingManagerEngineNokia *engine, const QSize &tileSize, int ppi); ~QGeoTileFetcherNokia(); QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec); @@ -74,13 +74,14 @@ public Q_SLOTS: private: Q_DISABLE_COPY(QGeoTileFetcherNokia) - QString getRequestString(const QGeoTileSpec &spec); + QString getRequestString(const QGeoTileSpec &spec, int ppi=72); QString getLanguageString() const; QPointer<QGeoTiledMappingManagerEngineNokia> m_engineNokia; QGeoNetworkAccessManager *m_networkManager; - QSize m_tileSize; + int m_tileSize; + int m_ppi; QString m_token; QNetworkReply *m_copyrightsReply; QNetworkReply *m_versionReply; diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.cpp b/src/plugins/geoservices/nokia/qgeouriprovider.cpp index 05ace120..80b47f31 100644 --- a/src/plugins/geoservices/nokia/qgeouriprovider.cpp +++ b/src/plugins/geoservices/nokia/qgeouriprovider.cpp @@ -35,10 +35,6 @@ ****************************************************************************/ #include "qgeouriprovider.h" -#ifdef USE_CHINA_NETWORK_REGISTRATION -#include <QNetworkInfo> -#endif - #include <QMap> #include <QVariant> #include <QSet> @@ -46,14 +42,6 @@ QT_BEGIN_NAMESPACE -namespace -{ - const QString CHINA_MCC = QLatin1String("460"); // China mobile country code - const QString CHINA2_MCC = QLatin1String("461"); // China mobile country code - const QString HONG_KONG_MCC = QLatin1String("454"); // Hong Kong mobile country code - const QString MACAU_MCC = QLatin1String("455"); // Macau mobile country code -} - QGeoUriProvider::QGeoUriProvider( QObject *parent, const QVariantMap ¶meters, @@ -61,17 +49,11 @@ QGeoUriProvider::QGeoUriProvider( const QString &internationalHost, const QString &localizedHost) : QObject(parent) -#ifdef USE_CHINA_NETWORK_REGISTRATION - , m_networkInfo(new QNetworkInfo(this)) -#endif , m_internationalHost(parameters.value(hostParameterName, internationalHost).toString()) , m_localizedHost(localizedHost) , m_firstSubdomain(QChar::Null) , m_maxSubdomains(0) { -#ifdef USE_CHINA_NETWORK_REGISTRATION - QObject::connect(m_networkInfo, SIGNAL(currentMobileCountryCodeChanged(int,QString)), this, SLOT(mobileCountryCodeChanged(int,QString))); -#endif setCurrentHost(isInternationalNetwork() || m_localizedHost.isEmpty() ? m_internationalHost : m_localizedHost); } @@ -109,26 +91,7 @@ void QGeoUriProvider::mobileCountryCodeChanged(int interface, const QString& mcc bool QGeoUriProvider::isInternationalNetwork() const { -#ifndef USE_CHINA_NETWORK_REGISTRATION - return true; -#else - static QSet<QString> codes; - if (codes.empty()) { - codes.insert(CHINA_MCC); - codes.insert(CHINA2_MCC); - } - - QNetworkInfo::NetworkMode mode = m_networkInfo->currentNetworkMode(); - - int interfaces = m_networkInfo->networkInterfaceCount(mode); - for (int i = 0; i < interfaces; ++i) { - QString mcc = m_networkInfo->currentMobileCountryCode(interfaces); - if (codes.contains(mcc)) - return false; - } - return true; -#endif // USE_CHINA_NETWORK_REGISTRATION } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.h b/src/plugins/geoservices/nokia/qgeouriprovider.h index 1bd30b52..e8d93a0f 100644 --- a/src/plugins/geoservices/nokia/qgeouriprovider.h +++ b/src/plugins/geoservices/nokia/qgeouriprovider.h @@ -64,9 +64,6 @@ private: bool isInternationalNetwork() const; void setCurrentHost(const QString &host); -#ifdef USE_CHINA_NETWORK_REGISTRATION - QNetworkInfo *m_networkInfo; -#endif const QString m_internationalHost; const QString m_localizedHost; QString m_currentHost; |