migrate to Qt6, Botan 3, make it work on macOS

.gitignore

@@ -7,6 +7,7 @@ moc_*.h
 moc_*.cpp
 ui_*.h
 qrc_Resources.cpp
+.qmake.stash
 
 # Velocity #
 ############

.vscode/c_cpp_properties.json

@@ -0,0 +1,35 @@
+{
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
+                "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include",
+                "/opt/homebrew/include",
+                "/opt/homebrew/opt/qt/Frameworks/QtWidgets.framework/Versions/Current/Headers",
+                "/opt/homebrew/opt/qt/Frameworks/QtGui.framework/Versions/Current/Headers",
+                "/opt/homebrew/opt/qt/Frameworks/QtCore.framework/Versions/Current/Headers",
+                "/opt/homebrew/opt/qt/Frameworks/QtNetwork.framework/Versions/Current/Headers",
+                "/opt/homebrew/include/botan-3"
+            ],
+            "defines": [
+                "XBOXINTERNALS_LIBRARY",
+                "QT_CORE_LIB",
+                "Q_OS_MAC",
+                "QT_WIDGETS_LIB",
+                "QT_GUI_LIB"
+            ],
+            "macFrameworkPath": [
+                "/System/Library/Frameworks",
+                "/Library/Frameworks",
+                "/opt/homebrew/opt/qt/Frameworks"
+            ],
+            "compilerPath": "/usr/bin/clang",
+            "cStandard": "c11",
+            "cppStandard": "c++20",
+            "intelliSenseMode": "macos-clang-x64"
+        }
+    ],
+    "version": 4
+}

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Velocity.app",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/Velocity/Velocity.app/Contents/MacOS/Velocity",
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "lldb",
+            "preLaunchTask": "build",
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,18 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "type": "shell",
+            "command": "make",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "always"
+            },
+            "problemMatcher": "$gcc",
+        }
+    ]
+}

COMPILING.md

@@ -1,32 +1,32 @@
-The Qt Creator IDE is used to build/debug Velocity. Velocity currently depends on Qt4 and Botan 1.10.
+The Qt Creator IDE is used to build/debug Velocity. Velocity currently depends on Qt6 and Botan 3.4
 
 ==========
 
 - WINDOWS
-	
-	While debugging, Velocity is compiled with 'Qt 4.8.1 for Desktop - MingGW (Qt SDK) Debug'.
-	While compiling for release mode, Velocity is compiled with 'Qt 4.8.1 for Desktop - MingGW (Qt SDK) Release'.
-	
+
+	While debugging, Velocity is compiled with 'Qt 6.7 for Desktop - MingGW (Qt SDK) Debug'.
+	While compiling for release mode, Velocity is compiled with 'Qt 6.7 for Desktop - MingGW (Qt SDK) Release'.
+
 	Tool Chain: 'Mingw as a GCC for Windows targets'
-	
+
 	WARNING: Botan must be found in the working directory of Velocity.exe for Velocity to successfully run. To obtain the Botan libraries, you have 2 options:
-	
+
 	1. Download the Botan sources from http://botan.randombit.net/download.html.
 	2. Download the Botan binary (.a) from http://www.mediafire.com/?o5zhbb4leufk8d7, if available.
-	
+
 - MAC
-	
+
 	Botan can be installed using Homebrew by typing `brew install botan` into your terminal.
 
 - LINUX
-	
+
 	The installation process differs depending on distribution. For example:
-	
-	Ubuntu: `apt-get install libbotan-1.10-0`  
+
+	Ubuntu: `apt-get install libbotan-3-0`
 	Arch Linux: `pacman -S botan`
-	
+
 ==========
 
-If you do not want to use Qt Creator IDE, you can use Makefile in the root directory of the project.  
-The Makefile builds Velocity with debug configuration by default, but one can explicitly set desired configuration as the parameter like this:  
+If you do not want to use Qt Creator IDE, you can use Makefile in the root directory of the project.
+The Makefile builds Velocity with debug configuration by default, but one can explicitly set desired configuration as the parameter like this:
 `make debug` or `make release`

