NOISSUE port codebase to Qt6 APIs fix Flame modpacks not integrate instance name and more!

This commit port codebase to Qt6 APIs, Fix Flame modpacks not integrate instance name
Remove Mojang Auth system
Removed MultiMC logo for readme

Signed-off-by: Mehmet Samet Duman <yongdohyun@projecttick.org>

5 files changed, 26 insertions, 36 deletions

diff --git a/libraries/LocalPeer/src/LocalPeer.cpp b/libraries/LocalPeer/src/LocalPeer.cpp
index cb218466fc..3145b418c7 100644
--- a/libraries/LocalPeer/src/LocalPeer.cpp
+++ b/libraries/LocalPeer/src/LocalPeer.cpp
@@ -62,6 +62,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
 #include <chrono>
 #include <thread>
 #include <QCryptographicHash>
+#include <QRegularExpression>
 
 static const char* ack = "ack";
 
@@ -72,7 +73,7 @@ ApplicationId ApplicationId::fromTraditionalApp()
     protoId = protoId.toLower();
 #endif
     auto prefix = protoId.section(QLatin1Char('/'), -1);
-    prefix.remove(QRegExp("[^a-zA-Z]"));
+    prefix.remove(QRegularExpression("[^a-zA-Z]"));
     prefix.truncate(6);
     QByteArray idc = protoId.toUtf8();
     quint16 idNum = qChecksum(idc.constData(), idc.size());
diff --git a/libraries/classparser/src/classparser.cpp b/libraries/classparser/src/classparser.cpp
index 8825ea399f..601521f682 100644
--- a/libraries/classparser/src/classparser.cpp
+++ b/libraries/classparser/src/classparser.cpp
@@ -18,7 +18,7 @@
 #include "classparser.h"
 
 #include <QFile>
-#include <quazipfile.h>
+#include <quazip/quazipfile.h>
 #include <QDebug>
 
 namespace classparser
diff --git a/libraries/iconfix/internal/qiconloader.cpp b/libraries/iconfix/internal/qiconloader.cpp
index 0d8466f07d..b91ddba888 100644
--- a/libraries/iconfix/internal/qiconloader.cpp
+++ b/libraries/iconfix/internal/qiconloader.cpp
@@ -42,7 +42,7 @@
 #include <QtCore/QSettings>
 #include <QtGui/QPainter>
 #include <QApplication>
-#include <QLatin1Literal>
+#include <QString>
 
 #include "qhexstring_p.h"
 
@@ -651,38 +651,25 @@ QString QIconLoaderEngineFixed::key() const
     return QLatin1String("QIconLoaderEngineFixed");
 }
 
-void QIconLoaderEngineFixed::virtual_hook(int id, void *data)
+QList<QSize> QIconLoaderEngineFixed::availableSizes(QIcon::Mode mode, QIcon::State state)
 {
     ensureLoaded();
 
-    switch (id)
-    {
-    case QIconEngine::AvailableSizesHook:
-    {
-        QIconEngine::AvailableSizesArgument &arg =
-            *reinterpret_cast<QIconEngine::AvailableSizesArgument *>(data);
-        const int N = m_entries.size();
-        QList<QSize> sizes;
-        sizes.reserve(N);
-
-        // Gets all sizes from the DirectoryInfo entries
-        for (int i = 0; i < N; ++i)
-        {
-            int size = m_entries.at(i)->dir.size;
-            sizes.append(QSize(size, size));
-        }
-        arg.sizes.swap(sizes); // commit
-    }
-    break;
-    case QIconEngine::IconNameHook:
+    const int N = m_entries.size();
+    QList<QSize> sizes;
+    sizes.reserve(N);
+
+    for (int i = 0; i < N; ++i)
     {
-        QString &name = *reinterpret_cast<QString *>(data);
-        name = m_iconName;
-    }
-    break;
-    default:
-        QIconEngine::virtual_hook(id, data);
+        int size = m_entries.at(i)->dir.size;
+        sizes.append(QSize(size, size));
     }
+    return sizes;
+}
+
+QString QIconLoaderEngineFixed::iconName()
+{
+    return m_iconName;
 }
 
 } // QtXdg
diff --git a/libraries/iconfix/internal/qiconloader_p.h b/libraries/iconfix/internal/qiconloader_p.h
index e45a08d642..3fb6d75ea2 100644
--- a/libraries/iconfix/internal/qiconloader_p.h
+++ b/libraries/iconfix/internal/qiconloader_p.h
@@ -123,7 +123,8 @@ private:
     QString key() const;
     bool hasIcon() const;
     void ensureLoaded();
-    void virtual_hook(int id, void *data);
+    QList<QSize> availableSizes(QIcon::Mode mode = QIcon::Normal, QIcon::State state = QIcon::Off) override;
+    QString iconName() override;
     QIconLoaderEngineEntry *entryForSize(const QSize &size);
     QIconLoaderEngineFixed(const QIconLoaderEngineFixed &other);
     QThemeIconEntries m_entries;
diff --git a/libraries/systeminfo/src/distroutils.cpp b/libraries/systeminfo/src/distroutils.cpp
index fb9ae25d16..37ff9783ce 100644
--- a/libraries/systeminfo/src/distroutils.cpp
+++ b/libraries/systeminfo/src/distroutils.cpp
@@ -36,6 +36,7 @@ SOFTWARE.
 #include <QProcess>
 #include <QDebug>
 #include <QDir>
+#include <QRegularExpression>
 
 #include <functional>
 
@@ -170,7 +171,7 @@ void Sys::lsb_postprocess(Sys::LsbInfo & lsb, Sys::DistributionInfo & out)
     else
     {
         // ubuntu, debian, gentoo, scientific, slackware, ... ?
-        auto parts = dist.split(QRegExp("\\s+"), QString::SkipEmptyParts);
+        auto parts = dist.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
         if(parts.size())
         {
             dist = parts[0];
@@ -209,7 +210,7 @@ QString Sys::_extract_distribution(const QString & x)
     {
         return "sles";
     }
-    QStringList list = release.split(QRegExp("\\s+"), QString::SkipEmptyParts);
+    QStringList list = release.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
     if(list.size())
     {
         return list[0];
@@ -219,12 +220,12 @@ QString Sys::_extract_distribution(const QString & x)
 
 QString Sys::_extract_version(const QString & x)
 {
-    QRegExp versionish_string("\\d+(?:\\.\\d+)*$");
-    QStringList list = x.split(QRegExp("\\s+"), QString::SkipEmptyParts);
+    QRegularExpression versionish_string("\\d+(?:\\.\\d+)*$");
+    QStringList list = x.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
     for(int i = list.size() - 1; i >= 0; --i)
     {
         QString chunk = list[i];
-        if(versionish_string.exactMatch(chunk))
+        if(versionish_string.match(chunk).hasMatch())
         {
             return chunk;
         }