Cleanup qRegisterMetaType<T>() calls

The non-parameter version is much more secure.

Change-Id: I70612c60d780a972bbf9c852f50f7b0c6f2a0402
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>

8 files changed, 20 insertions, 20 deletions

diff --git a/examples/positioning/weatherinfo/main.cpp b/examples/positioning/weatherinfo/main.cpp
index 6f4e0922..e60aee5d 100644
--- a/examples/positioning/weatherinfo/main.cpp
+++ b/examples/positioning/weatherinfo/main.cpp
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     qmlRegisterType<AppModel>("WeatherInfo", 1, 0, "AppModel");
 
 //! [0]
-    qRegisterMetaType<WeatherData>("WeatherData");
+    qRegisterMetaType<WeatherData>();
 //! [1]
     const QString mainQmlApp = QStringLiteral("qrc:///weatherinfo.qml");
     QQuickView view;
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 0e3f3cd1..be5fad6a 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -154,14 +154,14 @@ public:
                                         QStringLiteral("MapType is not intended instantiable by developer."));
 
             //registrations below are version independent
-            qRegisterMetaType<QPlaceCategory>("QPlaceCategory");
-            qRegisterMetaType<QPlace>("QPlace");
-            qRegisterMetaType<QPlaceIcon>("QPlaceIcon");
-            qRegisterMetaType<QPlaceRatings>("QPlaceRatings");
-            qRegisterMetaType<QPlaceSupplier>("QPlaceSupplier");
-            qRegisterMetaType<QPlaceUser>("QPlaceUser");
-            qRegisterMetaType<QPlaceAttribute>("QPlaceAttribute");
-            qRegisterMetaType<QPlaceContactDetail>("QPlaceContactDetail");
+            qRegisterMetaType<QPlaceCategory>();
+            qRegisterMetaType<QPlace>();
+            qRegisterMetaType<QPlaceIcon>();
+            qRegisterMetaType<QPlaceRatings>();
+            qRegisterMetaType<QPlaceSupplier>();
+            qRegisterMetaType<QPlaceUser>();
+            qRegisterMetaType<QPlaceAttribute>();
+            qRegisterMetaType<QPlaceContactDetail>();
         } else {
             qDebug() << "Unsupported URI given to load location QML plugin: " << QLatin1String(uri);
         }
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 13ad1c1c..89c384a6 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -82,14 +82,14 @@ public:
             int major = 5;
             int minor = 0;
 
-            qRegisterMetaType<QGeoCoordinate>("QGeoCoordinate");
+            qRegisterMetaType<QGeoCoordinate>();
             QMetaType::registerEqualsComparator<QGeoCoordinate>();
-            qRegisterMetaType<QGeoAddress>("QGeoAddress");
-            qRegisterMetaType<QGeoRectangle>("QGeoRectangle");
+            qRegisterMetaType<QGeoAddress>();
+            qRegisterMetaType<QGeoRectangle>();
             QMetaType::registerEqualsComparator<QGeoRectangle>();
-            qRegisterMetaType<QGeoCircle>("QGeoCircle");
+            qRegisterMetaType<QGeoCircle>();
             QMetaType::registerEqualsComparator<QGeoCircle>();
-            qRegisterMetaType<QGeoLocation>("QGeoLocation");
+            qRegisterMetaType<QGeoLocation>();
             qRegisterMetaType<QGeoShape>();
             QMetaType::registerEqualsComparator<QGeoShape>();
 
diff --git a/src/location/places/qplacemanager.cpp b/src/location/places/qplacemanager.cpp
index b9946b6a..451bb93a 100644
--- a/src/location/places/qplacemanager.cpp
+++ b/src/location/places/qplacemanager.cpp
@@ -138,7 +138,7 @@ QPlaceManager::QPlaceManager(QPlaceManagerEngine *engine, QObject *parent)
         d->setParent(this);
         d->d_ptr->manager = this;
 
-        qRegisterMetaType<QPlaceCategory>("QPlaceCategory");
+        qRegisterMetaType<QPlaceCategory>();
 
         connect(d, SIGNAL(finished(QPlaceReply*)), this, SIGNAL(finished(QPlaceReply*)));
         connect(d, SIGNAL(error(QPlaceReply*,QPlaceReply::Error)),
diff --git a/src/location/places/qplacemanagerengine.cpp b/src/location/places/qplacemanagerengine.cpp
index afdfd4ec..6cee5d8a 100644
--- a/src/location/places/qplacemanagerengine.cpp
+++ b/src/location/places/qplacemanagerengine.cpp
@@ -70,8 +70,8 @@ QPlaceManagerEngine::QPlaceManagerEngine(const QVariantMap &parameters,
                                          QObject *parent)
 :   QObject(parent), d_ptr(new QPlaceManagerEnginePrivate)
 {
-    qRegisterMetaType<QPlaceReply::Error>("QPlaceReply::Error");
-    qRegisterMetaType<QPlaceReply *>("QPlaceReply *");
+    qRegisterMetaType<QPlaceReply::Error>();
+    qRegisterMetaType<QPlaceReply *>();
     Q_UNUSED(parameters)
 }
 
diff --git a/tests/auto/qgeocodereply/tst_qgeocodereply.cpp b/tests/auto/qgeocodereply/tst_qgeocodereply.cpp
index eb1c096f..26e29bea 100644
--- a/tests/auto/qgeocodereply/tst_qgeocodereply.cpp
+++ b/tests/auto/qgeocodereply/tst_qgeocodereply.cpp
@@ -50,7 +50,7 @@ void tst_QGeoCodeReply::cleanupTestCase()
 
 void tst_QGeoCodeReply::init()
 {
-    qRegisterMetaType<QGeoCodeReply::Error>("Error");
+    qRegisterMetaType<QGeoCodeReply::Error>();
     signalerror = new QSignalSpy(reply, SIGNAL(error(QGeoCodeReply::Error,QString)));
     signalfinished = new QSignalSpy(reply, SIGNAL(finished()));
 }
diff --git a/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.cpp b/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.cpp
index c04ccb8d..d5837af1 100644
--- a/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.cpp
+++ b/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.cpp
@@ -55,7 +55,7 @@ void tst_QGeoCodingManager::cleanupTestCase()
 
 void tst_QGeoCodingManager::init()
 {
-    qRegisterMetaType<QGeoCodeReply::Error>("Error");
+    qRegisterMetaType<QGeoCodeReply::Error>();
     qRegisterMetaType<QGeoCodeReply*>();
 
     signalerror = new QSignalSpy(qgeocodingmanager, SIGNAL(error(QGeoCodeReply*,QGeoCodeReply::Error,QString)));
diff --git a/tests/auto/qgeoroutereply/tst_qgeoroutereply.cpp b/tests/auto/qgeoroutereply/tst_qgeoroutereply.cpp
index ce3fd3da..04811ed5 100644
--- a/tests/auto/qgeoroutereply/tst_qgeoroutereply.cpp
+++ b/tests/auto/qgeoroutereply/tst_qgeoroutereply.cpp
@@ -60,7 +60,7 @@ void tst_QGeoRouteReply::cleanupTestCase()
 
 void tst_QGeoRouteReply::init()
 {
-    qRegisterMetaType<QGeoRouteReply::Error>("Error");
+    qRegisterMetaType<QGeoRouteReply::Error>();
     signalerror = new QSignalSpy(reply, SIGNAL(error(QGeoRouteReply::Error,QString)));
     signalfinished = new QSignalSpy(reply, SIGNAL(finished()));
 }