Makefile

@@ -1,4 +1,4 @@
-QMAKE = qmake-qt4
+QMAKE = qmake
 UNAME = $(shell uname -s)
 
 ifeq ($(UNAME), Linux)
@@ -17,11 +17,11 @@ libXboxInternals: XboxInternals/
 	mkdir -p XboxInternals-$(OS)/$(CONFIG)
 	cp XboxInternals/libXboxInternals.* XboxInternals-$(OS)/$(CONFIG)
 
-velocity: Velocity/
+velocity_target: Velocity/
 	$(QMAKE) Velocity/Velocity.pro -o Velocity/Makefile CONFIG+=$(CONFIG)
 	make -C Velocity
 
-modules: libXboxInternals velocity
+modules: libXboxInternals velocity_target
 
 debug: CONFIG = debug
 debug: modules

Velocity/Velocity.pro

@@ -10,6 +10,8 @@ QT       += core gui network xml widgets
 TARGET = Velocity
 TEMPLATE = app
 
+CONFIG += c++20
+
 win32:UI_DIR = ../Velocity
 
 # application version
@@ -22,12 +24,12 @@ win32 {
     INCLUDEPATH += C:/botan/include
 }
 macx {
-    INCLUDEPATH += /usr/local/include/botan-1.10
-    LIBS += /usr/local/lib/libbotan-1.10.a
+    INCLUDEPATH += /opt/homebrew/include/botan-3
+    LIBS += /opt/homebrew/lib/libbotan-3.a
 }
-unix {
-    INCLUDEPATH += /usr/include/botan-1.10
-    LIBS += /usr/lib/libbotan-1.10.so.0
+else:unix {
+    INCLUDEPATH += /usr/include/botan-3
+    LIBS += /usr/lib/libbotan-3.so.0
 }
 
 # phonon, icon

Velocity/achievementcreationwizard.cpp

@@ -109,7 +109,7 @@ void AchievementCreationWizard::onFinished(int result)
         achievement->structSize = 0x1C;
 
         // set the thumbnail image
-        *achThumbnail = ui->imgThumbnail->pixmap()->toImage();
+        *achThumbnail = ui->imgThumbnail->pixmap().toImage();
     }
 }
 

Velocity/creationwizard.cpp

@@ -176,14 +176,14 @@ void CreationWizard::onFinished(int status)
         QByteArray ba1;
         QBuffer buffer1(&ba1);
         buffer1.open(QIODevice::WriteOnly);
-        ui->imgThumbnail->pixmap()->save(&buffer1, "PNG");
+        ui->imgThumbnail->pixmap().save(&buffer1, "PNG");
         package.metaData->thumbnailImage = (BYTE*)ba1.data();
         package.metaData->thumbnailImageSize = ba1.length();
 
         QByteArray ba2;
         QBuffer buffer2(&ba2);
         buffer2.open(QIODevice::WriteOnly);
-        ui->imgTitleThumbnail->pixmap()->save(&buffer2, "PNG");
+        ui->imgTitleThumbnail->pixmap().save(&buffer2, "PNG");
         package.metaData->titleThumbnailImage = (BYTE*)ba2.data();
         package.metaData->titleThumbnailImageSize = ba2.length();
 

Velocity/deviceviewer.cpp

@@ -78,7 +78,7 @@ void DeviceViewer::DrawMemoryGraph()
 
     // draw the insano piechart
     QPixmap chart(750, 500);
-    chart.fill(ui->imgPiechart->palette().background().color());
+    chart.fill(ui->imgPiechart->palette().window().color());
     QPainter painter(&chart);
     Nightcharts pieChart;
     pieChart.setType(Nightcharts::Dpie);
@@ -273,7 +273,7 @@ void DeviceViewer::showContextMenu(QPoint point)
                     QDate date;
                     date.setDate(createdtime.year, createdtime.month, createdtime.monthDay);
 
