From d50b412bb54644470d7f7f61c6797ba394716890 Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Wed, 8 Feb 2017 19:08:29 +0100 Subject: Remove moc_* inclusions from source files Change-Id: I7385348d7b6ec22fa92ed1be65f89e262c38b5c0 Reviewed-by: Michal Klocek Reviewed-by: Alex Blasche --- src/imports/positioning/qdeclarativeposition.cpp | 2 -- src/imports/positioning/qdeclarativepositionsource.cpp | 2 -- src/location/declarativemaps/qdeclarativegeocodemodel.cpp | 2 -- src/location/declarativemaps/qdeclarativegeomaneuver.cpp | 2 -- src/location/declarativemaps/qdeclarativegeomap.cpp | 2 -- src/location/declarativemaps/qdeclarativegeomapitembase.cpp | 2 -- src/location/declarativemaps/qdeclarativegeomapitemgroup.cpp | 2 -- src/location/declarativemaps/qdeclarativegeomapitemview.cpp | 2 -- src/location/declarativemaps/qdeclarativegeomapquickitem.cpp | 2 -- src/location/declarativemaps/qdeclarativegeomaptype.cpp | 2 -- src/location/declarativemaps/qdeclarativegeoroute.cpp | 2 -- src/location/declarativemaps/qdeclarativegeoroutemodel.cpp | 2 -- src/location/declarativemaps/qdeclarativegeoroutesegment.cpp | 2 -- src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp | 2 -- src/location/declarativemaps/qquickgeomapgesturearea.cpp | 2 -- src/location/maps/qgeocodereply.cpp | 3 --- src/location/maps/qgeocodingmanager.cpp | 2 -- src/location/maps/qgeocodingmanagerengine.cpp | 2 -- src/location/maps/qgeomappingmanager.cpp | 2 -- src/location/maps/qgeomappingmanagerengine.cpp | 2 -- src/location/maps/qgeoroutereply.cpp | 2 -- src/location/maps/qgeorouterequest.h | 2 +- src/location/maps/qgeoroutingmanager.cpp | 2 -- src/location/maps/qgeoroutingmanagerengine.cpp | 2 -- src/location/maps/qgeotiledmappingmanagerengine.cpp | 2 -- src/location/maps/qgeotiledmapreply.cpp | 2 -- src/location/places/qplacemanagerengine.cpp | 2 -- src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp | 1 - src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp | 2 -- src/plugins/position/simulator/qgeosatelliteinfosource_simulator.cpp | 1 - src/plugins/position/simulator/qlocationconnection_simulator.cpp | 2 -- src/positioning/qdeclarativegeoaddress.cpp | 2 -- src/positioning/qgeopositioninfosource.cpp | 2 -- src/positioning/qgeosatelliteinfosource.cpp | 2 -- src/positioning/qnmeapositioninfosource.cpp | 3 --- 35 files changed, 1 insertion(+), 69 deletions(-) diff --git a/src/imports/positioning/qdeclarativeposition.cpp b/src/imports/positioning/qdeclarativeposition.cpp index 50313deb..b543700b 100644 --- a/src/imports/positioning/qdeclarativeposition.cpp +++ b/src/imports/positioning/qdeclarativeposition.cpp @@ -466,6 +466,4 @@ double QDeclarativePosition::magneticVariation() const return m_info.attribute(QGeoPositionInfo::MagneticVariation); } -#include "moc_qdeclarativeposition_p.cpp" - QT_END_NAMESPACE diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp index 8be953f7..8c90e312 100644 --- a/src/imports/positioning/qdeclarativepositionsource.cpp +++ b/src/imports/positioning/qdeclarativepositionsource.cpp @@ -760,6 +760,4 @@ void QDeclarativePositionSource::sourceErrorReceived(const QGeoPositionInfoSourc emit sourceErrorChanged(); } -#include "moc_qdeclarativepositionsource_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativegeocodemodel.cpp b/src/location/declarativemaps/qdeclarativegeocodemodel.cpp index e92949ee..f7422ec2 100644 --- a/src/location/declarativemaps/qdeclarativegeocodemodel.cpp +++ b/src/location/declarativemaps/qdeclarativegeocodemodel.cpp @@ -722,6 +722,4 @@ void QDeclarativeGeocodeModel::setAutoUpdate(bool update) emit autoUpdateChanged(); } -#include "moc_qdeclarativegeocodemodel_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativegeomaneuver.cpp b/src/location/declarativemaps/qdeclarativegeomaneuver.cpp index 72c38865..b1c67167 100644 --- a/src/location/declarativemaps/qdeclarativegeomaneuver.cpp +++ b/src/location/declarativemaps/qdeclarativegeomaneuver.cpp @@ -196,6 +196,4 @@ bool QDeclarativeGeoManeuver::waypointValid() const return maneuver_.waypoint().isValid(); } -#include "moc_qdeclarativegeomaneuver_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp index 95df9235..c32fda6a 100644 --- a/src/location/declarativemaps/qdeclarativegeomap.cpp +++ b/src/location/declarativemaps/qdeclarativegeomap.cpp @@ -1968,6 +1968,4 @@ bool QDeclarativeGeoMap::sendTouchEvent(QTouchEvent *event) return false; } -#include "moc_qdeclarativegeomap_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativegeomapitembase.cpp b/src/location/declarativemaps/qdeclarativegeomapitembase.cpp index 506c84bb..729825fd 100644 --- a/src/location/declarativemaps/qdeclarativegeomapitembase.cpp +++ b/src/location/declarativemaps/qdeclarativegeomapitembase.cpp @@ -281,6 +281,4 @@ void QDeclarativeGeoMapItemBase::polishAndUpdate() update(); } -#include "moc_qdeclarativegeomapitembase_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativegeomapitemgroup.cpp b/src/location/declarativemaps/qdeclarativegeomapitemgroup.cpp index a60d7aec..ee382353 100644 --- a/src/location/declarativemaps/qdeclarativegeomapitemgroup.cpp +++ b/src/location/declarativemaps/qdeclarativegeomapitemgroup.cpp @@ -145,6 +145,4 @@ QDeclarativeGeoMapItemGroup::~QDeclarativeGeoMapItemGroup() } -#include "moc_qdeclarativegeomapitemgroup_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp index cb1a4348..a17bf672 100644 --- a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp +++ b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp @@ -536,6 +536,4 @@ QDeclarativeGeoMapItemViewItemData::~QDeclarativeGeoMapItemViewItemData() delete modelData; } -#include "moc_qdeclarativegeomapitemview_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp b/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp index e212fa08..4fab18cb 100644 --- a/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp +++ b/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp @@ -364,6 +364,4 @@ qreal QDeclarativeGeoMapQuickItem::scaleFactor() return scale; } -#include "moc_qdeclarativegeomapquickitem_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativegeomaptype.cpp b/src/location/declarativemaps/qdeclarativegeomaptype.cpp index 0b90ec3a..86444aa4 100644 --- a/src/location/declarativemaps/qdeclarativegeomaptype.cpp +++ b/src/location/declarativemaps/qdeclarativegeomaptype.cpp @@ -131,6 +131,4 @@ bool QDeclarativeGeoMapType::night() const return mapType_.night(); } -#include "moc_qdeclarativegeomaptype_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativegeoroute.cpp b/src/location/declarativemaps/qdeclarativegeoroute.cpp index fd6378da..bce0af80 100644 --- a/src/location/declarativemaps/qdeclarativegeoroute.cpp +++ b/src/location/declarativemaps/qdeclarativegeoroute.cpp @@ -272,6 +272,4 @@ void QDeclarativeGeoRoute::clearSegments() segments_.clear(); } -#include "moc_qdeclarativegeoroute_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp index 1c9b7c85..8787271e 100644 --- a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp +++ b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp @@ -1303,6 +1303,4 @@ void QDeclarativeGeoRouteQuery::doCoordinateChanged() emit queryDetailsChanged(); } -#include "moc_qdeclarativegeoroutemodel_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp b/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp index acfe2441..77a8a41a 100644 --- a/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp +++ b/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp @@ -159,6 +159,4 @@ QJSValue QDeclarativeGeoRouteSegment::path() const return QJSValue(v4, pathArray.asReturnedValue()); } -#include "moc_qdeclarativegeoroutesegment_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp b/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp index 994b4913..54f70c11 100644 --- a/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp +++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp @@ -815,7 +815,5 @@ QVariant QDeclarativeGeoServiceProviderParameter::value() const /******************************************************************************* *******************************************************************************/ -#include "moc_qdeclarativegeoserviceprovider_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/declarativemaps/qquickgeomapgesturearea.cpp b/src/location/declarativemaps/qquickgeomapgesturearea.cpp index e7242fd1..ad18ad26 100644 --- a/src/location/declarativemaps/qquickgeomapgesturearea.cpp +++ b/src/location/declarativemaps/qquickgeomapgesturearea.cpp @@ -1761,6 +1761,4 @@ void QQuickGeoMapGestureArea::handleFlickAnimationStopped() } } -#include "moc_qquickgeomapgesturearea_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/maps/qgeocodereply.cpp b/src/location/maps/qgeocodereply.cpp index 85e6e1f5..5fefb6fe 100644 --- a/src/location/maps/qgeocodereply.cpp +++ b/src/location/maps/qgeocodereply.cpp @@ -335,7 +335,4 @@ QGeoCodeReplyPrivate::QGeoCodeReplyPrivate(QGeoCodeReply::Error error, const QSt QGeoCodeReplyPrivate::~QGeoCodeReplyPrivate() {} - -#include "moc_qgeocodereply.cpp" - QT_END_NAMESPACE diff --git a/src/location/maps/qgeocodingmanager.cpp b/src/location/maps/qgeocodingmanager.cpp index 70c5de82..73d68416 100644 --- a/src/location/maps/qgeocodingmanager.cpp +++ b/src/location/maps/qgeocodingmanager.cpp @@ -322,6 +322,4 @@ QGeoCodingManagerPrivate::~QGeoCodingManagerPrivate() /******************************************************************************* *******************************************************************************/ -#include "moc_qgeocodingmanager.cpp" - QT_END_NAMESPACE diff --git a/src/location/maps/qgeocodingmanagerengine.cpp b/src/location/maps/qgeocodingmanagerengine.cpp index b163d173..fb7d4e0e 100644 --- a/src/location/maps/qgeocodingmanagerengine.cpp +++ b/src/location/maps/qgeocodingmanagerengine.cpp @@ -331,6 +331,4 @@ QGeoCodingManagerEnginePrivate::~QGeoCodingManagerEnginePrivate() { } -#include "moc_qgeocodingmanagerengine.cpp" - QT_END_NAMESPACE diff --git a/src/location/maps/qgeomappingmanager.cpp b/src/location/maps/qgeomappingmanager.cpp index 12e61c71..7d829965 100644 --- a/src/location/maps/qgeomappingmanager.cpp +++ b/src/location/maps/qgeomappingmanager.cpp @@ -193,6 +193,4 @@ QGeoMappingManagerPrivate::~QGeoMappingManagerPrivate() engine = 0; } -#include "moc_qgeomappingmanager_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/maps/qgeomappingmanagerengine.cpp b/src/location/maps/qgeomappingmanagerengine.cpp index 0eeadf71..5094c1b3 100644 --- a/src/location/maps/qgeomappingmanagerengine.cpp +++ b/src/location/maps/qgeomappingmanagerengine.cpp @@ -203,6 +203,4 @@ QGeoMappingManagerEnginePrivate::QGeoMappingManagerEnginePrivate() QGeoMappingManagerEnginePrivate::~QGeoMappingManagerEnginePrivate() {} -#include "moc_qgeomappingmanagerengine_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/maps/qgeoroutereply.cpp b/src/location/maps/qgeoroutereply.cpp index 6f7b3129..48450bd8 100644 --- a/src/location/maps/qgeoroutereply.cpp +++ b/src/location/maps/qgeoroutereply.cpp @@ -274,6 +274,4 @@ QGeoRouteReplyPrivate::QGeoRouteReplyPrivate(QGeoRouteReply::Error error, QStrin QGeoRouteReplyPrivate::~QGeoRouteReplyPrivate() {} -#include "moc_qgeoroutereply.cpp" - QT_END_NAMESPACE diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h index 1692bbbc..6fcc7ad3 100644 --- a/src/location/maps/qgeorouterequest.h +++ b/src/location/maps/qgeorouterequest.h @@ -43,10 +43,10 @@ #include #include +#include QT_BEGIN_NAMESPACE -class QGeoRectangle; class QGeoRouteRequestPrivate; class Q_LOCATION_EXPORT QGeoRouteRequest diff --git a/src/location/maps/qgeoroutingmanager.cpp b/src/location/maps/qgeoroutingmanager.cpp index 8eca6719..195c285a 100644 --- a/src/location/maps/qgeoroutingmanager.cpp +++ b/src/location/maps/qgeoroutingmanager.cpp @@ -408,6 +408,4 @@ QGeoRoutingManagerPrivate::~QGeoRoutingManagerPrivate() delete engine; } -#include "moc_qgeoroutingmanager.cpp" - QT_END_NAMESPACE diff --git a/src/location/maps/qgeoroutingmanagerengine.cpp b/src/location/maps/qgeoroutingmanagerengine.cpp index 9c552682..aa307057 100644 --- a/src/location/maps/qgeoroutingmanagerengine.cpp +++ b/src/location/maps/qgeoroutingmanagerengine.cpp @@ -420,6 +420,4 @@ QGeoRoutingManagerEnginePrivate::QGeoRoutingManagerEnginePrivate() QGeoRoutingManagerEnginePrivate::~QGeoRoutingManagerEnginePrivate() {} -#include "moc_qgeoroutingmanagerengine.cpp" - QT_END_NAMESPACE diff --git a/src/location/maps/qgeotiledmappingmanagerengine.cpp b/src/location/maps/qgeotiledmappingmanagerengine.cpp index 3d15ee99..84938c61 100644 --- a/src/location/maps/qgeotiledmappingmanagerengine.cpp +++ b/src/location/maps/qgeotiledmappingmanagerengine.cpp @@ -325,6 +325,4 @@ QGeoTiledMappingManagerEnginePrivate::~QGeoTiledMappingManagerEnginePrivate() { } -#include "moc_qgeotiledmappingmanagerengine_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/maps/qgeotiledmapreply.cpp b/src/location/maps/qgeotiledmapreply.cpp index 34ca041f..9a9c2537 100644 --- a/src/location/maps/qgeotiledmapreply.cpp +++ b/src/location/maps/qgeotiledmapreply.cpp @@ -314,6 +314,4 @@ QGeoTiledMapReplyPrivate::QGeoTiledMapReplyPrivate(QGeoTiledMapReply::Error erro QGeoTiledMapReplyPrivate::~QGeoTiledMapReplyPrivate() {} -#include "moc_qgeotiledmapreply_p.cpp" - QT_END_NAMESPACE diff --git a/src/location/places/qplacemanagerengine.cpp b/src/location/places/qplacemanagerengine.cpp index c1b5f237..d14b7e67 100644 --- a/src/location/places/qplacemanagerengine.cpp +++ b/src/location/places/qplacemanagerengine.cpp @@ -458,5 +458,3 @@ QPlaceManagerEnginePrivate::~QPlaceManagerEnginePrivate() */ QT_END_NAMESPACE - -#include "moc_qplacemanagerengine.cpp" diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp index 6b38ec83..c3152014 100644 --- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp +++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp @@ -370,5 +370,4 @@ void QGeoSatelliteInfoSourceGypsy::requestUpdateTimeout() emit requestTimeout(); } -#include "moc_qgeosatelliteinfosource_gypsy_p.cpp" QT_END_NAMESPACE diff --git a/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp b/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp index 2942442b..39651b8f 100644 --- a/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp +++ b/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp @@ -167,6 +167,4 @@ void QGeoPositionInfoSourceSimulator::setError(QGeoPositionInfoSource::Error pos emit QGeoPositionInfoSource::error(positionError); } -#include "moc_qgeopositioninfosource_simulator_p.cpp" - QT_END_NAMESPACE diff --git a/src/plugins/position/simulator/qgeosatelliteinfosource_simulator.cpp b/src/plugins/position/simulator/qgeosatelliteinfosource_simulator.cpp index 1ec62a70..25f38424 100644 --- a/src/plugins/position/simulator/qgeosatelliteinfosource_simulator.cpp +++ b/src/plugins/position/simulator/qgeosatelliteinfosource_simulator.cpp @@ -129,5 +129,4 @@ void QGeoSatelliteInfoSourceSimulator::updateData() emit satellitesInUseUpdated(satellitesInUse); } -#include "moc_qgeosatelliteinfosource_simulator_p.cpp" QT_END_NAMESPACE diff --git a/src/plugins/position/simulator/qlocationconnection_simulator.cpp b/src/plugins/position/simulator/qlocationconnection_simulator.cpp index f8e1da03..4835a9af 100644 --- a/src/plugins/position/simulator/qlocationconnection_simulator.cpp +++ b/src/plugins/position/simulator/qlocationconnection_simulator.cpp @@ -100,8 +100,6 @@ namespace Simulator *qtSatelliteInfo() = data; } -#include "moc_qlocationconnection_simulator_p.cpp" - } // namespace QGeoPositionInfoData *qtPositionInfo() diff --git a/src/positioning/qdeclarativegeoaddress.cpp b/src/positioning/qdeclarativegeoaddress.cpp index 476fcac8..470a4c12 100644 --- a/src/positioning/qdeclarativegeoaddress.cpp +++ b/src/positioning/qdeclarativegeoaddress.cpp @@ -350,6 +350,4 @@ bool QDeclarativeGeoAddress::isTextGenerated() const return m_address.isTextGenerated(); } -#include "moc_qdeclarativegeoaddress_p.cpp" - QT_END_NAMESPACE diff --git a/src/positioning/qgeopositioninfosource.cpp b/src/positioning/qgeopositioninfosource.cpp index facace97..5db9b431 100644 --- a/src/positioning/qgeopositioninfosource.cpp +++ b/src/positioning/qgeopositioninfosource.cpp @@ -478,6 +478,4 @@ QStringList QGeoPositionInfoSource::availableSources() \value UnknownSourceError An unidentified error occurred. */ -#include "moc_qgeopositioninfosource.cpp" - QT_END_NAMESPACE diff --git a/src/positioning/qgeosatelliteinfosource.cpp b/src/positioning/qgeosatelliteinfosource.cpp index 297f4849..c55c36d3 100644 --- a/src/positioning/qgeosatelliteinfosource.cpp +++ b/src/positioning/qgeosatelliteinfosource.cpp @@ -345,6 +345,4 @@ QStringList QGeoSatelliteInfoSource::availableSources() */ -#include "moc_qgeosatelliteinfosource.cpp" - QT_END_NAMESPACE diff --git a/src/positioning/qnmeapositioninfosource.cpp b/src/positioning/qnmeapositioninfosource.cpp index c5fde41a..75fa9645 100644 --- a/src/positioning/qnmeapositioninfosource.cpp +++ b/src/positioning/qnmeapositioninfosource.cpp @@ -674,7 +674,4 @@ void QNmeaPositionInfoSource::setError(QGeoPositionInfoSource::Error positionErr emit QGeoPositionInfoSource::error(positionError); } -#include "moc_qnmeapositioninfosource.cpp" -#include "moc_qnmeapositioninfosource_p.cpp" - QT_END_NAMESPACE -- cgit v1.2.1