Add Qt6 compatibility

Signed-off-by: Maxime Gervais <[email protected]>
MediaArea · Jan 10, 2024 · fc8ec29 · fc8ec29
1 parent d3393c3
commit fc8ec29
Show file tree

Hide file tree

Showing 14 changed files with 192 additions and 229 deletions.
diff --git a/Source/GUI/Qt/WebCommonPage.cpp b/Source/GUI/Qt/WebCommonPage.cpp
@@ -14,6 +14,7 @@
 #include <QFileDialog>
 #include <QTextStream>
 #include <QDesktopServices>
+#include <QRegularExpression>
 
 namespace MediaConch
 {
@@ -82,7 +83,6 @@ namespace MediaConch
             return;
 
         QTextStream out(&file);
-        out.setCodec("UTF-8");
         out << report;
     }
 
@@ -785,34 +785,25 @@ namespace MediaConch
     //---------------------------------------------------------------------------
     bool WebCommonPage::report_is_html(const QString& report)
     {
-        QRegExp reg("^(<\\!DOCTYPE.*html|<html>.*</html>$)", Qt::CaseInsensitive);
+        QRegularExpression reg("^(<\\!DOCTYPE.*html|<html>.*</html>$)", QRegularExpression::CaseInsensitiveOption);
 
-        if (reg.indexIn(report.trimmed(), 0) != -1)
-            return true;
-
-        return false;
+        return reg.match(report.trimmed()).hasMatch();
     }
 
     //---------------------------------------------------------------------------
     bool WebCommonPage::report_is_xml(const QString& report)
     {
-        QRegExp reg("<\\?xml ", Qt::CaseInsensitive);
-
-        if (reg.indexIn(report, 0) != -1)
-            return true;
+        QRegularExpression reg("<\\?xml ", QRegularExpression::CaseInsensitiveOption);
 
-        return false;
+        return reg.match(report).hasMatch();
     }
 
     //---------------------------------------------------------------------------
     bool WebCommonPage::report_is_json(const QString& report)
     {
-        QRegExp reg("^\\{.*\\}$", Qt::CaseInsensitive);
-
-        if (reg.indexIn(report.trimmed(), 0) != -1)
-            return true;
+        QRegularExpression reg("^\\{.*\\}$", QRegularExpression::CaseInsensitiveOption);
 
-        return false;
+        return reg.match(report.trimmed()).hasMatch();
     }
 
     QString WebCommonPage::get_file_tool(const QString& file)

diff --git a/Source/GUI/Qt/WebEnginePage.cpp b/Source/GUI/Qt/WebEnginePage.cpp
@@ -76,9 +76,9 @@ namespace MediaConch
         {
             QString value_input;
             if (select_file_name == "checkerRepository_directory")
-                value_input = QFileDialog::getExistingDirectory(view(), NULL, suggested);
+                value_input = QFileDialog::getExistingDirectory(NULL, NULL, suggested);
             else
-                value_input = QFileDialog::getOpenFileName(view(), NULL, suggested);
+                value_input = QFileDialog::getOpenFileName(NULL, NULL, suggested);
 
             QMap<QString, QStringList>::iterator it = file_selector.find(select_file_name);
             if (!value_input.length())
@@ -103,7 +103,7 @@ namespace MediaConch
         }
         else
         {
-            QStringList names = QFileDialog::getOpenFileNames(view(), QString::null, suggested);
+            QStringList names = QFileDialog::getOpenFileNames(NULL, QString(), suggested);
 
             if (names.size())
             {