-                    entryItem->setText(2, date.toString(Qt::DefaultLocaleShortDate));
+                    entryItem->setText(2, date.toString(QLocale::system().dateFormat(QLocale::ShortFormat)));
                 }
             }
         }
@@ -553,7 +553,7 @@ void DeviceViewer::LoadFolderAll(FatxFileEntry *folder)
             QDate date;
             date.setDate(createdtime.year, createdtime.month, createdtime.monthDay);
 
-            entryItem->setText(2, date.toString(Qt::DefaultLocaleShortDate));
+            entryItem->setText(2, date.toString(QLocale::system().dateFormat(QLocale::ShortFormat)));
 
             if (i % 25 == 0)
                 QApplication::processEvents();

Velocity/fatxpathgendialog.cpp

@@ -9,8 +9,8 @@ FATXPathGenDialog::FATXPathGenDialog(StfsPackage *package, QWidget *parent) :
     // the general path for packages is: Data\Content\ProfileID\TitleID\ContentType
     ui->txtPath->setText("Data\\Content\\" +
             QtHelpers::ByteArrayToString(package->metaData->profileID, 8, false) + "\\" +
-            QString().sprintf("%8X", package->metaData->titleID).replace(" ", "0") + "\\" +
-            QString().sprintf("%8X", package->metaData->contentType).replace(" ", "0") + "\\");
+            QString("%1").arg(package->metaData->titleID, 8, 16, QChar('0')).toUpper() + "\\" +
+            QString("%1").arg(package->metaData->contentType, 8, 16, QChar('0')).toUpper() + "\\");    
 }
 
 FATXPathGenDialog::~FATXPathGenDialog()

Velocity/gameadderdialog.cpp

@@ -46,7 +46,7 @@ GameAdderDialog::GameAdderDialog(StfsPackage *package, QWidget *parent, bool dis
     manager = new QNetworkAccessManager(this);
 
     // check for a connection
-    if (manager->networkAccessible() == QNetworkAccessManager::NotAccessible)
+    if (QNetworkInformation::instance()->reachability() != QNetworkInformation::Reachability::Online)
     {
         QMessageBox::warning(this, "Listing Error",
                 "The listing could not be parsed. Try again later, as the servers may be down and make sure Velocity has access to the internet.");
@@ -148,7 +148,7 @@ void GameAdderDialog::gameReplyFinished(QNetworkReply *aReply)
             .femaleAvatarAwardsEarned = 0,
             .femaleAvatarAwardCount = (BYTE)femaleAwardCount.toInt(),
             .flags = 0,
-            .lastPlayed = QDateTime::currentDateTime().toTime_t(),
+            .lastPlayed = QDateTime::currentDateTime().currentSecsSinceEpoch(),
             .gameName = gameName.toStdWString()
         };
 
@@ -637,7 +637,7 @@ void GameAdderDialog::on_txtSearch_textChanged(const QString & /* arg1 */)
 
     // hide all the items
     for (int i = 0; i < ui->treeWidgetAllGames->topLevelItemCount(); i++)
-        ui->treeWidgetAllGames->setItemHidden(ui->treeWidgetAllGames->topLevelItem(i), true);
+        ui->treeWidgetAllGames->topLevelItem(i)->setHidden(true);
 
     if (itemsMatched.count() == 0)
     {
@@ -654,13 +654,13 @@ void GameAdderDialog::on_txtSearch_textChanged(const QString & /* arg1 */)
         QTreeWidgetItem *parent = itemsMatched.at(i)->parent();
         while (parent != NULL)
         {
-            ui->treeWidgetAllGames->setItemHidden(parent, false);
+            parent->setHidden(false);
             parent->setExpanded(true);
             parent = parent->parent();
         }
 
         // show the item itself
-        ui->treeWidgetAllGames->setItemHidden(itemsMatched.at(i), false);
+        itemsMatched.at(i)->setHidden(false);
     }
 }
 

