diff options
62 files changed, 83 insertions, 83 deletions
diff --git a/src/location/maps/qgeocodereply.h b/src/location/maps/qgeocodereply.h index 16882b2d..863e604d 100644 --- a/src/location/maps/qgeocodereply.h +++ b/src/location/maps/qgeocodereply.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QGeocodeReplyPrivate; -class Q_LOCATION_EXPORT_TEMP QGeocodeReply : public QObject +class Q_LOCATION_EXPORT QGeocodeReply : public QObject { Q_OBJECT diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h index f1363658..e5f187cb 100644 --- a/src/location/maps/qgeocodingmanager.h +++ b/src/location/maps/qgeocodingmanager.h @@ -60,7 +60,7 @@ class QLocale; class QGeocodingManagerEngine; class QGeocodingManagerPrivate; -class Q_LOCATION_EXPORT_TEMP QGeocodingManager : public QObject +class Q_LOCATION_EXPORT QGeocodingManager : public QObject { Q_OBJECT public: diff --git a/src/location/maps/qgeocodingmanagerengine.h b/src/location/maps/qgeocodingmanagerengine.h index db702509..a69ca397 100644 --- a/src/location/maps/qgeocodingmanagerengine.h +++ b/src/location/maps/qgeocodingmanagerengine.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class QGeocodingManagerEnginePrivate; -class Q_LOCATION_EXPORT_TEMP QGeocodingManagerEngine : public QObject +class Q_LOCATION_EXPORT QGeocodingManagerEngine : public QObject { Q_OBJECT public: diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h index 4ed7130c..e4fbf142 100644 --- a/src/location/maps/qgeomaneuver.h +++ b/src/location/maps/qgeomaneuver.h @@ -56,7 +56,7 @@ class QString; class QGeoCoordinate; class QGeoManeuverPrivate; -class Q_LOCATION_EXPORT_TEMP QGeoManeuver +class Q_LOCATION_EXPORT QGeoManeuver { public: diff --git a/src/location/maps/qgeomappingmanager.h b/src/location/maps/qgeomappingmanager.h index 33d42426..8cadbab3 100644 --- a/src/location/maps/qgeomappingmanager.h +++ b/src/location/maps/qgeomappingmanager.h @@ -65,7 +65,7 @@ class QGeoMappingManagerEngine; class QGeoTiledMapReply; class TileSpec; -class Q_LOCATION_EXPORT_TEMP QGeoMappingManager : public QObject +class Q_LOCATION_EXPORT QGeoMappingManager : public QObject { Q_OBJECT diff --git a/src/location/maps/qgeomappingmanagerengine.h b/src/location/maps/qgeomappingmanagerengine.h index d9df0017..a735a1b1 100644 --- a/src/location/maps/qgeomappingmanagerengine.h +++ b/src/location/maps/qgeomappingmanagerengine.h @@ -66,7 +66,7 @@ class QGeoMappingManagerEnginePrivate; class QGeoTiledMapReply; class TileSpec; -class Q_LOCATION_EXPORT_TEMP QGeoMappingManagerEngine : public QObject +class Q_LOCATION_EXPORT QGeoMappingManagerEngine : public QObject { Q_OBJECT diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h index 3b007414..d3ad5354 100644 --- a/src/location/maps/qgeoroute.h +++ b/src/location/maps/qgeoroute.h @@ -60,7 +60,7 @@ class QGeoRouteSegment; class QGeoRoutePrivate; -class Q_LOCATION_EXPORT_TEMP QGeoRoute +class Q_LOCATION_EXPORT QGeoRoute { public: QGeoRoute(); diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h index 2e6cf776..4d56f31a 100644 --- a/src/location/maps/qgeoroutereply.h +++ b/src/location/maps/qgeoroutereply.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE class QGeoRouteRequest; class QGeoRouteReplyPrivate; -class Q_LOCATION_EXPORT_TEMP QGeoRouteReply : public QObject +class Q_LOCATION_EXPORT QGeoRouteReply : public QObject { Q_OBJECT public: diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h index 11dec53e..36cc5e7e 100644 --- a/src/location/maps/qgeorouterequest.h +++ b/src/location/maps/qgeorouterequest.h @@ -58,7 +58,7 @@ class QGeoCoordinate; class QGeoBoundingBox; class QGeoRouteRequestPrivate; -class Q_LOCATION_EXPORT_TEMP QGeoRouteRequest +class Q_LOCATION_EXPORT QGeoRouteRequest { public: enum TravelMode { diff --git a/src/location/maps/qgeoroutesegment.h b/src/location/maps/qgeoroutesegment.h index 06c83d2a..afee2c06 100644 --- a/src/location/maps/qgeoroutesegment.h +++ b/src/location/maps/qgeoroutesegment.h @@ -56,7 +56,7 @@ class QGeoCoordinate; class QGeoManeuver; class QGeoRouteSegmentPrivate; -class Q_LOCATION_EXPORT_TEMP QGeoRouteSegment +class Q_LOCATION_EXPORT QGeoRouteSegment { public: diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h index a5ee37b7..7ecf1c80 100644 --- a/src/location/maps/qgeoroutingmanager.h +++ b/src/location/maps/qgeoroutingmanager.h @@ -59,7 +59,7 @@ class QLocale; class QGeoRoutingManagerEngine; class QGeoRoutingManagerPrivate; -class Q_LOCATION_EXPORT_TEMP QGeoRoutingManager : public QObject +class Q_LOCATION_EXPORT QGeoRoutingManager : public QObject { Q_OBJECT public: diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h index 2f0af847..126f7a61 100644 --- a/src/location/maps/qgeoroutingmanagerengine.h +++ b/src/location/maps/qgeoroutingmanagerengine.h @@ -58,7 +58,7 @@ class QLocale; class QGeoRoutingManagerEnginePrivate; -class Q_LOCATION_EXPORT_TEMP QGeoRoutingManagerEngine : public QObject +class Q_LOCATION_EXPORT QGeoRoutingManagerEngine : public QObject { Q_OBJECT public: diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h index 12f7bc22..73e3ba5b 100644 --- a/src/location/maps/qgeoserviceprovider.h +++ b/src/location/maps/qgeoserviceprovider.h @@ -65,7 +65,7 @@ class QGeoRoutingManagerEngine; class QPlaceManagerEngine; class QGeoServiceProviderPrivate; -class Q_LOCATION_EXPORT_TEMP QGeoServiceProvider +class Q_LOCATION_EXPORT QGeoServiceProvider { public: enum Error { diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h index 6f909b2a..4b26b950 100644 --- a/src/location/maps/qgeoserviceproviderfactory.h +++ b/src/location/maps/qgeoserviceproviderfactory.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -class Q_LOCATION_EXPORT_TEMP QGeoServiceProviderFactory +class Q_LOCATION_EXPORT QGeoServiceProviderFactory { public: virtual ~QGeoServiceProviderFactory() {} diff --git a/src/location/maps/qgeotiledmapreply.h b/src/location/maps/qgeotiledmapreply.h index 2aa8d808..e7cfb628 100644 --- a/src/location/maps/qgeotiledmapreply.h +++ b/src/location/maps/qgeotiledmapreply.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class TileSpec; class QGeoTiledMapReplyPrivate; -class Q_LOCATION_EXPORT_TEMP QGeoTiledMapReply : public QObject +class Q_LOCATION_EXPORT QGeoTiledMapReply : public QObject { Q_OBJECT diff --git a/src/location/mapsgl/cameradata.h b/src/location/mapsgl/cameradata.h index a5beb2a0..afaa92eb 100644 --- a/src/location/mapsgl/cameradata.h +++ b/src/location/mapsgl/cameradata.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class Projection; class CameraDataPrivate; -class Q_LOCATION_EXPORT_TEMP CameraData +class Q_LOCATION_EXPORT CameraData { public: CameraData(); diff --git a/src/location/mapsgl/map.h b/src/location/mapsgl/map.h index 1e809e2f..1088ccaf 100644 --- a/src/location/mapsgl/map.h +++ b/src/location/mapsgl/map.h @@ -64,7 +64,7 @@ class QGLPainter; class QPointF; -class Q_LOCATION_EXPORT_TEMP Map : public QObject +class Q_LOCATION_EXPORT Map : public QObject { Q_OBJECT diff --git a/src/location/mapsgl/map3d/spheregeometry_p.h b/src/location/mapsgl/map3d/spheregeometry_p.h index e62db082..b7043a9e 100644 --- a/src/location/mapsgl/map3d/spheregeometry_p.h +++ b/src/location/mapsgl/map3d/spheregeometry_p.h @@ -60,7 +60,7 @@ class QGeoCoordinate; class QVector2D; class QVector3D; -class Q_LOCATION_EXPORT_TEMP SphereGeometry +class Q_LOCATION_EXPORT SphereGeometry { public: SphereGeometry(); diff --git a/src/location/mapsgl/map3d/viewport_p.h b/src/location/mapsgl/map3d/viewport_p.h index ea40f129..f936ce28 100644 --- a/src/location/mapsgl/map3d/viewport_p.h +++ b/src/location/mapsgl/map3d/viewport_p.h @@ -74,7 +74,7 @@ class Arc; class Projection3D; -class Q_LOCATION_EXPORT_TEMP Viewport +class Q_LOCATION_EXPORT Viewport { public: Viewport(); diff --git a/src/location/mapsgl/mapitem.h b/src/location/mapsgl/mapitem.h index 7e8a5801..f94683e6 100644 --- a/src/location/mapsgl/mapitem.h +++ b/src/location/mapsgl/mapitem.h @@ -66,7 +66,7 @@ struct MapItemGLResources { }; -class Q_LOCATION_EXPORT_TEMP MapItem +class Q_LOCATION_EXPORT MapItem { public: MapItem(); @@ -114,7 +114,7 @@ private: MapItemGLResources* glResources_; }; -class Q_LOCATION_EXPORT_TEMP MapItemTree +class Q_LOCATION_EXPORT MapItemTree { public: MapItemTree(); diff --git a/src/location/mapsgl/mapsphere_p.h b/src/location/mapsgl/mapsphere_p.h index 0583b3c3..a621daf9 100644 --- a/src/location/mapsgl/mapsphere_p.h +++ b/src/location/mapsgl/mapsphere_p.h @@ -73,7 +73,7 @@ class MapPrivate; class QGeoMappingManager; -class Q_LOCATION_EXPORT_TEMP MapSphere : public QObject +class Q_LOCATION_EXPORT MapSphere : public QObject { Q_OBJECT public: diff --git a/src/location/mapsgl/tile.h b/src/location/mapsgl/tile.h index 6aac51bf..96879e23 100644 --- a/src/location/mapsgl/tile.h +++ b/src/location/mapsgl/tile.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QGLTexture2D; class QGLSceneNode; -class Q_LOCATION_EXPORT_TEMP Tile +class Q_LOCATION_EXPORT Tile { public: Tile(); diff --git a/src/location/mapsgl/tilecache.h b/src/location/mapsgl/tilecache.h index 94b55a88..e6fbe80e 100644 --- a/src/location/mapsgl/tilecache.h +++ b/src/location/mapsgl/tilecache.h @@ -67,7 +67,7 @@ class QGLSceneNode; class QPixmap; class QThread; -class Q_LOCATION_EXPORT_TEMP TileCache : public QObject +class Q_LOCATION_EXPORT TileCache : public QObject { Q_OBJECT public: diff --git a/src/location/mapsgl/tilecamera.h b/src/location/mapsgl/tilecamera.h index 78c60d0d..4c40743f 100644 --- a/src/location/mapsgl/tilecamera.h +++ b/src/location/mapsgl/tilecamera.h @@ -55,7 +55,7 @@ class QGLCamera; class QGLSceneNode; class QVector3D; -class Q_LOCATION_EXPORT_TEMP TileCamera +class Q_LOCATION_EXPORT TileCamera { public: TileCamera(); diff --git a/src/location/mapsgl/tilespec.h b/src/location/mapsgl/tilespec.h index 8b105105..6d70ddca 100644 --- a/src/location/mapsgl/tilespec.h +++ b/src/location/mapsgl/tilespec.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE -class Q_LOCATION_EXPORT_TEMP TileSpec +class Q_LOCATION_EXPORT TileSpec { public: TileSpec(); diff --git a/src/location/places/qplaceattribute.h b/src/location/places/qplaceattribute.h index d5edc6e2..aaabff63 100644 --- a/src/location/places/qplaceattribute.h +++ b/src/location/places/qplaceattribute.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class QPlaceAttributePrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceAttribute +class Q_LOCATION_EXPORT QPlaceAttribute { public: QPlaceAttribute(); diff --git a/src/location/places/qplacecategory.h b/src/location/places/qplacecategory.h index 5570841d..51e262c2 100644 --- a/src/location/places/qplacecategory.h +++ b/src/location/places/qplacecategory.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE class QPlaceIcon; class QPlaceCategoryPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceCategory +class Q_LOCATION_EXPORT QPlaceCategory { public: QPlaceCategory(); diff --git a/src/location/places/qplacecontent.h b/src/location/places/qplacecontent.h index 16a20200..d67db3ff 100644 --- a/src/location/places/qplacecontent.h +++ b/src/location/places/qplacecontent.h @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE class QPlaceUser; class QPlaceSupplier; class QPlaceContentPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceContent +class Q_LOCATION_EXPORT QPlaceContent { public: typedef QMap<int, QPlaceContent> Collection; diff --git a/src/location/places/qplacecontentreply.h b/src/location/places/qplacecontentreply.h index 8b9a9ead..dd25f476 100644 --- a/src/location/places/qplacecontentreply.h +++ b/src/location/places/qplacecontentreply.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QPlaceContentReplyPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceContentReply : public QPlaceReply +class Q_LOCATION_EXPORT QPlaceContentReply : public QPlaceReply { Q_OBJECT public: diff --git a/src/location/places/qplacecontentrequest.h b/src/location/places/qplacecontentrequest.h index a9b47ddc..a4333ee6 100644 --- a/src/location/places/qplacecontentrequest.h +++ b/src/location/places/qplacecontentrequest.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE class QPlaceContentRequestPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceContentRequest : public QPlaceRequest +class Q_LOCATION_EXPORT QPlaceContentRequest : public QPlaceRequest { public: QPlaceContentRequest(); diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h index bcba66fb..ef404aec 100644 --- a/src/location/places/qplacedetailsreply.h +++ b/src/location/places/qplacedetailsreply.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QPlaceDetailsReplyPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceDetailsReply : public QPlaceReply +class Q_LOCATION_EXPORT QPlaceDetailsReply : public QPlaceReply { Q_OBJECT public: diff --git a/src/location/places/qplaceeditorial.h b/src/location/places/qplaceeditorial.h index 6bacc42d..ee9591b7 100644 --- a/src/location/places/qplaceeditorial.h +++ b/src/location/places/qplaceeditorial.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QPlaceEditorialPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceEditorial : public QPlaceContent +class Q_LOCATION_EXPORT QPlaceEditorial : public QPlaceContent { public: QPlaceEditorial(); diff --git a/src/location/places/qplaceicon.h b/src/location/places/qplaceicon.h index e7e9e0a7..03ad8e85 100644 --- a/src/location/places/qplaceicon.h +++ b/src/location/places/qplaceicon.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QPlaceManager; class QPlaceIconPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceIcon +class Q_LOCATION_EXPORT QPlaceIcon { public: Q_ENUMS(QPlaceIcon::IconType) diff --git a/src/location/places/qplaceidreply.h b/src/location/places/qplaceidreply.h index f879ce7b..0b90a613 100644 --- a/src/location/places/qplaceidreply.h +++ b/src/location/places/qplaceidreply.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QPlaceIdReplyPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceIdReply : public QPlaceReply +class Q_LOCATION_EXPORT QPlaceIdReply : public QPlaceReply { Q_OBJECT public: diff --git a/src/location/places/qplaceimage.h b/src/location/places/qplaceimage.h index eea76dfd..f2a41509 100644 --- a/src/location/places/qplaceimage.h +++ b/src/location/places/qplaceimage.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE class QPlaceImagePrivate; class QUrl; -class Q_LOCATION_EXPORT_TEMP QPlaceImage : public QPlaceContent +class Q_LOCATION_EXPORT QPlaceImage : public QPlaceContent { public: QPlaceImage(); diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h index 9e0089f5..c02efb5d 100644 --- a/src/location/places/qplacemanager.h +++ b/src/location/places/qplacemanager.h @@ -67,7 +67,7 @@ class QPlaceManagerEngine; class QPlaceSearchRequest; class QPlaceSearchReply; -class Q_LOCATION_EXPORT_TEMP QPlaceManager : public QObject +class Q_LOCATION_EXPORT QPlaceManager : public QObject { Q_OBJECT public: diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h index 33461456..02692c73 100644 --- a/src/location/places/qplacemanagerengine.h +++ b/src/location/places/qplacemanagerengine.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QPlaceManagerEnginePrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceManagerEngine : public QObject +class Q_LOCATION_EXPORT QPlaceManagerEngine : public QObject { Q_OBJECT public: diff --git a/src/location/places/qplacerating.h b/src/location/places/qplacerating.h index 4cfcb25d..d8f6707a 100644 --- a/src/location/places/qplacerating.h +++ b/src/location/places/qplacerating.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QPlaceRatingPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceRating +class Q_LOCATION_EXPORT QPlaceRating { public: QPlaceRating(); diff --git a/src/location/places/qplacereply.h b/src/location/places/qplacereply.h index c4a93323..429ebc14 100644 --- a/src/location/places/qplacereply.h +++ b/src/location/places/qplacereply.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QPlaceReplyPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceReply : public QObject +class Q_LOCATION_EXPORT QPlaceReply : public QObject { Q_OBJECT public: diff --git a/src/location/places/qplacerequest.h b/src/location/places/qplacerequest.h index 0111089d..4fd531ff 100644 --- a/src/location/places/qplacerequest.h +++ b/src/location/places/qplacerequest.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QPlaceRequestPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceRequest +class Q_LOCATION_EXPORT QPlaceRequest { public: enum Type { diff --git a/src/location/places/qplacereview.h b/src/location/places/qplacereview.h index 51ca7f31..f97d035f 100644 --- a/src/location/places/qplacereview.h +++ b/src/location/places/qplacereview.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QDateTime; class QPlaceReviewPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceReview : public QPlaceContent +class Q_LOCATION_EXPORT QPlaceReview : public QPlaceContent { public: QPlaceReview(); diff --git a/src/location/places/qplacesearchreply.h b/src/location/places/qplacesearchreply.h index 3f5dfe22..3d1706ad 100644 --- a/src/location/places/qplacesearchreply.h +++ b/src/location/places/qplacesearchreply.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QPlaceSearchReplyPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceSearchReply : public QPlaceReply +class Q_LOCATION_EXPORT QPlaceSearchReply : public QPlaceReply { Q_OBJECT public: diff --git a/src/location/places/qplacesearchrequest.h b/src/location/places/qplacesearchrequest.h index 940eae4f..de5bf189 100644 --- a/src/location/places/qplacesearchrequest.h +++ b/src/location/places/qplacesearchrequest.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class QGeoBoundingArea; class QPlaceSearchRequestPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceSearchRequest : public QPlaceRequest +class Q_LOCATION_EXPORT QPlaceSearchRequest : public QPlaceRequest { public: enum RelevanceHint { diff --git a/src/location/places/qplacesearchresult.h b/src/location/places/qplacesearchresult.h index 8c5f07b2..f88bcebf 100644 --- a/src/location/places/qplacesearchresult.h +++ b/src/location/places/qplacesearchresult.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QPlaceSearchResultPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceSearchResult +class Q_LOCATION_EXPORT QPlaceSearchResult { public: QPlaceSearchResult(); diff --git a/src/location/places/qplacesupplier.h b/src/location/places/qplacesupplier.h index c0f5b583..d95cf871 100644 --- a/src/location/places/qplacesupplier.h +++ b/src/location/places/qplacesupplier.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QUrl; class QPlaceSupplierPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceSupplier +class Q_LOCATION_EXPORT QPlaceSupplier { public: QPlaceSupplier(); diff --git a/src/location/places/qplacetextpredictionreply.h b/src/location/places/qplacetextpredictionreply.h index 71c1e7ea..88338e56 100644 --- a/src/location/places/qplacetextpredictionreply.h +++ b/src/location/places/qplacetextpredictionreply.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QPlaceTextPredictionReplyPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceTextPredictionReply : public QPlaceReply +class Q_LOCATION_EXPORT QPlaceTextPredictionReply : public QPlaceReply { Q_OBJECT public: diff --git a/src/location/places/qplaceuser.h b/src/location/places/qplaceuser.h index 2bc4247a..03d6e216 100644 --- a/src/location/places/qplaceuser.h +++ b/src/location/places/qplaceuser.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QPlaceUserPrivate; -class Q_LOCATION_EXPORT_TEMP QPlaceUser +class Q_LOCATION_EXPORT QPlaceUser { public: QPlaceUser(); diff --git a/src/location/qgeoaddress.h b/src/location/qgeoaddress.h index 7aaa53a3..8cdcbdbe 100644 --- a/src/location/qgeoaddress.h +++ b/src/location/qgeoaddress.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QString; class QGeoAddressPrivate; -class Q_LOCATION_EXPORT_TEMP QGeoAddress +class Q_LOCATION_EXPORT QGeoAddress { public: QGeoAddress(); diff --git a/src/location/qgeoareamonitor.h b/src/location/qgeoareamonitor.h index e5c88f62..3f1fce24 100644 --- a/src/location/qgeoareamonitor.h +++ b/src/location/qgeoareamonitor.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QGeoPositionInfo; class QGeoAreaMonitorPrivate; -class Q_LOCATION_EXPORT_TEMP QGeoAreaMonitor : public QObject +class Q_LOCATION_EXPORT QGeoAreaMonitor : public QObject { Q_OBJECT Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter) diff --git a/src/location/qgeoboundingarea.h b/src/location/qgeoboundingarea.h index ef116e1e..ba65198d 100644 --- a/src/location/qgeoboundingarea.h +++ b/src/location/qgeoboundingarea.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -class Q_LOCATION_EXPORT_TEMP QGeoBoundingArea +class Q_LOCATION_EXPORT QGeoBoundingArea { public: enum AreaType { diff --git a/src/location/qgeoboundingbox.h b/src/location/qgeoboundingbox.h index 4f150803..1df07156 100644 --- a/src/location/qgeoboundingbox.h +++ b/src/location/qgeoboundingbox.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingBoxPrivate; -class Q_LOCATION_EXPORT_TEMP QGeoBoundingBox : public QGeoBoundingArea +class Q_LOCATION_EXPORT QGeoBoundingBox : public QGeoBoundingArea { public: QGeoBoundingBox(); diff --git a/src/location/qgeoboundingcircle.h b/src/location/qgeoboundingcircle.h index 28bd7c7f..3ca2b2ad 100644 --- a/src/location/qgeoboundingcircle.h +++ b/src/location/qgeoboundingcircle.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingCirclePrivate; -class Q_LOCATION_EXPORT_TEMP QGeoBoundingCircle : public QGeoBoundingArea +class Q_LOCATION_EXPORT QGeoBoundingCircle : public QGeoBoundingArea { public: QGeoBoundingCircle(); diff --git a/src/location/qgeocoordinate.h b/src/location/qgeocoordinate.h index 10827f74..f628b8bf 100644 --- a/src/location/qgeocoordinate.h +++ b/src/location/qgeocoordinate.h @@ -55,7 +55,7 @@ class QDebug; class QDataStream; class QGeoCoordinatePrivate; -class Q_LOCATION_EXPORT_TEMP QGeoCoordinate +class Q_LOCATION_EXPORT QGeoCoordinate { public: enum CoordinateType { @@ -112,12 +112,12 @@ private: }; #ifndef QT_NO_DEBUG_STREAM -Q_LOCATION_EXPORT_TEMP QDebug operator<<(QDebug, const QGeoCoordinate &); +Q_LOCATION_EXPORT QDebug operator<<(QDebug, const QGeoCoordinate &); #endif #ifndef QT_NO_DATASTREAM -Q_LOCATION_EXPORT_TEMP QDataStream &operator<<(QDataStream &stream, const QGeoCoordinate &coordinate); -Q_LOCATION_EXPORT_TEMP QDataStream &operator>>(QDataStream &stream, QGeoCoordinate &coordinate); +Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoCoordinate &coordinate); +Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoCoordinate &coordinate); #endif QT_END_NAMESPACE diff --git a/src/location/qgeolocation.h b/src/location/qgeolocation.h index a3f6d83a..8f1f5bee 100644 --- a/src/location/qgeolocation.h +++ b/src/location/qgeolocation.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE class QGeoLocationPrivate; -class Q_LOCATION_EXPORT_TEMP QGeoLocation +class Q_LOCATION_EXPORT QGeoLocation { public: QGeoLocation(); diff --git a/src/location/qgeopositioninfo.h b/src/location/qgeopositioninfo.h index 215af062..56ddc9b1 100644 --- a/src/location/qgeopositioninfo.h +++ b/src/location/qgeopositioninfo.h @@ -55,7 +55,7 @@ class QDebug; class QDataStream; class QGeoPositionInfoPrivate; -class Q_LOCATION_EXPORT_TEMP QGeoPositionInfo +class Q_LOCATION_EXPORT QGeoPositionInfo { public: enum Attribute { @@ -94,22 +94,22 @@ public: private: #ifndef QT_NO_DEBUG_STREAM - friend Q_LOCATION_EXPORT_TEMP QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info); + friend Q_LOCATION_EXPORT QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info); #endif #ifndef QT_NO_DATASTREAM - friend Q_LOCATION_EXPORT_TEMP QDataStream &operator<<(QDataStream &stream, const QGeoPositionInfo &info); - friend Q_LOCATION_EXPORT_TEMP QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info); + friend Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoPositionInfo &info); + friend Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info); #endif QGeoPositionInfoPrivate *d; }; #ifndef QT_NO_DEBUG_STREAM -Q_LOCATION_EXPORT_TEMP QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info); +Q_LOCATION_EXPORT QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info); #endif #ifndef QT_NO_DATASTREAM -Q_LOCATION_EXPORT_TEMP QDataStream &operator<<(QDataStream &stream, const QGeoPositionInfo &info); -Q_LOCATION_EXPORT_TEMP QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info); +Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoPositionInfo &info); +Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info); #endif QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfosource.h b/src/location/qgeopositioninfosource.h index 60d72454..d3771ce2 100644 --- a/src/location/qgeopositioninfosource.h +++ b/src/location/qgeopositioninfosource.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QGeoPositionInfoSourcePrivate; -class Q_LOCATION_EXPORT_TEMP QGeoPositionInfoSource : public QObject +class Q_LOCATION_EXPORT QGeoPositionInfoSource : public QObject { Q_OBJECT Q_PROPERTY(int updateInterval READ updateInterval WRITE setUpdateInterval) diff --git a/src/location/qgeopositioninfosourcefactory.h b/src/location/qgeopositioninfosourcefactory.h index f7c71e78..15839f9a 100644 --- a/src/location/qgeopositioninfosourcefactory.h +++ b/src/location/qgeopositioninfosourcefactory.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -class Q_LOCATION_EXPORT_TEMP QGeoPositionInfoSourceFactory +class Q_LOCATION_EXPORT QGeoPositionInfoSourceFactory { public: virtual ~QGeoPositionInfoSourceFactory(); diff --git a/src/location/qgeosatelliteinfo.h b/src/location/qgeosatelliteinfo.h index 9bf18168..f11e48c0 100644 --- a/src/location/qgeosatelliteinfo.h +++ b/src/location/qgeosatelliteinfo.h @@ -53,7 +53,7 @@ class QDebug; class QDataStream; class QGeoSatelliteInfoPrivate; -class Q_LOCATION_EXPORT_TEMP QGeoSatelliteInfo +class Q_LOCATION_EXPORT QGeoSatelliteInfo { public: enum Attribute { @@ -86,22 +86,22 @@ public: private: #ifndef QT_NO_DEBUG_STREAM - friend Q_LOCATION_EXPORT_TEMP QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info); + friend Q_LOCATION_EXPORT QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info); #endif #ifndef QT_NO_DATASTREAM - friend Q_LOCATION_EXPORT_TEMP QDataStream &operator<<(QDataStream &stream, const QGeoSatelliteInfo &info); - friend Q_LOCATION_EXPORT_TEMP QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info); + friend Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoSatelliteInfo &info); + friend Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info); #endif QGeoSatelliteInfoPrivate *d; }; #ifndef QT_NO_DEBUG_STREAM -Q_LOCATION_EXPORT_TEMP QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info); +Q_LOCATION_EXPORT QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info); #endif #ifndef QT_NO_DATASTREAM -Q_LOCATION_EXPORT_TEMP QDataStream &operator<<(QDataStream &stream, const QGeoSatelliteInfo &info); -Q_LOCATION_EXPORT_TEMP QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info); +Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoSatelliteInfo &info); +Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info); #endif QT_END_NAMESPACE diff --git a/src/location/qgeosatelliteinfosource.h b/src/location/qgeosatelliteinfosource.h index fe6dbb64..4206888d 100644 --- a/src/location/qgeosatelliteinfosource.h +++ b/src/location/qgeosatelliteinfosource.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QGeoSatelliteInfoSourcePrivate; -class Q_LOCATION_EXPORT_TEMP QGeoSatelliteInfoSource : public QObject +class Q_LOCATION_EXPORT QGeoSatelliteInfoSource : public QObject { Q_OBJECT public: diff --git a/src/location/qlocationglobal.h b/src/location/qlocationglobal.h index 75bef671..feae8c83 100644 --- a/src/location/qlocationglobal.h +++ b/src/location/qlocationglobal.h @@ -52,20 +52,20 @@ # undef QT_DLL # endif # if defined(QT_BUILD_LOCATION_LIB) -# define Q_LOCATION_EXPORT_TEMP Q_DECL_EXPORT +# define Q_LOCATION_EXPORT Q_DECL_EXPORT # else -# define Q_LOCATION_EXPORT_TEMP Q_DECL_IMPORT +# define Q_LOCATION_EXPORT Q_DECL_IMPORT # endif # elif defined(QT_DLL) -# define Q_LOCATION_EXPORT_TEMP Q_DECL_EXPORT +# define Q_LOCATION_EXPORT Q_DECL_EXPORT # endif #endif -#if !defined(Q_LOCATION_EXPORT_TEMP) +#if !defined(Q_LOCATION_EXPORT) # if defined(QT_SHARED) -# define Q_LOCATION_EXPORT_TEMP Q_DECL_EXPORT +# define Q_LOCATION_EXPORT Q_DECL_EXPORT # else -# define Q_LOCATION_EXPORT_TEMP +# define Q_LOCATION_EXPORT # endif #endif diff --git a/src/location/qnmeapositioninfosource.h b/src/location/qnmeapositioninfosource.h index d6912f66..de30c97c 100644 --- a/src/location/qnmeapositioninfosource.h +++ b/src/location/qnmeapositioninfosource.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QIODevice; class QNmeaPositionInfoSourcePrivate; -class Q_LOCATION_EXPORT_TEMP QNmeaPositionInfoSource : public QGeoPositionInfoSource +class Q_LOCATION_EXPORT QNmeaPositionInfoSource : public QGeoPositionInfoSource { Q_OBJECT public: diff --git a/src/location/qplace.h b/src/location/qplace.h index e4cb8059..9b785f86 100644 --- a/src/location/qplace.h +++ b/src/location/qplace.h @@ -65,7 +65,7 @@ class QString; class QPlaceIcon; class QPlacePrivate; -class Q_LOCATION_EXPORT_TEMP QPlace +class Q_LOCATION_EXPORT QPlace { public: typedef QMap<QString, QPlaceAttribute> ExtendedAttributes; |