[QtLocation] Make invoked methods invokable. Contributes to JB#36989

A previous commit 55009ec added an invalid metaobject invocation of methods which were not a slot or Q_INVOKABLE. This commit makes those methods private slots. Contributes to JB#36989
sailfishos · Nov 18, 2016 · 7b51310 · 7b51310
1 parent 93819e2
commit 7b51310
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp
@@ -169,6 +169,7 @@ QGeoSatelliteInfoSourceGeoclueMaster::QGeoSatelliteInfoSourceGeoclueMaster(QObje
 :   QGeoSatelliteInfoSource(parent), QGeoclueMaster(this), m_sat(0), m_error(NoError),
     m_satellitesChangedConnected(false), m_running(false)
 {
+    qRegisterMetaType<QList<QGeoSatelliteInfo> >("QList<QGeoSatelliteInfo>");
     m_requestTimer.setSingleShot(true);
     connect(&m_requestTimer, SIGNAL(timeout()), this, SLOT(requestUpdateTimeout()));
 }

diff --git a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.h b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.h
@@ -71,16 +71,14 @@ class QGeoSatelliteInfoSourceGeoclueMaster : public QGeoSatelliteInfoSource, pub
     void stopUpdates() Q_DECL_OVERRIDE;
     void requestUpdate(int timeout = 0) Q_DECL_OVERRIDE;
 
-    void satelliteChanged(int timestamp, int satellitesUsed, int satellitesVisible,
-                          const QList<int> &usedPrn, const QList<QGeoSatelliteInfo> &satInfos);
-
-    void requestUpdateFinished(int timestamp, int satellitesUsed, int satellitesVisible,
-                               const QList<int> &usedPrn, const QList<QGeoSatelliteInfo> &satInfos);
-
 private slots:
     void requestUpdateTimeout();
     void positionProviderChanged(const QByteArray &service, const QByteArray &path);
     void satellitesChanged(const QDBusMessage &message);
+    void satelliteChanged(int timestamp, int satellitesUsed, int satellitesVisible,
+                          const QList<int> &usedPrn, const QList<QGeoSatelliteInfo> &satInfos);
+    void requestUpdateFinished(int timestamp, int satellitesUsed, int satellitesVisible,
+                               const QList<int> &usedPrn, const QList<QGeoSatelliteInfo> &satInfos);
 
 private:
     bool configureSatelliteSource();