From a449aa86e9f1758b5661fba640a626bc12080988 Mon Sep 17 00:00:00 2001
From: stonedDiscord <Tukz@gmx.de>
Date: Wed, 28 Dec 2022 21:35:11 +0100
Subject: Qt6 (#824)

* Major cleanup of screenshake code

* Add pre-5.10 support for screenshake math

* more compat, uglier too

* add surprise tool

* we don't need inline functions

* only run qsrand on old versions

* Squash compiler warnings

* >= not > please

* don't set codec in qt6

* switch to new regex

* remove qdesktopwidget (was unused)

* make enter event an enter event

* forgot header file

* rename emote_mod enum as there is an enum of the same name in chat_message

* regexp

* no more codec

* fix warning about emote_mod type

* change to new qtconcurrent

* misc was unused

* fix run

* change qtconcurrent for music

* codecs came back

* make CI run on qt6 too

* seperate artifacts

* qFormatLogMessage is wonky here

* maybe actually use the qt version from matrix

* change qt version here as well

* even lower

* use my own fixed installer

* use my own fixed version of qapng

* get websockets

* minor spelling mistake

* yOu nEeD aDdOnS

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* Revert "maybe actually use the qt version from matrix"

This reverts commit 7ab6b1b4c2f1200318d52f325efd2ef46c3fbd6a.

* Revert "Revert "maybe actually use the qt version from matrix""

This reverts commit a6f7c5bedf214a1992c15b296edd195f96a9196a.

* use jurplels again

* Revert "use jurplels again"

This reverts commit 5795474bca64590f1479af3ccbf7d8cc57f427e7.

* revert CI to master

* main not master

Co-authored-by: in1tiate <woodward.randall02+github@gmail.com>
---
 include/aoapplication.h    | 1 -
 include/aocharbutton.h     | 3 ++-
 include/aoevidencebutton.h | 3 ++-
 include/aotextarea.h       | 4 ++--
 include/courtroom.h        | 2 +-
 include/datatypes.h        | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/aoapplication.h b/include/aoapplication.h
index 4f2c585..16895d8 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -16,7 +16,6 @@
 #include <QVector>
 
 #include <QDebug>
-#include <QDesktopWidget>
 #include <QRect>
 
 #include <QCryptographicHash>
diff --git a/include/aocharbutton.h b/include/aocharbutton.h
index dd27e62..8e8038f 100644
--- a/include/aocharbutton.h
+++ b/include/aocharbutton.h
@@ -6,6 +6,7 @@
 
 #include <QFile>
 #include <QPushButton>
+#include <QEnterEvent>
 #include <QString>
 #include <QWidget>
 
@@ -37,7 +38,7 @@ private:
   AOImage *ui_selector;
 
 protected:
-  void enterEvent(QEvent *e);
+  void enterEvent(QEnterEvent *e);
   void leaveEvent(QEvent *e);
 };
 
diff --git a/include/aoevidencebutton.h b/include/aoevidencebutton.h
index d7812fe..1898539 100644
--- a/include/aoevidencebutton.h
+++ b/include/aoevidencebutton.h
@@ -6,6 +6,7 @@
 
 #include <QDebug>
 #include <QPushButton>
+#include <QEnterEvent>
 #include <QString>
 
 class AOEvidenceButton : public QPushButton {
@@ -31,7 +32,7 @@ private:
   int m_id = 0;
 
 protected:
-  void enterEvent(QEvent *e);
+  void enterEvent(QEnterEvent *e);
   void leaveEvent(QEvent *e);
   void mouseDoubleClickEvent(QMouseEvent *e);
   /*
diff --git a/include/aotextarea.h b/include/aotextarea.h
index 60b4b7c..405f4eb 100644
--- a/include/aotextarea.h
+++ b/include/aotextarea.h
@@ -2,7 +2,7 @@
 #define AOTEXTAREA_H
 
 #include <QDebug>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QScrollBar>
 #include <QTextBrowser>
 #include <QTextCursor>
@@ -17,7 +17,7 @@ public:
   void append_error(QString p_message);
 
 private:
-  const QRegExp url_parser_regex = QRegExp("\\b(https?://\\S+\\.\\S+)\\b");
+  const QRegularExpression url_parser_regex = QRegularExpression("\\b(https?://\\S+\\.\\S+)\\b");
 
   void auto_scroll(QTextCursor old_cursor, int scrollbar_value,
                    bool is_scrolled_down);
diff --git a/include/courtroom.h b/include/courtroom.h
index 45c040f..d767f0a 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -55,7 +55,7 @@
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #include <QRandomGenerator> //added in Qt 5.10
 #endif
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QScrollBar>
 #include <QTextBoundaryFinder>
 #include <QTextCharFormat>
diff --git a/include/datatypes.h b/include/datatypes.h
index d5d8551..682d68a 100644
--- a/include/datatypes.h
+++ b/include/datatypes.h
@@ -113,7 +113,7 @@ enum CHAT_MESSAGE {
   EFFECTS,
 };
 
-enum EMOTE_MOD {
+enum EMOTE_MOD_TYPE {
   IDLE = 0,
   PREANIM = 1,
   ZOOM = 5,
-- 
cgit