Initial support for Qt6

src/app/GUI/BoxesList/boolpropertywidget.cpp

@@ -89,7 +89,7 @@ void BoolPropertyWidget::paintEvent(QPaintEvent *) {
     p.end();
 }
 
-void BoolPropertyWidget::enterEvent(QEvent *) {
+void BoolPropertyWidget::enterEvent(QtEnterEvent *) {
     mHovered = true;
     update();
 }

src/app/GUI/BoxesList/boolpropertywidget.h

@@ -29,6 +29,7 @@
 #include <QWidget>
 #include "Properties/boolproperty.h"
 #include "Properties/boolpropertycontainer.h"
+#include "../ui/enterevent.h"
 
 class BoolPropertyWidget : public QWidget {
     Q_OBJECT
@@ -40,7 +41,7 @@ class BoolPropertyWidget : public QWidget {
 protected:
     void mousePressEvent(QMouseEvent *);
     void paintEvent(QPaintEvent *);
-    void enterEvent(QEvent *);
+    void enterEvent(QtEnterEvent *);
     void leaveEvent(QEvent *);
 private:
     bool mHovered = false;

src/app/GUI/BoxesList/boxscroller.cpp

@@ -180,17 +180,22 @@ void BoxScroller::stopScrolling() {
     }
 }
 
-void BoxScroller::dropEvent(QDropEvent *event) {
+void BoxScroller::dropEvent(QDropEvent *event)
+{
     stopScrolling();
     mCurrentMimeData = event->mimeData();
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
     mLastDragMoveY = event->pos().y();
+#else
+    mLastDragMoveY = event->position().toPoint().y();
+#endif
     updateDropTarget();
-    if(mDropTarget.isValid()) {
+    if (mDropTarget.isValid()) {
         const auto targetAbs = mDropTarget.fTargetParent;
         const auto target = targetAbs->getTarget();
-        if(mDropTarget.fDropType == DropType::on) {
+        if (mDropTarget.fDropType == DropType::on) {
             target->SWT_drop(mCurrentMimeData);
-        } else if(mDropTarget.fDropType == DropType::into) {
+        } else if (mDropTarget.fDropType == DropType::into) {
             target->SWT_dropInto(mDropTarget.fTargetId, mCurrentMimeData);
         }
         planScheduleUpdateVisibleWidgetsContent();
@@ -200,13 +205,18 @@ void BoxScroller::dropEvent(QDropEvent *event) {
     mDropTarget.reset();
 }
 
-void BoxScroller::dragEnterEvent(QDragEnterEvent *event) {
+void BoxScroller::dragEnterEvent(QDragEnterEvent *event)
+{
     const auto mimeData = event->mimeData();
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
     mLastDragMoveY = event->pos().y();
+#else
+    mLastDragMoveY = event->position().toPoint().y();
+#endif
     mCurrentMimeData = mimeData;
     updateDropTarget();
     //mDragging = true;
-    if(mCurrentMimeData) event->acceptProposedAction();
+    if (mCurrentMimeData) { event->acceptProposedAction(); }
     update();
 }
 
@@ -218,18 +228,23 @@ void BoxScroller::dragLeaveEvent(QDragLeaveEvent *event) {
     update();
 }
 
-void BoxScroller::dragMoveEvent(QDragMoveEvent *event) {
+void BoxScroller::dragMoveEvent(QDragMoveEvent *event)
+{
     event->acceptProposedAction();
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
     const int yPos = event->pos().y();
+#else
+    const int yPos = event->position().toPoint().y();
+#endif
 
-    if(yPos < 30) {
-        if(!mScrollTimer->isActive()) {
+    if (yPos < 30) {
+        if (!mScrollTimer->isActive()) {
             connect(mScrollTimer, &QTimer::timeout,
                     this, &BoxScroller::scrollUp);
             mScrollTimer->start(300);
         }
-    } else if(yPos > height() - 30) {
-        if(!mScrollTimer->isActive()) {
+    } else if (yPos > height() - 30) {
+        if (!mScrollTimer->isActive()) {
             connect(mScrollTimer, &QTimer::timeout,
                     this, &BoxScroller::scrollDown);
             mScrollTimer->start(300);

src/app/GUI/BoxesList/boxsinglewidget.cpp

@@ -672,7 +672,11 @@ void BoxSingleWidget::mousePressEvent(QMouseEvent *event) {
             PropertyMenu pMenu(&menu, mParent->currentScene(), MainWindow::sGetInstance());
             pTarget->prp_setupTreeViewMenu(&pMenu);
         }
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
         menu.exec(event->globalPos());
+#else
+        menu.exec(event->globalPosition().toPoint());
+#endif
         setSelected(false);
     } else {
         mDragPressPos = event->pos().x() > mFillWidget->x();
@@ -713,7 +717,7 @@ void BoxSingleWidget::mouseReleaseEvent(QMouseEvent *event)
     const auto target = mTarget->getTarget();
 
     const auto bbox = enve_cast<BoundingBox*>(target);
-    if (event->button() == Qt::MidButton && bbox) {
+    if (event->button() == Qt::MiddleButton && bbox) {
         PropertyNameDialog::sRenameBox(bbox, this);
         return;
     }
@@ -734,7 +738,7 @@ void BoxSingleWidget::mouseReleaseEvent(QMouseEvent *event)
     }
 }
 
-void BoxSingleWidget::enterEvent(QEvent *)
+void BoxSingleWidget::enterEvent(QtEnterEvent *)
 {
 #ifdef Q_OS_MAC
     setFocus();

src/app/GUI/BoxesList/boxsinglewidget.h

@@ -37,6 +37,8 @@
 #include "smartPointers/ememory.h"
 #include "framerange.h"
 #include "Animators/SmartPath/smartpathanimator.h"
+#include "../ui/enterevent.h"
+
 class QrealAnimatorValueSlider;
 class TimelineMovable;
 class Key;
@@ -101,7 +103,7 @@ class BoxSingleWidget : public SingleWidget {
     void mouseMoveEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
 
-    void enterEvent(QEvent *);
+    void enterEvent(QtEnterEvent *);
     void leaveEvent(QEvent *);
 
 #ifdef Q_OS_MAC

src/app/GUI/Expressions/expressiondialog.cpp

@@ -554,35 +554,42 @@ void ExpressionDialog::updateScriptDefinitions()
     }
 
     {
-        QRegExp funcDefs("(class|function)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*(\\([a-zA-Z0-9_, ]*\\))");
-        int pos = 0;
-        while ((pos = funcDefs.indexIn(scriptContext, pos)) != -1) {
-              QStringList funcs = funcDefs.capturedTexts();
-              for (int i = 2; i < funcs.count() - 1; i += 3) {
-                  const auto& func = funcs.at(i);
-                  const auto& funcArgs = funcs.at(i + 1);
-                  if (func.isEmpty()) { continue; }
-                  mScriptApi->add(func + funcArgs);
-                  mScriptLexer->addDefinition(func);
-                  mDefsLexer->addDefinition(func);
-              }
-              pos += funcDefs.matchedLength();
+        QRegularExpression funcDefs("(class|function)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*(\\([a-zA-Z0-9_, ]*\\))");
+        auto matchIterator = funcDefs.globalMatch(scriptContext);
+
+        while (matchIterator.hasNext()) {
+            QRegularExpressionMatch match = matchIterator.next();
+            QStringList funcs = match.capturedTexts();
+
+            for (int i = 2; i < funcs.count() - 1; i += 3) {
+                const auto& func = funcs.at(i);
+                const auto& funcArgs = funcs.at(i + 1);
+                if (func.isEmpty()) { continue; }
+
+                mScriptApi->add(func + funcArgs);
+                mScriptLexer->addDefinition(func);
+                mDefsLexer->addDefinition(func);
+            }
         }
     }
 
     {
-        QRegExp varDefs("([a-zA-Z_][a-zA-Z0-9_]*)\\s*=\\s*(?!=)");
-        int pos = 0;
-        while ((pos = varDefs.indexIn(scriptContext, pos)) != -1) {
-              QStringList vars = varDefs.capturedTexts();
-              for (int i = 1; i < vars.count(); i++) {
-                  const auto& var = vars.at(i);
-                  if (var.isEmpty()) { continue; }
-                  mScriptApi->add(var);
-                  mScriptLexer->addDefinition(var);
-                  mDefsLexer->addDefinition(var);
-              }
-              pos += varDefs.matchedLength();
+        QRegularExpression varDefs("([a-zA-Z_][a-zA-Z0-9_]*)\\s*=\\s*(?!=)");
+
+        auto matchIterator = varDefs.globalMatch(scriptContext);
+
+        while (matchIterator.hasNext()) {
+            QRegularExpressionMatch match = matchIterator.next();
+            QStringList vars = match.capturedTexts();
+
+            for (int i = 1; i < vars.count(); i++) {
+                const auto& var = vars.at(i);
+                if (var.isEmpty()) { continue; }
+
+                mScriptApi->add(var);
+                mScriptLexer->addDefinition(var);
+                mDefsLexer->addDefinition(var);
+            }
         }
     }
 }

src/app/GUI/Expressions/expressioneditor.cpp

@@ -87,7 +87,7 @@ void ExpressionEditor::keyPressEvent(QKeyEvent *e) {
     } else if(key == Qt::Key_Tab) {
         return QWidget::keyPressEvent(e);
     } else QTextEdit::keyPressEvent(e);
-    const bool input = e->text().contains(QRegExp("[A-Za-z0-9_ \\.\\$]"));
+    const bool input = e->text().contains(QRegularExpression("[A-Za-z0-9_ \\.\\$]"));
     const bool deletion = key == Qt::Key_Delete ||
             key == Qt::Key_Backspace;
     const bool arrows = key == Qt::Key_Right ||

src/app/GUI/RenderWidgets/closablecontainer.cpp

@@ -47,12 +47,10 @@ ClosableContainer::ClosableContainer(QWidget *parent) : QWidget(parent) {
     mVLayout->addWidget(mContWidget);
     mContWidget->setContentsMargins(0, 0, 0, 0);
     mContWidget->setLayout(mContLayout);
-    //mContLayout->setMargin(0);
     mContLayout->setAlignment(Qt::AlignTop);
     mContLayout->setContentsMargins(0, 0, 0, 0);
     mContLayout->setSpacing(0);
     mVLayout->setSpacing(0);
-    mVLayout->setMargin(0);
     mVLayout->setContentsMargins(0, 0, 0, 0);
     setContentVisible(false);
 }

src/app/GUI/RenderWidgets/outputsettingsdialog.cpp

@@ -362,11 +362,11 @@ void OutputSettingsDialog::setupFormatOptionsTree()
 
     container->setContentsMargins(10, 0, 10, 0);
     container->setMinimumHeight(150);
-    containerLayout->setMargin(0);
+    containerLayout->setContentsMargins(0, 0, 0, 0);
     containerLayout->addWidget(area);
 
     containerInner->setContentsMargins(0, 0, 0, 0);
-    containerInnerLayout->setMargin(0);
+    containerInnerLayout->setContentsMargins(0, 0, 0, 0);
 
     mFormatOptionsTree->setHeaderLabels(QStringList()
                                         << tr("Type")
@@ -436,7 +436,7 @@ void OutputSettingsDialog::setupFormatOptionsTree()
     });
 
     showHideWidget->setContentsMargins(0, 0, 10, 0);
-    showHideLayout->setMargin(0);
+    showHideLayout->setContentsMargins(0, 0, 0, 0);
     showHideLayout->addStretch();
     showHideLayout->addWidget(showHideButton);
 

src/app/GUI/RenderWidgets/renderinstancewidget.cpp

@@ -31,7 +31,6 @@
 #include "outputsettingsprofilesdialog.h"
 #include "outputsettingsdisplaywidget.h"
 #include "rendersettingsdisplaywidget.h"
-#include "Private/esettings.h"
 #include "GUI/edialogs.h"
 
 #include "appsupport.h"
@@ -142,7 +141,7 @@ void RenderInstanceWidget::iniGUI()
     QWidget *outputSettingsOptWidget = new QWidget(this);
     outputSettingsOptWidget->setContentsMargins(0, 0, 0, 0);
     const auto outputSettingsOptLayout = new QHBoxLayout(outputSettingsOptWidget);
-    outputSettingsOptLayout->setMargin(0);
+    outputSettingsOptLayout->setContentsMargins(0, 0, 0, 0);
     outputSettingsOptLayout->addWidget(mOutputSettingsProfilesButton);
     outputSettingsOptLayout->addWidget(mOutputSettingsButton);
 
@@ -193,7 +192,7 @@ void RenderInstanceWidget::iniGUI()
     QWidget *outputDestinationWidget = new QWidget(this);
     outputDestinationWidget->setContentsMargins(0, 0, 0, 0);
     const auto outputDesinationLayout = new QHBoxLayout(outputDestinationWidget);
-    outputDesinationLayout->setMargin(0);
+    outputDesinationLayout->setContentsMargins(0, 0, 0, 0);
 
     outputDesinationLayout->addWidget(mOutputDestinationButton);
     outputDesinationLayout->addWidget(mOutputDestinationLineEdit);
@@ -203,7 +202,6 @@ void RenderInstanceWidget::iniGUI()
 
     mContentLayout->addWidget(outputSettingsLabelWidget);
 
-    mContentLayout->setMargin(0);
     mContentLayout->setSpacing(0);
     mContentLayout->setContentsMargins(0, 0, 0, 0);
 }
@@ -284,7 +282,11 @@ void RenderInstanceWidget::mousePressEvent(QMouseEvent *e)
         delAct->setData(1);
         delAct->setEnabled(deletable);
 
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
         const auto act = menu.exec(e->globalPos());
+#else
+        const auto act = menu.exec(e->globalPosition().toPoint());
+#endif
         if (act) {
             switch (act->data().toInt()) {
             case 0:
@@ -489,7 +491,6 @@ void RenderInstanceWidget::updateRenderSettings()
     updateFromSettings();
 }
 
-#include "Private/esettings.h"
 OutputProfilesListButton::OutputProfilesListButton(RenderInstanceWidget *parent) :
     QPushButton(parent) {
     mParentWidget = parent;

src/app/GUI/RenderWidgets/renderwidget.cpp

@@ -50,7 +50,7 @@ RenderWidget::RenderWidget(QWidget *parent)
     , mState(RenderState::none)
 {
     mMainLayout = new QVBoxLayout(this);
-    mMainLayout->setMargin(0);
+    mMainLayout->setContentsMargins(0, 0, 0, 0);
     mMainLayout->setSpacing(0);
     setLayout(mMainLayout);
 
@@ -131,7 +131,7 @@ RenderWidget::RenderWidget(QWidget *parent)
     mContWidget->setContentsMargins(0, 0, 0, 0);
     mContLayout = new QVBoxLayout(mContWidget);
     mContLayout->setAlignment(Qt::AlignTop);
-    mContLayout->setMargin(0);
+    mContLayout->setContentsMargins(0, 0, 0, 0);
     mContLayout->setSpacing(0);
     mContWidget->setLayout(mContLayout);
     mScrollArea = new ScrollArea(this);

src/app/GUI/Settings/generalsettingswidget.cpp

@@ -67,7 +67,7 @@ GeneralSettingsWidget::GeneralSettingsWidget(QWidget *parent)
     mAutoSaveWidget->setContentsMargins(0, 0, 0, 0);
     const auto mAutoSaveLayout = new QHBoxLayout(mAutoSaveWidget);
     mAutoSaveLayout->setContentsMargins(0, 0, 0, 0);
-    mAutoSaveLayout->setMargin(0);
+    mAutoSaveLayout->setContentsMargins(0, 0, 0, 0);
 
     mAutoSave = new QCheckBox(tr("Enable Auto Save"), this);
     mAutoSave->setCheckable(true);
@@ -147,7 +147,6 @@ GeneralSettingsWidget::GeneralSettingsWidget(QWidget *parent)
     mImportFileWidget->setContentsMargins(0, 0, 0, 0);
     const auto mImportFileLayout = new QHBoxLayout(mImportFileWidget);
     mImportFileLayout->setContentsMargins(0, 0, 0, 0);
-    mImportFileLayout->setMargin(0);
 
     const auto mImportFileLabel = new QLabel(tr("Default import directory"), this);
     mImportFileDir = new QComboBox(this);

src/app/GUI/canvaswindow.h

@@ -64,7 +64,7 @@ class CanvasWindow : public GLWindow, public KeyFocusTarget
                           QWidget * const parent = nullptr);
     ~CanvasWindow();
     Canvas *getCurrentCanvas();
-    const QMatrix& getViewTransform() const
+    const QTransform& getViewTransform() const
     { return mViewTransform; }
 
     void setCurrentCanvas(Canvas * const canvas);
@@ -132,7 +132,7 @@ class CanvasWindow : public GLWindow, public KeyFocusTarget
     Actions& mActions;
 
     QSize mOldSize{-1, -1};
-    QMatrix mViewTransform;
+    QTransform mViewTransform;
     QPointF mPrevMousePos;
     QPointF mPrevPressPos;
     //bool mValidPaintTarget = false;

src/app/GUI/graphboxeslist.cpp

@@ -262,7 +262,7 @@ void KeysView::graphPaint(QPainter *p) {
 
     p->setRenderHint(QPainter::Antialiasing);
 
-    QMatrix transform;
+    QTransform transform;
     transform.translate(-mPixelsPerFrame*(mMinViewedFrame - 0.5),
                         height() + mPixelsPerValUnit*mMinShownVal);
     transform.scale(mPixelsPerFrame, -mPixelsPerValUnit);

src/app/GUI/keysview.cpp

@@ -242,7 +242,7 @@ void KeysView::wheelEvent(QWheelEvent *e)
     }
 #endif
 
-    const QPoint pos = e->pos();
+    const QPoint pos = e->position().toPoint();
     const QPoint posU = pos + QPoint(-eSizesUI::widget/2, 0);
     const qreal currentHoverFrame = static_cast<qreal>(posU.x()) / mPixelsPerFrame + mMinViewedFrame;
     // qDebug() << "currentHoverFrame" << currentHoverFrame;