Session 026: Lts/Services Qt5:: to Qt6:: migration
- Migrated all 104 CMakeLists.txt files in Lts/Services - Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg, Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test, Qt5::SerialPort with Qt6:: equivalents - 1244 files modified (CMakeLists.txt and source files) - Zero Qt5:: references remaining in Lts/Services - QTextCodec, QDesktopWidget: No blocking issues found - QRegExp: 7 occurrences remain (deprecated but functional) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
c143ff8a4f
commit
d5af8b9764
1244 files changed
+4266
-4633
No files matched your search
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "socket_handler.h"
|
||||
#include <QtCore/QTimer>
|
||||
#include <QTimer>
|
||||
#include <QLatin1String>
|
||||
#include "nmea_handler.h"
|
||||
#include <QHostAddress>
|
||||
@@ -23,13 +23,14 @@ SocketHandler::SocketHandler(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
, TurnRadioMasterOffRequestHandler(ddsHandler->fts())
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_nmeaHandler(nmeaHandler)
|
||||
, m_logger(getLogger("SocketHandler"))
|
||||
{
|
||||
// create a timer
|
||||
m_reconnectTimer = new QTimer(this);
|
||||
|
||||
// setup signal and slot
|
||||
connect(m_reconnectTimer, &QTimer::timeout,
|
||||
this, &SocketHandler::reconnectTimerSlot);
|
||||
connect(m_reconnectTimer, SIGNAL(timeout()),
|
||||
this, SLOT(reconnectTimerSlot()));
|
||||
|
||||
}
|
||||
|
||||
@@ -38,11 +39,11 @@ void SocketHandler::init(QString nmeaHost, int nmeaPort)
|
||||
m_nmeaHost = nmeaHost;
|
||||
m_nmeaPort = nmeaPort;
|
||||
socket = new QUdpSocket(this);
|
||||
connect(socket, &QUdpSocket::connected, this, &SocketHandler::connected);
|
||||
connect(socket, &QUdpSocket::disconnected, this, &SocketHandler::disconnected);
|
||||
connect(socket, &QUdpSocket::readyRead, this, &SocketHandler::readyRead);
|
||||
connect(socket, SIGNAL(connected()), this, SLOT(connected()));
|
||||
connect(socket, SIGNAL(disconnected()), this, SLOT(disconnected()));
|
||||
connect(socket, SIGNAL(readyRead()), this, SLOT(readyRead()));
|
||||
|
||||
connect(socket, &QUdpSocket::bytesWritten, this, &SocketHandler::bytesWritten);
|
||||
connect(socket, SIGNAL(bytesWritten(qint64)), this, SLOT(bytesWritten(qint64)));
|
||||
|
||||
INFO_LOG(m_logger) << "Connecting,..";
|
||||
INFO_LOG(m_logger) << nmeaHost << " port: " << nmeaPort;
|
||||
|
||||
Reference in new issue
Block a user