Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.cpp

@@ -223,14 +223,14 @@ void LtsTextEditor2::setupFileActions()
   const QIcon exportPdfIcon = QIcon::fromTheme(QStringLiteral("exportpdf"), QIcon(rsrcPath()+ QStringLiteral("/exportpdf.png")));
   actionExport = menu->addAction(exportPdfIcon, tr("&Export PDF..."), this, &LtsTextEditor2::filePrintPdf);
   actionExport->setPriority(QAction::LowPriority);
-  actionExport->setShortcut(Qt::CTRL + Qt::Key_D);
+  actionExport->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_D));
   tb->addAction(actionExport);
 
   menu->addSeparator();
 #endif
 
   m_actionQuit = menu->addAction(tr("&Quit"), this, &QWidget::close);
-  m_actionQuit->setShortcut(Qt::CTRL + Qt::Key_Q);
+  m_actionQuit->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_Q));
 }
 
 void LtsTextEditor2::setupEditActions()
@@ -281,7 +281,7 @@ void LtsTextEditor2::setupTextActions()
 
   const QIcon boldIcon = QIcon::fromTheme(QStringLiteral(":icons/22x22/format-text-bold.png"));
   m_actionTextBold = menu->addAction(boldIcon, tr("&Bold"), this, &LtsTextEditor2::onTextBold);
-  m_actionTextBold->setShortcut(Qt::CTRL + Qt::Key_B);
+  m_actionTextBold->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_B));
   m_actionTextBold->setPriority(QAction::LowPriority);
   QFont bold;
   bold.setBold(true);
@@ -292,7 +292,7 @@ void LtsTextEditor2::setupTextActions()
   const QIcon italicIcon = QIcon::fromTheme(QStringLiteral(":icons/22x22/format-text-italic.png"));
   m_actionTextItalic = menu->addAction(italicIcon, tr("&Italic"), this, &LtsTextEditor2::onTextItalic);
   m_actionTextItalic->setPriority(QAction::LowPriority);
-  m_actionTextItalic->setShortcut(Qt::CTRL + Qt::Key_I);
+  m_actionTextItalic->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_I));
   QFont italic;
   italic.setItalic(true);
   m_actionTextItalic->setFont(italic);
@@ -301,7 +301,7 @@ void LtsTextEditor2::setupTextActions()
 
   const QIcon underlineIcon = QIcon::fromTheme(QStringLiteral(":icons/22x22/format-text-underline.png"));
   m_actionTextUnderline = menu->addAction(underlineIcon, tr("&Underline"), this, &LtsTextEditor2::onTextUnderline);
-  m_actionTextUnderline->setShortcut(Qt::CTRL + Qt::Key_U);
+  m_actionTextUnderline->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_U));
   m_actionTextUnderline->setPriority(QAction::LowPriority);
   QFont underline;
   underline.setUnderline(true);
@@ -313,31 +313,31 @@ void LtsTextEditor2::setupTextActions()
 
   const QIcon leftIcon = QIcon::fromTheme(QStringLiteral(":icons/22x22/format-justify-left.png"));
   m_actionAlignLeft = new QAction(leftIcon, tr("&Left"), this);
-  m_actionAlignLeft->setShortcut(Qt::CTRL + Qt::Key_L);
+  m_actionAlignLeft->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_L));
   m_actionAlignLeft->setCheckable(true);
   m_actionAlignLeft->setPriority(QAction::LowPriority);
   const QIcon centerIcon = QIcon::fromTheme(QStringLiteral(":icons/22x22/format-justify-center.png"));
   m_actionAlignCenter = new QAction(centerIcon, tr("C&enter"), this);
-  m_actionAlignCenter->setShortcut(Qt::CTRL + Qt::Key_E);
+  m_actionAlignCenter->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_E));
   m_actionAlignCenter->setCheckable(true);
   m_actionAlignCenter->setPriority(QAction::LowPriority);
   const QIcon rightIcon = QIcon::fromTheme(QStringLiteral(":icons/22x22/format-justify-right.png"));
   m_actionAlignRight = new QAction(rightIcon, tr("&Right"), this);
-  m_actionAlignRight->setShortcut(Qt::CTRL + Qt::Key_R);
+  m_actionAlignRight->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_R));
   m_actionAlignRight->setCheckable(true);
   m_actionAlignRight->setPriority(QAction::LowPriority);
   const QIcon fillIcon = QIcon::fromTheme(QStringLiteral(":icons/22x22/format-justify-fill.png"));
   m_actionAlignJustify = new QAction(fillIcon, tr("&Justify"), this);
-  m_actionAlignJustify->setShortcut(Qt::CTRL + Qt::Key_J);
+  m_actionAlignJustify->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_J));
   m_actionAlignJustify->setCheckable(true);
   m_actionAlignJustify->setPriority(QAction::LowPriority);
   const QIcon indentMoreIcon = QIcon::fromTheme(QStringLiteral("format-indent-more"), QIcon(rsrcPath()+ QStringLiteral("/format-indent-more.png")));
   m_actionIndentMore = menu->addAction(indentMoreIcon, tr("&Indent"), this, &LtsTextEditor2::indent);
-  m_actionIndentMore->setShortcut(Qt::CTRL + Qt::Key_BracketRight);
+  m_actionIndentMore->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_BracketRight));
   m_actionIndentMore->setPriority(QAction::LowPriority);
   const QIcon indentLessIcon = QIcon::fromTheme(QStringLiteral("format-indent-less"), QIcon(rsrcPath()+ QStringLiteral("/format-indent-less.png")));
   m_actionIndentLess = menu->addAction(indentLessIcon, tr("&Unindent"), this, &LtsTextEditor2::unindent);
-  m_actionIndentLess->setShortcut(Qt::CTRL + Qt::Key_BracketLeft);
+  m_actionIndentLess->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_BracketLeft));
   m_actionIndentLess->setPriority(QAction::LowPriority);
 
   // Make sure the alignLeft  is always left of the alignRight
@@ -381,7 +381,7 @@ void LtsTextEditor2::setupTextActions()
 
   const QIcon checkboxIcon = QIcon::fromTheme(QStringLiteral("status-checkbox-checked"), QIcon(rsrcPath()+ QStringLiteral("/checkbox-checked.png")));
   m_actionToggleCheckState = menu->addAction(checkboxIcon, tr("Chec&ked"), this, &LtsTextEditor2::setChecked);
-  m_actionToggleCheckState->setShortcut(Qt::CTRL + Qt::Key_K);
+  m_actionToggleCheckState->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_K));
   m_actionToggleCheckState->setCheckable(true);
   m_actionToggleCheckState->setPriority(QAction::LowPriority);
   tb->addAction(m_actionToggleCheckState);