From 6c36e10c185c4c8bb99d95ae5eb60042af7693e6 Mon Sep 17 00:00:00 2001
From: martravi <martravi@hotmail.de>
Date: Sat, 20 Jul 2024 14:07:26 +0200
Subject: [PATCH] Port symbolizer to Qt 6

---
 saveToy/includes.h        | 2 +-
 saveToy/ngdialog.h        | 2 +-
 symbolizer/elfparser.cpp  | 4 ++--
 symbolizer/elfparser.h    | 2 +-
 symbolizer/symbolizer.pro | 3 ++-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/saveToy/includes.h b/saveToy/includes.h
index d45ded5..c44cfb2 100644
--- a/saveToy/includes.h
+++ b/saveToy/includes.h
@@ -16,7 +16,7 @@
 #include <QObject>
 #include <QProcess>
 #include <QQueue>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QSettings>
 #include <QtDebug>
 #include <QTimer>
diff --git a/saveToy/ngdialog.h b/saveToy/ngdialog.h
index 19eb625..2b5283b 100644
--- a/saveToy/ngdialog.h
+++ b/saveToy/ngdialog.h
@@ -25,7 +25,7 @@ public:
 private:
     Ui::NgDialog *ui;
 
-    QRegExp hex;
+    QRegularExpression hex;
 
     bool ValidNGID();
     bool ValidNGKeyID();
diff --git a/symbolizer/elfparser.cpp b/symbolizer/elfparser.cpp
index 27fc2cf..eadfe96 100644
--- a/symbolizer/elfparser.cpp
+++ b/symbolizer/elfparser.cpp
@@ -14,7 +14,7 @@ bool ElfParser::ParseText( const QString &str )
 	QMap< QString, QStringList >rawFiles;
 	QMap< QString, QStringList >rawSections;
 	QMap< QString, QStringList >rawSymbolTable;
-	QStringList lines = str.split( '\n', QString::KeepEmptyParts );
+    QStringList lines = str.split( '\n', Qt::KeepEmptyParts );
 	quint32 lineCnt = lines.size();
 	for( quint32 i = 0; i < lineCnt; i++ )
 	{
@@ -388,7 +388,7 @@ bool ElfParser::ParseFileText( const QStringList &strs, const QStringList &secti
 			{
 				qDebug() << "ref.off is busted 1" << name << str;
 
-				qDebug() << ::hex << refOff << fStart;
+                qDebug() << Qt::hex << refOff << fStart;
 				exit( 0 );
 			}
 		}
diff --git a/symbolizer/elfparser.h b/symbolizer/elfparser.h
index f5b44bc..2b4b2e8 100644
--- a/symbolizer/elfparser.h
+++ b/symbolizer/elfparser.h
@@ -101,7 +101,7 @@ private:
 	// takes each file and separetes it into functions
 	bool ParseFileText( const QStringList &strs, const QStringList &sectionStrs, const QStringList &symbolStrs, File &file );
 
-	QRegExp funcStart;
+	QRegularExpression funcStart;
 	bool IsFunctionStart( const QString &str, quint32 *start = NULL );
 
 	// extract function name from the line that starts it
diff --git a/symbolizer/symbolizer.pro b/symbolizer/symbolizer.pro
index 77cd832..ab03b25 100644
--- a/symbolizer/symbolizer.pro
+++ b/symbolizer/symbolizer.pro
@@ -4,7 +4,8 @@
 #
 #-------------------------------------------------
 
-QT       += core
+QT       += core\
+            widgets
 
 #QT       -= gui