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
+46
-65
@@ -1,118 +1,99 @@
|
||||
|
||||
|
||||
|
||||
#include "lts_combo_box.h"
|
||||
#include "lts_selection_popup.h"
|
||||
|
||||
#include "lts_message_dialog.h"
|
||||
#include "lts_selection_popup.h"
|
||||
|
||||
#include <QGuiApplication>
|
||||
#include <QShowEvent>
|
||||
|
||||
|
||||
#ifdef NEVER
|
||||
# include <QDebug>
|
||||
#endif
|
||||
#include <QDebug>
|
||||
#endif
|
||||
|
||||
namespace LtsWidgets
|
||||
{
|
||||
|
||||
bool LtsComboBox::s_useSelectionDialog = false;
|
||||
|
||||
LtsComboBox::LtsComboBox(QWidget *parent)
|
||||
: QComboBox(parent)
|
||||
, m_currentIndex(-1)
|
||||
LtsComboBox::LtsComboBox(QWidget* parent) : QComboBox(parent), m_currentIndex(-1)
|
||||
{
|
||||
connect(this, &LtsComboBox::signalExternallyChanged,
|
||||
this, &LtsComboBox::signalRefill);
|
||||
connect(this, &LtsComboBox::signalExternallyChanged, this, &LtsComboBox::signalRefill);
|
||||
}
|
||||
|
||||
void LtsComboBox::setUseSelectionDialog(bool bUseSelectionDialog)
|
||||
{
|
||||
s_useSelectionDialog = bUseSelectionDialog;
|
||||
s_useSelectionDialog = bUseSelectionDialog;
|
||||
}
|
||||
|
||||
void LtsComboBox::showEvent(QShowEvent *e)
|
||||
void LtsComboBox::showEvent(QShowEvent* e)
|
||||
{
|
||||
QComboBox::showEvent(e);
|
||||
QComboBox::showEvent(e);
|
||||
|
||||
m_currentIndex = currentIndex();
|
||||
m_currentIndex = currentIndex();
|
||||
}
|
||||
|
||||
void LtsComboBox::enterEvent(QEvent *e)
|
||||
void LtsComboBox::enterEvent(QEnterEvent* e)
|
||||
{
|
||||
BaseClass::enterEvent(e);
|
||||
emit signalEnterEvent();
|
||||
BaseClass::enterEvent(e);
|
||||
emit signalEnterEvent();
|
||||
}
|
||||
|
||||
void LtsComboBox::leaveEvent(QEvent *e)
|
||||
void LtsComboBox::leaveEvent(QEvent* e)
|
||||
{
|
||||
BaseClass::leaveEvent(e);
|
||||
emit signalLeaveEvent();
|
||||
BaseClass::leaveEvent(e);
|
||||
emit signalLeaveEvent();
|
||||
}
|
||||
|
||||
void LtsComboBox::showPopup()
|
||||
{
|
||||
bool bUseSelectionDialog = s_useSelectionDialog;
|
||||
if (QGuiApplication::queryKeyboardModifiers() == Qt::ControlModifier)
|
||||
bUseSelectionDialog = !bUseSelectionDialog;
|
||||
if (!bUseSelectionDialog)
|
||||
{
|
||||
QComboBox::showPopup();
|
||||
return;
|
||||
}
|
||||
bool bUseSelectionDialog = s_useSelectionDialog;
|
||||
if (QGuiApplication::queryKeyboardModifiers() == Qt::ControlModifier)
|
||||
bUseSelectionDialog = !bUseSelectionDialog;
|
||||
if (!bUseSelectionDialog)
|
||||
{
|
||||
QComboBox::showPopup();
|
||||
return;
|
||||
}
|
||||
|
||||
if (!model()->rowCount())
|
||||
{
|
||||
LtsWidgets::LtsMessageDialog::showMessage(this, tr("There are no items available!"));
|
||||
return;
|
||||
}
|
||||
if (!model()->rowCount())
|
||||
{
|
||||
LtsWidgets::LtsMessageDialog::showMessage(this, tr("There are no items available!"));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
LtsSelectionPopup* popup = new LtsSelectionPopup(model(), currentIndex(), this);
|
||||
popup->setAttribute(Qt::WA_DeleteOnClose);
|
||||
LtsSelectionPopup* popup = new LtsSelectionPopup(model(), currentIndex(), this);
|
||||
popup->setAttribute(Qt::WA_DeleteOnClose);
|
||||
|
||||
#ifdef NEVER
|
||||
|
||||
|
||||
|
||||
connect(popup, static_cast<void (LtsSelectionPopup::*)(int)>(&LtsSelectionPopup::currentIndexChanged), this,
|
||||
[](int idx) { qCritical() << " LtsComboBox: called: currentIndexChanged(int), idx=" << idx; });
|
||||
|
||||
connect(popup, static_cast<void (LtsSelectionPopup::*)(int)>(&LtsSelectionPopup::activated), this,
|
||||
[](int idx) { qCritical() << " LtsComboBox: called: activated(int), idx=" << idx; });
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
connect(popup, static_cast<void (LtsSelectionPopup::*)(int)>(&LtsSelectionPopup::currentIndexChanged), this, [](int idx){
|
||||
qCritical() << " LtsComboBox: called: currentIndexChanged(int), idx=" << idx;
|
||||
});
|
||||
connect(popup, &LtsSelectionPopup::currentIndexChanged, this, &LtsComboBox::userChangedIndex);
|
||||
connect(popup, &LtsSelectionPopup::activated, this,
|
||||
static_cast<void (LtsComboBox::*)(int)>(&LtsComboBox::activated));
|
||||
|
||||
|
||||
connect(popup, static_cast<void (LtsSelectionPopup::*)(int)>(&LtsSelectionPopup::activated), this, [](int idx){
|
||||
qCritical() << " LtsComboBox: called: activated(int), idx=" << idx;
|
||||
});
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
connect(popup, &LtsSelectionPopup::currentIndexChanged,
|
||||
this, &LtsComboBox::userChangedIndex);
|
||||
connect(popup, &LtsSelectionPopup::activated,
|
||||
this, static_cast<void (LtsComboBox::*)(int)>(&LtsComboBox::activated));
|
||||
|
||||
popup->show();
|
||||
popup->show();
|
||||
}
|
||||
|
||||
|
||||
void LtsComboBox::userChangedIndex(int index)
|
||||
{
|
||||
m_currentIndex = index;
|
||||
setCurrentIndex(index);
|
||||
m_currentIndex = index;
|
||||
setCurrentIndex(index);
|
||||
}
|
||||
|
||||
|
||||
bool LtsComboBox::hasValueChanged() const
|
||||
{
|
||||
if (m_currentIndex == -1)
|
||||
return false;
|
||||
return !(currentIndex() == m_currentIndex);
|
||||
if (m_currentIndex == -1)
|
||||
return false;
|
||||
return !(currentIndex() == m_currentIndex);
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace LtsWidgets
|
||||
Reference in new issue
Block a user