Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[mer][qtlocation] Fix QGeoSatelliteInfo connect/disconnect undefined …
…slots from geoclue side. Contributes JB#41029
  • Loading branch information
rainemak committed Apr 10, 2018
1 parent 0109d56 commit 166e3ad
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
Expand Up @@ -8,7 +8,7 @@
<arg name="satelliteVisible" type="i" direction="out" />
<arg name="usedPrn" type="ai" direction="out" />
<arg name="satInfo" type="a(iiii)" direction="out" />
<annotation name="org.qtproject.QtDBus.QtTypeName.Out3" value="QList&lt;qint32&gt;"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.Out3" value="QList&lt;int&gt;"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.Out4" value="QList&lt;QGeoSatelliteInfo&gt;"/>
</method>
<method name="GetLastSatellite">
Expand All @@ -17,16 +17,16 @@
<arg name="satelliteVisible" type="i" direction="out" />
<arg name="usedPrn" type="ai" direction="out" />
<arg name="satInfo" type="a(iiii)" direction="out" />
<annotation name="org.qtproject.QtDBus.QtTypeName.Out3" value="QList&lt;qint32&gt;"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.Out3" value="QList&lt;int&gt;"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.Out4" value="QList&lt;QGeoSatelliteInfo&gt;"/>
</method>
<signal name="SatelliteChanged">
<arg name="timestamp" type="i" />
<arg name="satelliteUsed" type="i" />
<arg name="satelliteVisible" type="i" />
<arg name="usedPrn" type="ai" />
<arg name="satInfo" type="a(iiii)" />'
<annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="QList&lt;qint32&gt;"/>
<arg name="satInfo" type="a(iiii)" />
<annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="QList&lt;int&gt;"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.In4" value="QList&lt;QGeoSatelliteInfo&gt;"/>
</signal>
</interface>
Expand Down
Expand Up @@ -102,8 +102,8 @@ void QGeoSatelliteInfoSourceGeoclueMaster::stopUpdates()
return;

if (m_sat) {
disconnect(m_sat, SIGNAL(SatelliteChanged(qint32,qint32,qint32,QList<qint32>,QList<QGeoSatelliteInfo>)),
this, SLOT(satelliteChanged(qint32,qint32,qint32,QList<qint32>,QList<QGeoSatelliteInfo>)));
disconnect(m_sat, SIGNAL(SatelliteChanged(int,int,int,QList<int>,QList<QGeoSatelliteInfo>)),
this, SLOT(satelliteChanged(int,int,int,QList<int>,QList<QGeoSatelliteInfo>)));
}

m_running = false;
Expand Down Expand Up @@ -131,7 +131,7 @@ void QGeoSatelliteInfoSourceGeoclueMaster::requestUpdate(int timeout)
m_requestTimer.start(qMax(timeout, minimumUpdateInterval()));

if (m_sat) {
QDBusPendingReply<qint32, qint32, qint32, QList<qint32>, QList<QGeoSatelliteInfo> > reply =
QDBusPendingReply<int, int, int, QList<int>, QList<QGeoSatelliteInfo> > reply =
m_sat->GetSatellite();
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
Expand Down Expand Up @@ -191,7 +191,7 @@ void QGeoSatelliteInfoSourceGeoclueMaster::requestUpdateTimeout()

void QGeoSatelliteInfoSourceGeoclueMaster::getSatelliteFinished(QDBusPendingCallWatcher *watcher)
{
QDBusPendingReply<qint32, qint32, qint32, QList<qint32>, QList<QGeoSatelliteInfo> > reply = *watcher;
QDBusPendingReply<int, int, int, QList<int>, QList<QGeoSatelliteInfo> > reply = *watcher;
watcher->deleteLater();

if (reply.isError())
Expand Down Expand Up @@ -256,8 +256,8 @@ void QGeoSatelliteInfoSourceGeoclueMaster::positionProviderChanged(const QString
m_sat = new OrgFreedesktopGeoclueSatelliteInterface(providerService, providerPath, QDBusConnection::sessionBus());

if (m_running) {
connect(m_sat, SIGNAL(SatelliteChanged(qint32,qint32,qint32,QList<qint32>,QList<QGeoSatelliteInfo>)),
this, SLOT(satelliteChanged(qint32,qint32,qint32,QList<qint32>,QList<QGeoSatelliteInfo>)));
connect(m_sat, SIGNAL(SatelliteChanged(int,int,int,QList<int>,QList<QGeoSatelliteInfo>)),
this, SLOT(satelliteChanged(int,int,int,QList<int>,QList<QGeoSatelliteInfo>)));
}
}

Expand Down

0 comments on commit 166e3ad

Please sign in to comment.