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
@@ -5,9 +5,8 @@
|
||||
* $Author$
|
||||
* Created by Gerlinde Rudolphus, SLTE, 2022-06-09
|
||||
*/
|
||||
#include <QtCore/QTime>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QRegularExpression>
|
||||
#include <QTime>
|
||||
#include <QDateTime>
|
||||
#include "nmea_handler.h"
|
||||
namespace NmeaManagement
|
||||
{
|
||||
@@ -15,6 +14,7 @@ NmeaHandler::NmeaHandler(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_logger(getLogger("NmeaHandler"))
|
||||
{
|
||||
|
||||
}
|
||||
@@ -64,7 +64,7 @@ void NmeaHandler::IIXDR(QString package)
|
||||
|
||||
NmeaManagement::BatteryState batteryState;
|
||||
NmeaManagement::ServiceControl serviceControl;
|
||||
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
|
||||
QRegExp sep(QStringLiteral("(\\,|\\*)"));
|
||||
QStringList pkt_data = package.split(sep);
|
||||
INFO_LOG(m_logger) << "----------------------------------------------------";
|
||||
INFO_LOG(m_logger) << "batteryState pkt_data.size=" << pkt_data.size();
|
||||
@@ -185,7 +185,7 @@ qint64 NmeaHandler::getDateTime(QString receivedTimeStr)
|
||||
void NmeaHandler::IIALR(QString package)
|
||||
{
|
||||
NmeaManagement::BatteryAlarm batteryAlarm;
|
||||
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
|
||||
QRegExp sep(QStringLiteral("(\\,|\\*)"));
|
||||
QStringList pkt_data = package.split(sep);
|
||||
alarm_state packageData;
|
||||
INFO_LOG(m_logger) << "pkt_data.size=" << pkt_data.size();
|
||||
@@ -229,7 +229,7 @@ void NmeaHandler::GPGGA(QString package)
|
||||
NmeaManagement::PositionExcon PositionExcon;
|
||||
double latDecimal;
|
||||
double lonDecimal;
|
||||
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
|
||||
QRegExp sep(QStringLiteral("(\\,|\\*)"));
|
||||
QStringList pkt_data = package.split(sep);
|
||||
gpgga_data packageData;
|
||||
|
||||
@@ -316,7 +316,7 @@ void NmeaHandler::GPGGA(QString package)
|
||||
|
||||
void NmeaHandler::GPRMC(QString package)
|
||||
{
|
||||
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
|
||||
QRegExp sep(QStringLiteral("(\\,|\\*)"));
|
||||
QStringList pkt_data = package.split(sep);
|
||||
gprmc_data packageData;
|
||||
|
||||
|
||||
Reference in new issue
Block a user