diff options
author | Alex Wilson <alex.wilson@nokia.com> | 2011-12-28 14:32:09 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-28 06:45:06 +0100 |
commit | 183ba0ac8d966f257cad16a7fc95638690bea60e (patch) | |
tree | f8fae7890a0f58ba5a1460d0bc55719e2dfca43d | |
parent | c11b884ee567f6c0bdf57fd8fcecc651a5ca1635 (diff) | |
download | qtlocation-183ba0ac8d966f257cad16a7fc95638690bea60e.tar.gz |
Fixing up a bunch of minor compile warnings
Mostly just using Q_UNUSED in appropriate spots. Also commenting
out some unused constants.
Change-Id: Id43e171bf3a34f7c11e366b14eadb42f08f0096d
Reviewed-by: Alex <alex.blasche@nokia.com>
8 files changed, 27 insertions, 2 deletions
diff --git a/doc/src/snippets/places/requesthandler.h b/doc/src/snippets/places/requesthandler.h index fecac023..e822642a 100644 --- a/doc/src/snippets/places/requesthandler.h +++ b/doc/src/snippets/places/requesthandler.h @@ -57,6 +57,8 @@ public: QGeoServiceProvider *provider = new QGeoServiceProvider("provider name"); QPlaceManager *manager = provider->placeManager(); //! [Initialize Manager] + Q_UNUSED(provider); + Q_UNUSED(manager); } void simpleSearch() @@ -270,6 +272,7 @@ public: //..connect signals..// //! [Content request] + Q_UNUSED(contentReply); } void contentConversion() diff --git a/src/location/maps/qgeomappingmanager.cpp b/src/location/maps/qgeomappingmanager.cpp index 822eb392..fa4bb749 100644 --- a/src/location/maps/qgeomappingmanager.cpp +++ b/src/location/maps/qgeomappingmanager.cpp @@ -190,6 +190,7 @@ void QGeoMappingManager::registerMap(Map *map) void QGeoMappingManager::deregisterMap(Map *map) { + Q_UNUSED(map); // TileCache *cache = map->tileCache(); // QSet<Map*> maps = d_ptr->caches.value(cache); // maps.remove(map); diff --git a/src/location/places/qplacemanagerengine.cpp b/src/location/places/qplacemanagerengine.cpp index 2688e409..5f890cd2 100644 --- a/src/location/places/qplacemanagerengine.cpp +++ b/src/location/places/qplacemanagerengine.cpp @@ -151,6 +151,7 @@ QPlaceManager *QPlaceManagerEngine::manager() const */ QPlace QPlaceManagerEngine::compatiblePlace(const QPlace &original) const { + Q_UNUSED(original); return QPlace(); } diff --git a/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp index 46224496..49e5d842 100644 --- a/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp +++ b/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp @@ -73,7 +73,9 @@ //search const static const char *place_place_element = "place"; static const char *place_id_element = "a_id"; +/* currently unused: static const char *place_is_ad_place_value = "isAdPlace"; +*/ static const char *place_provider = "provider"; static const char *place_provider_url = "providerUrl"; @@ -85,7 +87,9 @@ static const char *place_contact_email_element = "email"; static const char *place_contact_fax_element = "fax"; static const char *place_contact_phone_element = "phone"; static const char *place_contact_website_element = "website"; +/* currently unused: static const char *place_contact_im_element = "im"; +*/ static const char *place_tags_element = "tags"; static const char *place_tags_value_element = "value"; @@ -95,7 +99,9 @@ static const char *place_alternativenames_element = "alternativeNames"; static const char *place_name_default_element = "defaultName"; static const char *place_name_localized_element = "localizedName"; static const char *place_name_value_element = "name"; +/* currently unused: static const char *place_name_language_element = "language"; +*/ static const char *place_ratings_element = "averageRatings"; static const char *place_rating_element = "averageRating"; @@ -149,6 +155,7 @@ static const char *place_adcontent_hours_open_to_element = "openTo"; static const char *place_adcontent_hours_openingnotes_element = "openingnotes"; static const char *place_adcontent_hours_openingnote_element = "openingnote"; static const char *place_adcontent_hours_openingnote_v_element = "_v"; +/* currently unused: static const char *place_adcontent_packages_element = "packages"; static const char *place_adcontent_package_element = "package"; static const char *place_adcontent_package_type_element = "packageType"; @@ -160,6 +167,7 @@ static const char *place_package_type_ad_place = "ADPLACE"; static const char *place_package_type_ad_place_prime_plus = "ADPLACE, PRIME_PLUS"; static const char *place_package_type_ad_place_prime_plus_plus = "ADPLACE, PRIME_PLUS_PLUS"; static const char *place_package_type_place = "PLACE"; +*/ static const char *place_premiumcontent_element = "premiumContent"; static const char *place_premiumcontent_version_element = "version"; diff --git a/src/plugins/geoservices/nokia/places/qplacejsonreviewparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsonreviewparser.cpp index 35528b1e..41079a58 100644 --- a/src/plugins/geoservices/nokia/places/qplacejsonreviewparser.cpp +++ b/src/plugins/geoservices/nokia/places/qplacejsonreviewparser.cpp @@ -71,9 +71,7 @@ static const char *review_count = "totalNumberOfReviews"; static const char *review_id_element = "a_id"; static const char *review_date_element = "creationDate"; static const char *review_description_element = "description"; -static const char *review_minus_element = "minusCount"; static const char *review_originator_element = "originatorUrl"; -static const char *review_plus_element = "plusCount"; static const char *review_rating_element = "rating"; static const char *review_title_element = "title"; static const char *review_username_element = "user"; @@ -82,6 +80,11 @@ static const char *review_vendor_element = "vendor"; static const char *review_vendorname_element = "vendorDisplayName"; static const char *review_vendoricon_element = "vendorIconUrl"; +/* currently unused: +static const char *review_minus_element = "minusCount"; +static const char *review_plus_element = "plusCount"; +*/ + QT_USE_NAMESPACE QPlaceJSonReviewParser::QPlaceJSonReviewParser(QPlaceManager *manager, QObject *parent) : diff --git a/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp index 5d0dc717..4a22c99a 100644 --- a/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp +++ b/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp @@ -72,7 +72,9 @@ static const char *search_results_element = "results"; static const char *search_type_element = "type"; static const char *search_type_dym_value = "DID_YOU_MEAN_SEARCH"; +/* currently unused: static const char *search_type_addplace_value = "ADPLACE"; +*/ static const char *search_categories_element = "categories"; static const char *search_categories_id_value = "id"; diff --git a/tests/auto/qgeoboundingbox/tst_qgeoboundingbox.cpp b/tests/auto/qgeoboundingbox/tst_qgeoboundingbox.cpp index 4567a6f2..b7871451 100644 --- a/tests/auto/qgeoboundingbox/tst_qgeoboundingbox.cpp +++ b/tests/auto/qgeoboundingbox/tst_qgeoboundingbox.cpp @@ -1054,9 +1054,11 @@ void tst_QGeoBoundingBox::containsCoord_data() double latT3 = 90.0; double latTI3 = 80.0; double latC3 = 70.0; + /* current unused: double latBI3 = 60.0; double latB3 = 50.0; double latBO3 = 40.0; + */ QTest::newRow("north pole - in center") << b3 << QGeoCoordinate(latC3, lonC3) << true; @@ -1099,9 +1101,11 @@ void tst_QGeoBoundingBox::containsCoord_data() double lonR4 = 70.0; double lonRO4 = 80.0; + /* currently unused: double latTO4 = -40.0; double latT4 = -50.0; double latTI4 = -60.0; + */ double latC4 = -70.0; double latBI4 = -80.0; double latB4 = -90.0; diff --git a/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerengine_test.h b/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerengine_test.h index 9128cebe..e99f3f53 100644 --- a/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerengine_test.h +++ b/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerengine_test.h @@ -74,11 +74,14 @@ public: QGeoRouteReply* calculateRoute(const QGeoRouteRequest& request) { + Q_UNUSED(request); return new QGeoRouteReply(QGeoRouteReply::NoError,"no error"); } QGeoRouteReply* updateRoute(const QGeoRoute &route, const QGeoCoordinate &position) { + Q_UNUSED(route); + Q_UNUSED(position); return new QGeoRouteReply(QGeoRouteReply::CommunicationError,"no error"); } |