Velocity/gameadderdialog.h

@@ -5,6 +5,7 @@
 #include <QDialog>
 #include <QNetworkRequest>
 #include <QNetworkAccessManager>
+#include <QNetworkInformation>
 #include <QNetworkReply>
 #include <QTreeWidgetItem>
 #include <QDateTime>

Velocity/gamerpicturepackdialog.cpp

@@ -83,20 +83,22 @@ void GamerPicturePackDialog::gamercardNetworkReply(QNetworkReply *reply)
     {
         // setup
         QString pageSource(reply->readAll());
-        QRegExp exp("<title>([^<]*).*<img id=\"Gamerpic\" src=\"([^\"]*)");
+        QRegularExpression exp("<title>([^<]*).*<img id=\"Gamerpic\" src=\"([^\"]*)");
 
-        exp.indexIn(pageSource, 0);
+        QRegularExpressionMatch match = exp.match(pageSource);
+        if (!match.hasMatch())
+            return;
 
         // request image
-        QString gamertag = exp.cap(1);
+        QString gamertag = match.captured(1);
         ui->txtSearch->setText(gamertag);
 
         if (searchedGamertags.contains(gamertag))
             return;
 
         searchedGamertags.push_back(gamertag);
 
-        QString urlStr = exp.cap(2);
+        QString urlStr = match.captured(2);
         QUrl url(urlStr);
 
         if (url.host() == "avatar.xboxlive.com")
@@ -180,8 +182,8 @@ void GamerPicturePackDialog::onTitleIDSearchReturn(QList<TitleData> titlesFound)
     // display all the titles found in the widget
     for (int i = 0; i < titlesFound.size(); i++)
     {
-        QString newStr = ((QString*)&titlesFound.at(i).titleName)->replace("&#174;", "�").replace("&#39;",
-                "'").replace("&amp;","&").replace("&gt;",">").replace("&lt;","<").replace("�", "").replace("�", "");
+        QString newStr = ((QString*)&titlesFound.at(i).titleName)->replace("&#174;", "®").replace("&#39;",
+                "'").replace("&amp;","&").replace("&gt;",">").replace("&lt;","<").replace("â", "").replace("¢", "");
         ui->listGameNames->addItem(newStr);
     }
 }
@@ -493,7 +495,7 @@ bool GamerPicturePackDialog::verifyGamertag(QString gamertag)
     if (gamertag.length() == 0 || gamertag.length() > 15 || !gamertag.at(0).isLetter())
         return false;
 
-    QChar prevChar = 0;
+    QChar prevChar(0);
     for (int i = 1; i < gamertag.length(); i++)
     {
         if (gamertag.at(i) == ' ' && prevChar == ' ')

Velocity/githubcommitsdialog.cpp

@@ -27,7 +27,7 @@ GitHubCommitsDialog::GitHubCommitsDialog(QWidget *parent) :
     label->setWordWrap(true);
 
     // make sure we can connect to the internet
-    if (commitsManager->networkAccessible() == QNetworkAccessManager::NotAccessible)
+    if (QNetworkInformation::instance()->reachability() != QNetworkInformation::Reachability::Online)
     {
         label->setText("<center>Error connecting to GitHub...</center>");
         return;
@@ -103,7 +103,7 @@ void GitHubCommitsDialog::onCommitsReply(QNetworkReply *reply)
 
     if (++retrievedCount == branchCount)
     {
-        qSort(allCommits.begin(), allCommits.end(), commitCompare);
+        std::sort(allCommits.begin(), allCommits.end(), commitCompare);
 
         int iterations = (allCommits.size() > 20) ? 20 : allCommits.size();
         for (int i = 0; i < iterations; i++)

Velocity/githubcommitsdialog.h

@@ -4,6 +4,7 @@
 #include <QDialog>
 #include <QLabel>
 #include <QNetworkAccessManager>
+#include <QNetworkInformation>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QDateTime>