Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
acd18168
Commit
acd18168
authored
Jun 20, 2018
by
Patrick José Pereira
Browse files
Use Qt5 connect style
Signed-off-by:
Patrick José Pereira
<
patrickelectric@gmail.com
>
parent
0ee8973a
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/FollowMe/FollowMe.cc
View file @
acd18168
...
...
@@ -84,9 +84,9 @@ void FollowMe::_settingsChanged()
void
FollowMe
::
_enable
()
{
connect
(
_toolbox
->
qgcPositionManager
(),
SIGNAL
(
positionInfoUpdated
(
QGeoP
ositionInfo
))
,
&
QGCPositionManager
::
p
ositionInfo
Updated
,
this
,
SLOT
(
_setGPSLocation
(
QGeoPositionInfo
))
);
&
FollowMe
::
_setGPSLocation
);
_gcsMotionReportTimer
.
setInterval
(
_toolbox
->
qgcPositionManager
()
->
updateInterval
());
_gcsMotionReportTimer
.
start
();
}
...
...
@@ -94,9 +94,9 @@ void FollowMe::_enable()
void
FollowMe
::
_disable
()
{
disconnect
(
_toolbox
->
qgcPositionManager
(),
SIGNAL
(
positionInfoUpdated
(
QGeoP
ositionInfo
))
,
&
QGCPositionManager
::
p
ositionInfo
Updated
,
this
,
SLOT
(
_setGPSLocation
(
QGeoPositionInfo
))
);
&
FollowMe
::
_setGPSLocation
);
_gcsMotionReportTimer
.
stop
();
}
...
...
src/QtLocationPlugin/QGeoCodeReplyQGC.cpp
View file @
acd18168
...
...
@@ -158,7 +158,7 @@ JasonMonger kMonger;
QGeoCodeReplyQGC
::
QGeoCodeReplyQGC
(
QNetworkReply
*
reply
,
QObject
*
parent
)
:
QGeoCodeReply
(
parent
),
m_reply
(
reply
)
{
connect
(
m_reply
,
SIGNAL
(
finished
())
,
this
,
SLOT
(
networkReplyFinished
())
);
connect
(
m_reply
,
&
QNetworkReply
::
finished
,
this
,
&
QGeoCodeReplyQGC
::
networkReplyFinished
);
connect
(
m_reply
,
SIGNAL
(
error
(
QNetworkReply
::
NetworkError
)),
this
,
SLOT
(
networkReplyError
(
QNetworkReply
::
NetworkError
)));
...
...
src/QtLocationPlugin/QGeoCodingManagerEngineQGC.cpp
View file @
acd18168
...
...
@@ -125,7 +125,7 @@ QGeoCodeReply *QGeoCodingManagerEngineQGC::geocode(const QString &address, int l
QGeoCodeReplyQGC
*
geocodeReply
=
new
QGeoCodeReplyQGC
(
reply
);
connect
(
geocodeReply
,
SIGNAL
(
finished
())
,
this
,
SLOT
(
replyFinished
())
);
connect
(
geocodeReply
,
&
QGeoCodeReply
::
finished
,
this
,
&
QGeoCodingManagerEngineQGC
::
replyFinished
);
connect
(
geocodeReply
,
SIGNAL
(
error
(
QGeoCodeReply
::
Error
,
QString
)),
this
,
SLOT
(
replyError
(
QGeoCodeReply
::
Error
,
QString
)));
...
...
@@ -156,7 +156,7 @@ QGeoCodeReply *QGeoCodingManagerEngineQGC::reverseGeocode(const QGeoCoordinate &
QGeoCodeReplyQGC
*
geocodeReply
=
new
QGeoCodeReplyQGC
(
reply
);
connect
(
geocodeReply
,
SIGNAL
(
finished
())
,
this
,
SLOT
(
replyFinished
())
);
connect
(
geocodeReply
,
&
QGeoCodeReply
::
finished
,
this
,
&
QGeoCodingManagerEngineQGC
::
replyFinished
);
connect
(
geocodeReply
,
SIGNAL
(
error
(
QGeoCodeReply
::
Error
,
QString
)),
this
,
SLOT
(
replyError
(
QGeoCodeReply
::
Error
,
QString
)));
...
...
src/QtLocationPlugin/QGeoMapReplyQGC.cpp
View file @
acd18168
...
...
@@ -189,7 +189,7 @@ QGeoTiledMapReplyQGC::cacheError(QGCMapTask::TaskType type, QString /*errorStrin
#endif
_reply
=
_networkManager
->
get
(
_request
);
_reply
->
setParent
(
0
);
connect
(
_reply
,
SIGNAL
(
finished
())
,
this
,
SLOT
(
networkReplyFinished
())
);
connect
(
_reply
,
&
QNetworkReply
::
finished
,
this
,
&
QGeoTiledMapReplyQGC
::
networkReplyFinished
);
connect
(
_reply
,
SIGNAL
(
error
(
QNetworkReply
::
NetworkError
)),
this
,
SLOT
(
networkReplyError
(
QNetworkReply
::
NetworkError
)));
#if !defined(__mobile__)
_networkManager
->
setProxy
(
proxy
);
...
...
src/qgcunittest/TCPLinkTest.cc
View file @
acd18168
...
...
@@ -130,7 +130,7 @@ void TCPLinkTest::_connectSucceed_test(void)
// We emit this signal such that it will be queued and run on the TCPLink thread. This in turn
// allows the TCPLink object to pump the bytes through.
connect
(
this
,
SIGNAL
(
waitForBytesWritten
(
int
))
,
_link
,
SLOT
(
waitForBytesWritten
(
int
))
);
connect
(
this
,
&
TCPLinkTest
::
waitForBytesWritten
,
_link
,
&
TCPLink
::
waitForBytesWritten
);
emit
waitForBytesWritten
(
1000
);
// Check for loopback, both from signal received and actual bytes returned
...
...
src/qgcunittest/TCPLoopBackServer.cc
View file @
acd18168
...
...
@@ -30,7 +30,7 @@ void TCPLoopBackServer::run(void)
_tcpServer
=
new
QTcpServer
(
this
);
Q_CHECK_PTR
(
_tcpServer
);
bool
connected
=
QObject
::
connect
(
_tcpServer
,
SIGNAL
(
newConnection
())
,
this
,
SLOT
(
_newConnection
())
);
bool
connected
=
QObject
::
connect
(
_tcpServer
,
&
QTcpServer
::
newConnection
,
this
,
&
TCPLoopBackServer
::
_newConnection
);
Q_ASSERT
(
connected
);
Q_UNUSED
(
connected
);
// Fix initialized-but-not-referenced warning on release builds
...
...
@@ -45,7 +45,7 @@ void TCPLoopBackServer::_newConnection(void)
Q_ASSERT
(
_tcpServer
);
_tcpSocket
=
_tcpServer
->
nextPendingConnection
();
Q_ASSERT
(
_tcpSocket
);
bool
connected
=
QObject
::
connect
(
_tcpSocket
,
SIGNAL
(
readyRead
())
,
this
,
SLOT
(
_readBytes
())
);
bool
connected
=
QObject
::
connect
(
_tcpSocket
,
&
QIODevice
::
readyRead
,
this
,
&
TCPLoopBackServer
::
_readBytes
);
Q_ASSERT
(
connected
);
Q_UNUSED
(
connected
);
// Fix initialized-but-not-referenced warning on release builds
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment