OMEdit: Qt6 compatibility

CMakeLists.txt

@@ -161,6 +161,9 @@ endif()
 omc_add_subdirectory(OMCompiler)
 
 if(OM_ENABLE_GUI_CLIENTS)
+  # select qt version 5/6
+  set (OM_QT_MAJOR_VERSION 5 CACHE STRING "Qt version")
+
   omc_add_subdirectory(OMParser)
   omc_add_subdirectory(OMPlot)
   omc_add_subdirectory(OMShell)

OMEdit/CMakeLists.txt

@@ -10,8 +10,8 @@ omc_option(OM_OMEDIT_ENABLE_TESTS "Enable building of OMEdit Testsuite tests." O
 omc_option(OM_OMEDIT_ENABLE_QTWEBENGINE "Enable building of OMEdit with QtWebEngine instead of QtWebkit" OFF)
 omc_option(OM_OMEDIT_ENABLE_LIBXML2 "Enable building of OMEdit with LibXml2 instead of XmlPatterns." OFF)
 
-set (OM_QT_MAJOR_VERSION 5 CACHE STRING "Qt version")
 find_package(Qt${OM_QT_MAJOR_VERSION} COMPONENTS Widgets PrintSupport Xml OpenGL Network Svg REQUIRED)
+
 if (OM_OMEDIT_ENABLE_QTWEBENGINE OR OM_QT_MAJOR_VERSION VERSION_GREATER_EQUAL 6)
   find_package(Qt${OM_QT_MAJOR_VERSION} COMPONENTS WebEngineWidgets REQUIRED)
 else ()
@@ -24,6 +24,10 @@ else ()
   find_package(Qt${OM_QT_MAJOR_VERSION} COMPONENTS XmlPatterns REQUIRED)
 endif ()
 
+if (OM_QT_MAJOR_VERSION VERSION_GREATER_EQUAL 6)
+  find_package(Qt6 COMPONENTS OpenGLWidgets Core5Compat REQUIRED)
+endif ()
+
 find_package(OpenSceneGraph COMPONENTS osg osgViewer osgUtil osgDB osgGA REQUIRED)
 find_package(OpenGL REQUIRED)
 

OMEdit/OMEditLIB/Animation/AbstractAnimationWindow.cpp

@@ -280,7 +280,7 @@ void AbstractAnimationWindow::initInteractiveControlPanel()
 
       QWidget* stateValWidget = new QWidget();
       QHBoxLayout *stateInfoLayout = new QHBoxLayout();
-      stateInfoLayout->setMargin(0);
+      stateInfoLayout->setContentsMargins(0, 0, 0, 0);
       stateInfoLayout->addWidget(stateLabel);
       stateInfoLayout->addWidget(spinBox);
       stateValWidget->setLayout(stateInfoLayout);

OMEdit/OMEditLIB/Annotations/ShapeAnnotation.cpp

@@ -701,7 +701,7 @@ void ShapeAnnotation::applyTransformation()
     const qreal y = Utilities::mapToCoOrdinateSystem(scenePos().y(), bottom, top, extendsCoOrdinateExtents.at(0).y(), extendsCoOrdinateExtents.at(1).y());
     QTransform finalTransform(scaledTransform.m11(), scaledTransform.m12(), scaledTransform.m13(),
                               scaledTransform.m21(), scaledTransform.m22(), scaledTransform.m23(),
-                              x, y);
+                              x, y, 1.0);
     setTransform(finalTransform);
   }
   updateCornerItems();

OMEdit/OMEditLIB/Annotations/StringAnnotation.cpp

@@ -92,7 +92,11 @@ QString& StringAnnotation::replace(int position, int n, QChar after)
 
 QString& StringAnnotation::replace(const QRegExp &rx, const QString &after)
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+  mValue = rx.replaceIn(mValue, after);
+#else
   mValue.replace(rx, after);
+#endif
   setExp();
   return mValue;
 }

OMEdit/OMEditLIB/Annotations/StringAnnotation.h

@@ -30,6 +30,8 @@
 #ifndef STRINGANNOTATION_H
 #define STRINGANNOTATION_H
 
+#include <QRegExp>
+
 #include "DynamicAnnotation.h"
 
 class StringAnnotation : public DynamicAnnotation

OMEdit/OMEditLIB/CMakeLists.txt

@@ -329,6 +329,17 @@ else ()
   target_link_libraries(OMEditLib PUBLIC Qt${OM_QT_MAJOR_VERSION}::XmlPatterns)
 endif ()
 
+target_link_libraries(OMEditLib PUBLIC Qt${OM_QT_MAJOR_VERSION}::OpenGL)
+if (OM_QT_MAJOR_VERSION VERSION_GREATER_EQUAL 6)
+  target_link_libraries(OMEditLib PUBLIC Qt${OM_QT_MAJOR_VERSION}::OpenGLWidgets)
+endif ()
+target_link_libraries(OMEditLib PUBLIC Qt${OM_QT_MAJOR_VERSION}::Network)
+target_link_libraries(OMEditLib PUBLIC Qt${OM_QT_MAJOR_VERSION}::Svg)
+
+if (OM_QT_MAJOR_VERSION VERSION_GREATER_EQUAL 6)
+  target_link_libraries(OMEditLib PUBLIC Qt6::Core5Compat)
+endif ()
+
 target_link_libraries(OMEditLib PUBLIC omc::3rd::opcua)
 target_link_libraries(OMEditLib PUBLIC OMPlotLib)
 target_link_libraries(OMEditLib PUBLIC OpenModelicaCompiler)

OMEdit/OMEditLIB/CrashReport/CrashReportDialog.cpp

@@ -214,7 +214,11 @@ void CrashReportDialog::createGDBBacktrace()
     stackTraceFile.setFileName(OMStackTraceFilePath);
     if (stackTraceFile.open(QIODevice::WriteOnly)) {
       QTextStream out(&stackTraceFile);
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+      out.setEncoding(QStringConverter::Utf8);
+#else
       out.setCodec(Helper::utf8.toUtf8().constData());
+#endif
       out.setGenerateByteOrderMark(false);
       out << mStackTrace;
       out.flush();

OMEdit/OMEditLIB/CrashReport/GDBBacktrace.cpp

@@ -100,7 +100,11 @@ QString GDBBacktrace::createCommandsFile(QString *errorString)
   gdbBacktraceCommandsFile.setFileName(gdbBacktraceCommandsFilePath);
   if (gdbBacktraceCommandsFile.open(QIODevice::WriteOnly)) {
     QTextStream out(&gdbBacktraceCommandsFile);
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    out.setEncoding(QStringConverter::Utf8);
+#else
     out.setCodec(Helper::utf8.toUtf8().constData());
+#endif
     out.setGenerateByteOrderMark(false);
     out << gdbBatchCommands;
     out.flush();

OMEdit/OMEditLIB/Debugger/Attach/AttachToProcessDialog.cpp

@@ -41,6 +41,10 @@
 #include <QMessageBox>
 #include <QGridLayout>
 
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+#define setFilterRegularExpression setFilterRegExp
+#endif
+
 /*!
  * \class AttachToProcessDialog
  * \brief Provides interface for attaching a debugger to a running process.
@@ -63,7 +67,7 @@ AttachToProcessDialog::AttachToProcessDialog(QWidget *pParent)
   // processes tree view model & proxy
   mpProcessListModel = new ProcessListModel;
   mProcessListFilterModel.setSourceModel(mpProcessListModel);
-  mProcessListFilterModel.setFilterRegExp(mpFilterProcessesTextBox->text());
+  mProcessListFilterModel.setFilterRegularExpression(mpFilterProcessesTextBox->text());
   // processes tree view
   mpProcessesTreeView = new QTreeView;
   mpProcessesTreeView->setItemDelegate(new ItemDelegate(mpProcessesTreeView));
@@ -150,7 +154,7 @@ void AttachToProcessDialog::processIDChanged(const QString &pid)
   */
 void AttachToProcessDialog::setFilterString(const QString &filter)
 {
-  mProcessListFilterModel.setFilterRegExp(filter);
+  mProcessListFilterModel.setFilterRegularExpression(filter);
   // Activate the line edit if there's a unique filtered process.
   QString processId;
   if (mProcessListFilterModel.rowCount(QModelIndex()) == 1)

OMEdit/OMEditLIB/Debugger/GDB/GDBAdapter.cpp

@@ -886,7 +886,11 @@ void GDBAdapter::handleGDBProcessStartedHelper()
   mDebuggerLogFile.setFileName(QString("%1omeditdebugger.log").arg(tmpPath));
   if (mDebuggerLogFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
     mDebuggerLogFileTextStream.setDevice(&mDebuggerLogFile);
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    mDebuggerLogFileTextStream.setEncoding(QStringConverter::Utf8);
+#else
     mDebuggerLogFileTextStream.setCodec(Helper::utf8.toUtf8().constData());
+#endif
     mDebuggerLogFileTextStream.setGenerateByteOrderMark(false);
   }
   emit GDBProcessStarted();

OMEdit/OMEditLIB/Editors/BaseEditor.cpp

@@ -1648,7 +1648,7 @@ void PlainTextEdit::keyPressEvent(QKeyEvent *pEvent)
   bool shiftModifier = pEvent->modifiers().testFlag(Qt::ShiftModifier);
   bool controlModifier = pEvent->modifiers().testFlag(Qt::ControlModifier);
   bool isCompleterShortcut = controlModifier && (pEvent->key() == Qt::Key_Space); // CTRL+space
-  bool isCompleterChar = mCompletionCharacters.indexOf(pEvent->key()) != -1;
+  bool isCompleterChar = mCompletionCharacters.indexOf(QChar(pEvent->key())) != -1;
   /* Ticket #4404. hide the completer on Esc and enter text based on Tab */
   if (mpCompleter && mpCompleter->popup()->isVisible()) {
     // The following keys are forwarded by the completer to the widget
@@ -2562,8 +2562,7 @@ FindReplaceWidget::FindReplaceWidget(BaseEditor *pBaseEditor)
   pOptionsHorizontalLayout->addWidget(mpReplaceAllButton);
   // set main layout
   QGridLayout *pMainLayout = new QGridLayout;
-  pMainLayout->setContentsMargins(0, 0, 0, 0);
-  pMainLayout->setMargin(2);
+  pMainLayout->setContentsMargins(2, 2, 2, 2);
   pMainLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
   pMainLayout->addWidget(mpFindLabel, 0, 0);
   pMainLayout->addWidget(mpFindComboBox, 0, 1);
@@ -2665,7 +2664,7 @@ void FindReplaceWidget::findText(bool forward)
   }
 
   if (mpRegularExpressionCheckBox->isChecked()) {
-    QRegExp reg(textToFind, (mpCaseSensitiveCheckBox->isChecked() ? Qt::CaseSensitive : Qt::CaseInsensitive));
+    QRegularExpression reg(textToFind, (mpCaseSensitiveCheckBox->isChecked() ? QRegularExpression::CaseInsensitiveOption : QRegularExpression::NoPatternOption));
     currentTextCursor = mpBaseEditor->getPlainTextEdit()->document()->find(reg, currentTextCursor, flags);
     mpBaseEditor->getPlainTextEdit()->setTextCursor(currentTextCursor);
   }
@@ -2893,8 +2892,7 @@ InfoBar::InfoBar(QWidget *pParent)
   connect(mpCloseButton, SIGNAL(clicked()), SLOT(hide()));
   // set the layout
   QHBoxLayout *pMainLayout = new QHBoxLayout;
-  pMainLayout->setContentsMargins(0, 0, 0, 0);
-  pMainLayout->setMargin(2);
+  pMainLayout->setContentsMargins(2, 2, 2, 2);
   pMainLayout->addWidget(mpInfoLabel);
   pMainLayout->addWidget(mpCloseButton, 0, Qt::AlignTop);
   setLayout(pMainLayout);

OMEdit/OMEditLIB/Editors/CEditor.h

@@ -34,6 +34,7 @@
 #ifndef CEDITOR_H
 #define CEDITOR_H
 
+#include <QRegExp>
 #include <QSyntaxHighlighter>
 #include <QPlainTextEdit>
 

OMEdit/OMEditLIB/Editors/HTMLEditor.h

@@ -34,6 +34,7 @@
 #ifndef HTMLEDITOR_H
 #define HTMLEDITOR_H
 
+#include <QRegExp>
 #include <QSyntaxHighlighter>
 #include <QPlainTextEdit>
 

OMEdit/OMEditLIB/Editors/MetaModelicaEditor.h

@@ -35,6 +35,7 @@
 
 #include "Editors/BaseEditor.h"
 
+#include <QRegExp>
 #include <QSyntaxHighlighter>
 
 class MetaModelicaEditorPage;

OMEdit/OMEditLIB/Editors/ModelicaEditor.h

@@ -39,6 +39,7 @@
 #include "Util/Utilities.h"
 #include "Editors/BaseEditor.h"
 
+#include <QRegExp>
 #include <QSyntaxHighlighter>
 
 class ModelWidget;

OMEdit/OMEditLIB/Editors/OMSimulatorEditor.h

@@ -36,6 +36,7 @@
 
 #include "Editors/BaseEditor.h"
 
+#include <QRegExp>
 #include <QSyntaxHighlighter>
 
 class OMSimulatorEditor : public BaseEditor

OMEdit/OMEditLIB/Element/ElementProperties.cpp

@@ -46,7 +46,6 @@
 #include <QButtonGroup>
 #include <QMessageBox>
 #include <QDesktopServices>
-#include <QDesktopWidget>
 #include <QList>
 #include <QScreen>
 #include <QStringList>
@@ -930,7 +929,7 @@ void Parameter::editClassButtonClicked()
   if ((mpModelInstanceElement == NULL) ||
       (mpModelInstanceElement->getTopLevelExtendElement() == NULL) ||
       (mpModelInstanceElement->getTopLevelExtendElement()->getParentModel() == NULL) ||
-      (mpModelInstanceElement->getTopLevelExtendElement()->getParentModel()->getName() == NULL))
+      (mpModelInstanceElement->getTopLevelExtendElement()->getParentModel()->getName() == QString()))
   {
     QMessageBox::critical(MainWindow::instance(), QString("%1 - %2").arg(Helper::applicationName, Helper::error),
                           tr("Unable to find the redeclare class."), Helper::ok);

OMEdit/OMEditLIB/MainWindow.cpp

@@ -126,9 +126,11 @@ MainWindow::MainWindow(QWidget *parent)
    * Because RecentFile, FindTextOM and DebuggerConfiguration structs should be registered before reading the recentFilesList, FindTextOM and
    * DebuggerConfiguration section respectively from the settings file.
    */
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
   qRegisterMetaTypeStreamOperators<RecentFile>("RecentFile");
   qRegisterMetaTypeStreamOperators<FindTextOM>("FindTextOM");
   qRegisterMetaTypeStreamOperators<DebuggerConfiguration>("DebuggerConfiguration");
+#endif
   /*! @note The above three lines registers the structs as QMetaObjects. Do not remove/move them. */
   qRegisterMetaType<QProcess::ProcessError>("QProcess::ProcessError");
   qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
@@ -1483,7 +1485,11 @@ void MainWindow::exportModelToOMNotebook(LibraryTreeItem *pLibraryTreeItem)
   QFile omnotebookFile(omnotebookFileName);
   omnotebookFile.open(QIODevice::WriteOnly);
   QTextStream textStream(&omnotebookFile);
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+  textStream.setEncoding(QStringConverter::Utf8);
+#else
   textStream.setCodec(Helper::utf8.toUtf8().constData());
+#endif
   textStream.setGenerateByteOrderMark(false);
   textStream << xmlDocument.toString();
   omnotebookFile.close();

OMEdit/OMEditLIB/Modeling/DocumentationWidget.cpp

@@ -47,7 +47,6 @@
 #include <QMenu>
 #include <QDesktopServices>
 #include <QApplication>
-#include <QDesktopWidget>
 #ifdef OM_OMEDIT_ENABLE_QTWEBENGINE
 #include <QWebEnginePage>
 #include <QWebEngineSettings>
@@ -652,7 +651,11 @@ void DocumentationWidget::writeDocumentationFile(QString documentation)
   /* Create a local file with the html we want to view as otherwise JavaScript does not run properly. */
   mDocumentationFile.open(QIODevice::WriteOnly);
   QTextStream out(&mDocumentationFile);
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+  out.setEncoding(QStringConverter::Utf8);
+#else
   out.setCodec(Helper::utf8.toUtf8().constData());
+#endif
   out << documentation;
   mDocumentationFile.close();
 }

OMEdit/OMEditLIB/Modeling/LibraryTreeWidget.cpp

@@ -438,7 +438,7 @@ QString LibraryTreeItem::getTooltip() const {
       tooltip = QString("%1 %2<br />%3: %4<br />%5: %6<br />%7: %8<br />%9: %10")
                 .arg(Helper::name).arg(mName)
                 .arg(Helper::type).arg("TLM Bus")
-                .arg("Domain").arg(QString(mpOMSTLMBusConnector->domain))
+                .arg("Domain").arg(QString::number(mpOMSTLMBusConnector->domain))
                 .arg("Dimensions").arg(QString::number(mpOMSTLMBusConnector->dimensions))
                 .arg("Interpolation").arg(OMSProxy::getInterpolationString(mpOMSTLMBusConnector->interpolation));
     }
@@ -1204,7 +1204,11 @@ bool LibraryTreeProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &s
     if (hide) {
       return false;
     } else {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+      return pLibraryTreeItem->getNameStructure().contains(filterRegularExpression());
+#else
       return pLibraryTreeItem->getNameStructure().contains(filterRegExp());
+#endif
     }
   } else {
     return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
@@ -1393,7 +1397,11 @@ LibraryTreeItem* LibraryTreeModel::findLibraryTreeItem(const QRegExp &regExp, Li
   if (!pLibraryTreeItem) {
     pLibraryTreeItem = mpRootLibraryTreeItem;
   }
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+  if (regExp.indexIn(pLibraryTreeItem->getNameStructure()) > 0) {
+#else
   if (pLibraryTreeItem->getNameStructure().contains(regExp)) {
+#endif
     return pLibraryTreeItem;
   }
   for (int i = pLibraryTreeItem->childrenSize(); --i >= 0; ) {
@@ -1403,6 +1411,23 @@ LibraryTreeItem* LibraryTreeModel::findLibraryTreeItem(const QRegExp &regExp, Li
   }
   return 0;
 }
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+LibraryTreeItem* LibraryTreeModel::findLibraryTreeItem(const QRegularExpression &regExp, LibraryTreeItem *pLibraryTreeItem) const
+{
+  if (!pLibraryTreeItem) {
+    pLibraryTreeItem = mpRootLibraryTreeItem;
+  }
+  if (pLibraryTreeItem->getNameStructure().contains(regExp)) {
+    return pLibraryTreeItem;
+  }
+  for (int i = pLibraryTreeItem->childrenSize(); --i >= 0; ) {
+    if (LibraryTreeItem *item = findLibraryTreeItem(regExp, pLibraryTreeItem->childAt(i))) {
+      return item;
+    }
+  }
+  return 0;
+}
+#endif
 
 /*!
  * \brief LibraryTreeModel::findLibraryTreeItemOneLevel
@@ -4695,7 +4720,11 @@ bool LibraryWidget::saveFile(QString fileName, QString contents)
   if (file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
     QTextStream textStream(&file);
     // set to UTF-8
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    textStream.setEncoding(QStringConverter::Utf8);
+#else
     textStream.setCodec(Helper::utf8.toUtf8().constData());
+#endif
     textStream.setGenerateByteOrderMark(bom);
     textStream << newContents;
     file.close();
@@ -5517,8 +5546,13 @@ void LibraryWidget::scrollToActiveLibraryTreeItem()
 void LibraryWidget::searchClasses()
 {
   QString searchText = mpTreeSearchFilters->getFilterTextBox()->text();
-  QRegExp::PatternSyntax syntax = QRegExp::PatternSyntax(mpTreeSearchFilters->getSyntaxComboBox()->itemData(mpTreeSearchFilters->getSyntaxComboBox()->currentIndex()).toInt());
   Qt::CaseSensitivity caseSensitivity = mpTreeSearchFilters->getCaseSensitiveCheckBox()->isChecked() ? Qt::CaseSensitive: Qt::CaseInsensitive;
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+  // TODO: handle PatternSyntax: https://doc.qt.io/qt-6/qregularexpression.html
+  mpLibraryTreeProxyModel->setFilterRegularExpression(QRegularExpression::fromWildcard(searchText, caseSensitivity));
+#else
+  QRegExp::PatternSyntax syntax = QRegExp::PatternSyntax(mpTreeSearchFilters->getSyntaxComboBox()->itemData(mpTreeSearchFilters->getSyntaxComboBox()->currentIndex()).toInt());
   QRegExp regExp(searchText, caseSensitivity, syntax);
   mpLibraryTreeProxyModel->setFilterRegExp(regExp);
+#endif
 }

OMEdit/OMEditLIB/Modeling/LibraryTreeWidget.h

@@ -41,6 +41,7 @@
 #include "OMS/OMSProxy.h"
 
 #include <QTreeView>
+#include <QRegExp>
 #include <QSortFilterProxyModel>
 
 class CompleterItem;
@@ -287,6 +288,9 @@ class LibraryTreeModel : public QAbstractItemModel
   LibraryTreeItem* findLibraryTreeItem(const QString &name, LibraryTreeItem *pLibraryTreeItem = 0,
                                        Qt::CaseSensitivity caseSensitivity = Qt::CaseSensitive) const;
   LibraryTreeItem* findLibraryTreeItem(const QRegExp &regExp, LibraryTreeItem *pLibraryTreeItem = 0) const;
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+  LibraryTreeItem* findLibraryTreeItem(const QRegularExpression &regExp, LibraryTreeItem *pLibraryTreeItem = 0) const;
+#endif
   LibraryTreeItem* findLibraryTreeItemOneLevel(const QString &name, LibraryTreeItem *pLibraryTreeItem = 0,
                                                Qt::CaseSensitivity caseSensitivity = Qt::CaseSensitive) const;
   LibraryTreeItem* findNonExistingLibraryTreeItem(const QString &name, Qt::CaseSensitivity caseSensitivity = Qt::CaseSensitive) const;