summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Buhr <andreas@andreasbuhr.de>2021-02-04 12:49:36 +0100
committerAndreas Buhr <andreas@andreasbuhr.de>2021-02-04 13:01:48 +0100
commit752f7c79d3bb8c350139d48c9622d426f7ad86d2 (patch)
tree559c3aec4ce29a03f381eb524ff9ccba4adc1f30
parentec00d74a0207feaf406773b940621c18eae86182 (diff)
downloadqtlocation-752f7c79d3bb8c350139d48c9622d426f7ad86d2.tar.gz
Replace discouraged Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPE
Q_MOVABLE_TYPE was conceived before C++ had move semantics. Now, with move semantics, its name is misleading. Q_RELOCATABLE_TYPE was introduced as a synonym to Q_MOVABLE_TYPE. Usage of Q_MOVABLE_TYPE is discouraged now. This patch replaces all usages of Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPE in QtLocation. As the two are synonymous, this patch should have no impact on users. Task-number: QTBUG-86829 Change-Id: I2f0c6ba29f70abf7c2c467c14b2fa0d37d2a0298 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
-rw-r--r--src/location/places/qplace.h2
-rw-r--r--src/location/places/qplacecategory.h2
-rw-r--r--src/location/places/qplaceproposedsearchresult.h2
-rw-r--r--src/location/places/qplaceresult.h2
-rw-r--r--src/location/places/qplacesearchresult.h2
-rw-r--r--src/plugins/position/geoclue/geocluetypes.h2
-rw-r--r--src/plugins/position/geoclue2/geocluetypes.h2
-rw-r--r--src/positioning/qdoublematrix4x4_p.h2
-rw-r--r--src/positioning/qdoublevector2d_p.h2
-rw-r--r--src/positioning/qdoublevector3d_p.h2
-rw-r--r--src/positioning/qgeoaddress.h2
-rw-r--r--src/positioning/qgeocircle.h2
-rw-r--r--src/positioning/qgeocoordinate.h2
-rw-r--r--src/positioning/qgeolocation.h2
-rw-r--r--src/positioning/qgeopath.h2
-rw-r--r--src/positioning/qgeopolygon.h2
-rw-r--r--src/positioning/qgeorectangle.h2
-rw-r--r--src/positioning/qgeoshape.h2
18 files changed, 18 insertions, 18 deletions
diff --git a/src/location/places/qplace.h b/src/location/places/qplace.h
index 5eac1c89..6f8f233a 100644
--- a/src/location/places/qplace.h
+++ b/src/location/places/qplace.h
@@ -131,7 +131,7 @@ private:
friend class QDeclarativePlace;
};
-Q_DECLARE_TYPEINFO(QPlace, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPlace, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE
diff --git a/src/location/places/qplacecategory.h b/src/location/places/qplacecategory.h
index 56a9854c..ac5838f2 100644
--- a/src/location/places/qplacecategory.h
+++ b/src/location/places/qplacecategory.h
@@ -82,7 +82,7 @@ private:
QSharedDataPointer<QPlaceCategoryPrivate> d;
};
-Q_DECLARE_TYPEINFO(QPlaceCategory, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPlaceCategory, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE
diff --git a/src/location/places/qplaceproposedsearchresult.h b/src/location/places/qplaceproposedsearchresult.h
index d9497170..4819d021 100644
--- a/src/location/places/qplaceproposedsearchresult.h
+++ b/src/location/places/qplaceproposedsearchresult.h
@@ -63,7 +63,7 @@ private:
Q_DECLARE_SEARCHRESULT_D_FUNC(QPlaceProposedSearchResult)
};
-Q_DECLARE_TYPEINFO(QPlaceProposedSearchResult, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPlaceProposedSearchResult, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE
diff --git a/src/location/places/qplaceresult.h b/src/location/places/qplaceresult.h
index 9d11724f..727ba179 100644
--- a/src/location/places/qplaceresult.h
+++ b/src/location/places/qplaceresult.h
@@ -70,7 +70,7 @@ private:
Q_DECLARE_SEARCHRESULT_D_FUNC(QPlaceResult)
};
-Q_DECLARE_TYPEINFO(QPlaceResult, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPlaceResult, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE
diff --git a/src/location/places/qplacesearchresult.h b/src/location/places/qplacesearchresult.h
index 436060db..dc5e910a 100644
--- a/src/location/places/qplacesearchresult.h
+++ b/src/location/places/qplacesearchresult.h
@@ -96,7 +96,7 @@ private:
friend class QPlaceSearchResultPrivate;
};
-Q_DECLARE_TYPEINFO(QPlaceSearchResult, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPlaceSearchResult, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE
diff --git a/src/plugins/position/geoclue/geocluetypes.h b/src/plugins/position/geoclue/geocluetypes.h
index 0e87b732..a94f8f99 100644
--- a/src/plugins/position/geoclue/geocluetypes.h
+++ b/src/plugins/position/geoclue/geocluetypes.h
@@ -79,7 +79,7 @@ Q_DECLARE_METATYPE(QList<QGeoSatelliteInfo>)
QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(Accuracy, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Accuracy, Q_RELOCATABLE_TYPE);
QDBusArgument &operator<<(QDBusArgument &arg, const Accuracy &accuracy);
const QDBusArgument &operator>>(const QDBusArgument &arg, Accuracy &accuracy);
diff --git a/src/plugins/position/geoclue2/geocluetypes.h b/src/plugins/position/geoclue2/geocluetypes.h
index 0f3eb522..7efcc94e 100644
--- a/src/plugins/position/geoclue2/geocluetypes.h
+++ b/src/plugins/position/geoclue2/geocluetypes.h
@@ -53,7 +53,7 @@ Q_DECLARE_METATYPE(Timestamp)
QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(Timestamp, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Timestamp, Q_RELOCATABLE_TYPE);
QDBusArgument &operator<<(QDBusArgument &arg, const Timestamp &ts);
const QDBusArgument &operator>>(const QDBusArgument &arg, Timestamp &ts);
diff --git a/src/positioning/qdoublematrix4x4_p.h b/src/positioning/qdoublematrix4x4_p.h
index aaa0b27b..1f9dcfa8 100644
--- a/src/positioning/qdoublematrix4x4_p.h
+++ b/src/positioning/qdoublematrix4x4_p.h
@@ -186,7 +186,7 @@ private:
void projectedRotate(double angle, double x, double y, double z);
};
-Q_DECLARE_TYPEINFO(QDoubleMatrix4x4, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QDoubleMatrix4x4, Q_RELOCATABLE_TYPE);
inline QDoubleMatrix4x4::QDoubleMatrix4x4
(double m11, double m12, double m13, double m14,
diff --git a/src/positioning/qdoublevector2d_p.h b/src/positioning/qdoublevector2d_p.h
index 92ccfe85..a692e190 100644
--- a/src/positioning/qdoublevector2d_p.h
+++ b/src/positioning/qdoublevector2d_p.h
@@ -119,7 +119,7 @@ private:
friend class QDoubleVector3D;
};
-Q_DECLARE_TYPEINFO(QDoubleVector2D, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QDoubleVector2D, Q_RELOCATABLE_TYPE);
Q_DECL_CONSTEXPR inline QDoubleVector2D::QDoubleVector2D() : xp(0.0), yp(0.0) {}
diff --git a/src/positioning/qdoublevector3d_p.h b/src/positioning/qdoublevector3d_p.h
index 059d38f1..3b4503aa 100644
--- a/src/positioning/qdoublevector3d_p.h
+++ b/src/positioning/qdoublevector3d_p.h
@@ -130,7 +130,7 @@ private:
friend class QDoubleVector2D;
};
-Q_DECLARE_TYPEINFO(QDoubleVector3D, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QDoubleVector3D, Q_RELOCATABLE_TYPE);
Q_DECL_CONSTEXPR inline QDoubleVector3D::QDoubleVector3D() : xp(0.0), yp(0.0), zp(0.0) {}
diff --git a/src/positioning/qgeoaddress.h b/src/positioning/qgeoaddress.h
index 62312743..f4e2a940 100644
--- a/src/positioning/qgeoaddress.h
+++ b/src/positioning/qgeoaddress.h
@@ -97,7 +97,7 @@ private:
QSharedDataPointer<QGeoAddressPrivate> d;
};
-Q_DECLARE_TYPEINFO(QGeoAddress, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QGeoAddress, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE
diff --git a/src/positioning/qgeocircle.h b/src/positioning/qgeocircle.h
index b41fe26c..e389aed3 100644
--- a/src/positioning/qgeocircle.h
+++ b/src/positioning/qgeocircle.h
@@ -86,7 +86,7 @@ private:
inline const QGeoCirclePrivate *d_func() const;
};
-Q_DECLARE_TYPEINFO(QGeoCircle, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QGeoCircle, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE
diff --git a/src/positioning/qgeocoordinate.h b/src/positioning/qgeocoordinate.h
index 007f7e06..976c249a 100644
--- a/src/positioning/qgeocoordinate.h
+++ b/src/positioning/qgeocoordinate.h
@@ -117,7 +117,7 @@ private:
friend class QQuickGeoCoordinateAnimation;
};
-Q_DECLARE_TYPEINFO(QGeoCoordinate, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QGeoCoordinate, Q_RELOCATABLE_TYPE);
#ifndef QT_NO_DEBUG_STREAM
Q_POSITIONING_EXPORT QDebug operator<<(QDebug, const QGeoCoordinate &);
diff --git a/src/positioning/qgeolocation.h b/src/positioning/qgeolocation.h
index ff1dbcd9..bff4b552 100644
--- a/src/positioning/qgeolocation.h
+++ b/src/positioning/qgeolocation.h
@@ -81,7 +81,7 @@ private:
QSharedDataPointer<QGeoLocationPrivate> d;
};
-Q_DECLARE_TYPEINFO(QGeoLocation, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QGeoLocation, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE
diff --git a/src/positioning/qgeopath.h b/src/positioning/qgeopath.h
index e4af2add..654c9c32 100644
--- a/src/positioning/qgeopath.h
+++ b/src/positioning/qgeopath.h
@@ -98,7 +98,7 @@ private:
inline const QGeoPathPrivate *d_func() const;
};
-Q_DECLARE_TYPEINFO(QGeoPath, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QGeoPath, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE
diff --git a/src/positioning/qgeopolygon.h b/src/positioning/qgeopolygon.h
index 09b7cc4d..a645fc9c 100644
--- a/src/positioning/qgeopolygon.h
+++ b/src/positioning/qgeopolygon.h
@@ -97,7 +97,7 @@ private:
inline const QGeoPolygonPrivate *d_func() const;
};
-Q_DECLARE_TYPEINFO(QGeoPolygon, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QGeoPolygon, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE
diff --git a/src/positioning/qgeorectangle.h b/src/positioning/qgeorectangle.h
index 82afd725..4a82cc1e 100644
--- a/src/positioning/qgeorectangle.h
+++ b/src/positioning/qgeorectangle.h
@@ -115,7 +115,7 @@ private:
inline const QGeoRectanglePrivate *d_func() const;
};
-Q_DECLARE_TYPEINFO(QGeoRectangle, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QGeoRectangle, Q_RELOCATABLE_TYPE);
inline QGeoRectangle QGeoRectangle::operator|(const QGeoRectangle &rectangle) const
{
diff --git a/src/positioning/qgeoshape.h b/src/positioning/qgeoshape.h
index 00aead8a..f64b9e97 100644
--- a/src/positioning/qgeoshape.h
+++ b/src/positioning/qgeoshape.h
@@ -94,7 +94,7 @@ private:
inline const QGeoShapePrivate *d_func() const;
};
-Q_DECLARE_TYPEINFO(QGeoShape, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QGeoShape, Q_RELOCATABLE_TYPE);
#ifndef QT_NO_DEBUG_STREAM
Q_POSITIONING_EXPORT QDebug operator<<(QDebug, const QGeoShape &);