lifemaps/qt6-migration-pipeline
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt6: nglcompression, widgets, dialog fixes: remove QTextCodec, QStringRef/splitRef, QDesktopWidget, use QMultiMap and Qt6 APIs; adjust QtConcurrent::run wrappers; replace endl with newline

Browse Source
This commit is contained in:
torsten committed 2026-07-14 20:38:30 +02:00
1 parent 17f1c61c9e
commit f744a8c37a
328 files changed
+53567 -112
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Z/src/nglwidgets/ngldialogbuttonbox.cpp
+6 -6
View File
@@ -93,7 +93,7 @@ void NGLDialogButtonBox::addButtonInternal(NGLStandardButton *button)
button->setDefault(false);
button->setAutoDefault(false);
m_standardButtons.insertMulti(button->layoutPriority(), button);
m_standardButtons.insert(button->layoutPriority(), button);
}
void NGLDialogButtonBox::addButton(NGLStandardButton *button)
@@ -168,14 +168,14 @@ bool NGLDialogButtonBox::setVisible(NGLStandardButton::StandardButton button, bo
void NGLDialogButtonBox::layoutPriorityChanged()
{
QMap<qint32, NGLStandardButton *> standardButtons = m_standardButtons;
QMultiMap<qint32, NGLStandardButton *> standardButtons = m_standardButtons;
m_standardButtons.clear();
QMap<int, NGLStandardButton *>::const_iterator it = standardButtons.constBegin();
QMap<int, NGLStandardButton *>::const_iterator end = standardButtons.constEnd();
QMultiMap<int, NGLStandardButton *>::const_iterator it = standardButtons.constBegin();
QMultiMap<int, NGLStandardButton *>::const_iterator end = standardButtons.constEnd();
for (; it != end; ++it)
{
NGLStandardButton *button = it.value();
m_standardButtons.insertMulti(button->layoutPriority(), button);
m_standardButtons.insert(button->layoutPriority(), button);
}
init();
@@ -212,7 +212,7 @@ void NGLDialogButtonBox::init()
lMain = new QHBoxLayout;
l = new QVBoxLayout;
}
lMain->setMargin(0);
lMain->setContentsMargins(0,0,0,0);
if (m_bLineVisible)
{
m_line = new QFrame(this);