Qt6 migration: LtsWidgets API fixes, LtsWebSocket logger init, RTI Docker install
- LtsWidgets: Fixed Qt6 API compatibility issues - QWheelEvent::delta() → angleDelta().y() - QStyleOption::init() → initFrom() - QComboBox activated signal signature change - QTextCodec removal (UTF-8 default in Qt6) - Missing widget includes added - LtsWebSocket: Fixed m_logger reference initialization - Added NGLLoggerBootstrap includes - Proper initialization in constructor initializer lists - CMake: Added BUILD_LTSWEBSOCKET option for temporary exclusion - Docker: RTI Connext permanent installation script added - ci/install-rti-in-docker.sh for persistent RTI setup - Removes need for volume mounting RTI into container - BUILD options: FilterManagement, RTI, Codification, Grantlee, LtsWebSocket can be disabled for partial builds during migration Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
69 files changed
+12765
-14202
No files matched your search
Executable → Regular
+59
-64
@@ -2,25 +2,21 @@
|
||||
|
||||
#include "lts_abstract_sequence_widget.h"
|
||||
|
||||
#include <QRegularExpression>
|
||||
#include <QToolButton>
|
||||
|
||||
namespace LtsWidgets
|
||||
{
|
||||
|
||||
LtsAbstractSequenceWidget::LtsAbstractSequenceWidget(QWidget *parent, const bool &readOnly)
|
||||
: QGroupBox(parent)
|
||||
, m_readOnly(readOnly)
|
||||
, m_pbAddMember(new QToolButton)
|
||||
LtsAbstractSequenceWidget::LtsAbstractSequenceWidget(QWidget* parent, const bool& readOnly)
|
||||
: QGroupBox(parent), m_readOnly(readOnly), m_pbAddMember(new QToolButton)
|
||||
{
|
||||
m_pbAddMember->setIcon(QIcon(QLatin1String(":/icons/png/add.png")));
|
||||
m_pbAddMember->setIcon(QIcon(QLatin1String(":/icons/png/add.png")));
|
||||
|
||||
connect(m_pbAddMember, &QToolButton::clicked, this, &LtsAbstractSequenceWidget::addMember);
|
||||
connect(m_pbAddMember, &QToolButton::clicked, this, &LtsAbstractSequenceWidget::addMember);
|
||||
}
|
||||
|
||||
LtsAbstractSequenceWidget::~LtsAbstractSequenceWidget()
|
||||
{
|
||||
|
||||
}
|
||||
LtsAbstractSequenceWidget::~LtsAbstractSequenceWidget() {}
|
||||
|
||||
void LtsAbstractSequenceWidget::addWidget(QWidget* widget, bool isReadOnly, bool isButtonVisible)
|
||||
{
|
||||
@@ -29,92 +25,91 @@ void LtsAbstractSequenceWidget::addWidget(QWidget* widget, bool isReadOnly, bool
|
||||
m_pbAddMember->setVisible(isButtonVisible);
|
||||
}
|
||||
|
||||
int LtsAbstractSequenceWidget::getMemberlistSize(){
|
||||
return m_memberList.size();
|
||||
int LtsAbstractSequenceWidget::getMemberlistSize()
|
||||
{
|
||||
return m_memberList.size();
|
||||
}
|
||||
|
||||
void LtsAbstractSequenceWidget::getValue(QWidget *data,
|
||||
const QString &findObjectName) const
|
||||
void LtsAbstractSequenceWidget::getValue(QWidget* data, const QString& findObjectName) const
|
||||
{
|
||||
|
||||
if(!findChild<QWidget *>(findObjectName))
|
||||
return;
|
||||
if (!findChild<QWidget*>(findObjectName))
|
||||
return;
|
||||
|
||||
data = findChild<QWidget *>(findObjectName);
|
||||
data = findChild<QWidget*>(findObjectName);
|
||||
}
|
||||
|
||||
void LtsAbstractSequenceWidget::setMemberCount(int count)
|
||||
{
|
||||
QWidget *child = nullptr;
|
||||
do
|
||||
{
|
||||
child = findChild<QWidget *>(getObjectName(++count));
|
||||
delete child;
|
||||
}
|
||||
while (child);
|
||||
m_memberList.removeAll(nullptr);
|
||||
QWidget* child = nullptr;
|
||||
do
|
||||
{
|
||||
child = findChild<QWidget*>(getObjectName(++count));
|
||||
delete child;
|
||||
} while (child);
|
||||
m_memberList.removeAll(nullptr);
|
||||
}
|
||||
|
||||
uint32_t LtsAbstractSequenceWidget::getMemberCount() const
|
||||
{
|
||||
int count = 0;
|
||||
QWidget *child = findChild<QWidget *>(getObjectName(count+1));
|
||||
while(child)
|
||||
{
|
||||
count++;
|
||||
child = findChild<QWidget *>(getObjectName(count+1));
|
||||
}
|
||||
return count;
|
||||
int count = 0;
|
||||
QWidget* child = findChild<QWidget*>(getObjectName(count + 1));
|
||||
while (child)
|
||||
{
|
||||
count++;
|
||||
child = findChild<QWidget*>(getObjectName(count + 1));
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
QToolButton *LtsAbstractSequenceWidget::pbAddMember() const
|
||||
QToolButton* LtsAbstractSequenceWidget::pbAddMember() const
|
||||
{
|
||||
return m_pbAddMember;
|
||||
return m_pbAddMember;
|
||||
}
|
||||
|
||||
QString LtsAbstractSequenceWidget::getObjectName(int index) const
|
||||
{
|
||||
return QString::number(index);
|
||||
return QString::number(index);
|
||||
}
|
||||
|
||||
void LtsAbstractSequenceWidget::addMemberWidget(QWidget *member, bool isReadOnly, bool isButtonVisible)
|
||||
void LtsAbstractSequenceWidget::addMemberWidget(QWidget* member, bool isReadOnly, bool isButtonVisible)
|
||||
{
|
||||
QToolButton *button = new QToolButton();
|
||||
button->setIcon(QIcon(QLatin1String(":/icons/png/remove.png")));
|
||||
button->setDisabled(isReadOnly);
|
||||
QToolButton* button = new QToolButton();
|
||||
button->setIcon(QIcon(QLatin1String(":/icons/png/remove.png")));
|
||||
button->setDisabled(isReadOnly);
|
||||
|
||||
connect(button, &QToolButton::clicked, member, &QWidget::deleteLater);
|
||||
connect(member, &QWidget::destroyed, this, &LtsAbstractSequenceWidget::deleteMemberWidget);
|
||||
connect(member, &QWidget::destroyed, button, &QToolButton::deleteLater);
|
||||
connect(button, &QToolButton::clicked, member, &QWidget::deleteLater);
|
||||
connect(member, &QWidget::destroyed, this, &LtsAbstractSequenceWidget::deleteMemberWidget);
|
||||
connect(member, &QWidget::destroyed, button, &QToolButton::deleteLater);
|
||||
|
||||
m_memberList.push_back(member);
|
||||
setupMemberWidget(member, button, member->objectName(), isButtonVisible);
|
||||
m_memberList.push_back(member);
|
||||
setupMemberWidget(member, button, member->objectName(), isButtonVisible);
|
||||
}
|
||||
|
||||
void LtsAbstractSequenceWidget::deleteMemberWidget(QObject *member)
|
||||
void LtsAbstractSequenceWidget::deleteMemberWidget(QObject* member)
|
||||
{
|
||||
QWidget *w = qobject_cast<QWidget*>(member);
|
||||
QWidget* w = qobject_cast<QWidget*>(member);
|
||||
|
||||
if(!w)
|
||||
return;
|
||||
if (!w)
|
||||
return;
|
||||
|
||||
for(auto child : w->children())
|
||||
child->deleteLater();
|
||||
for (auto child : w->children())
|
||||
child->deleteLater();
|
||||
|
||||
m_memberList.removeAll(w);
|
||||
for(int i=0; i<m_memberList.size(); i++)
|
||||
{
|
||||
m_memberList[i]->setObjectName(getObjectName(i + 1));
|
||||
|
||||
for(auto child : m_memberList[i]->children())
|
||||
m_memberList.removeAll(w);
|
||||
for (int i = 0; i < m_memberList.size(); i++)
|
||||
{
|
||||
if(child->objectName().isEmpty())
|
||||
continue;
|
||||
m_memberList[i]->setObjectName(getObjectName(i + 1));
|
||||
|
||||
QString childName = child->objectName();
|
||||
QString newId = QString::number(i + 1);
|
||||
child->setObjectName(childName.replace(QRegExp(QLatin1String(".([0-9]*)")), newId));
|
||||
for (auto child : m_memberList[i]->children())
|
||||
{
|
||||
if (child->objectName().isEmpty())
|
||||
continue;
|
||||
|
||||
QString childName = child->objectName();
|
||||
QString newId = QString::number(i + 1);
|
||||
child->setObjectName(childName.replace(QRegularExpression(QLatin1String("\\.([0-9]*)")), newId));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace LtsWidgets
|
||||
Reference in new issue
Block a user