Compatibility with Qt 6

Author: D0ntPanic

QCodeEditor.py

@@ -20,9 +20,15 @@
 modified to be heavily dependent on the BN theme system.
 '''
 
-from PySide2.QtCore import Qt, QRect, QRegExp
-from PySide2.QtWidgets import QWidget, QTextEdit, QPlainTextEdit
-from PySide2.QtGui import (QPainter, QFont, QSyntaxHighlighter, QTextFormat, QTextCharFormat)
+import binaryninjaui
+if "qt_major_version" in binaryninjaui.__dict__ and binaryninjaui.qt_major_version == 6:
+    from PySide6.QtCore import Qt, QRect, QRegularExpression
+    from PySide6.QtWidgets import QWidget, QTextEdit, QPlainTextEdit
+    from PySide6.QtGui import (QPainter, QFont, QSyntaxHighlighter, QTextFormat, QTextCharFormat)
+else:
+    from PySide2.QtCore import Qt, QRect, QRegularExpression
+    from PySide2.QtWidgets import QWidget, QTextEdit, QPlainTextEdit
+    from PySide2.QtGui import (QPainter, QFont, QSyntaxHighlighter, QTextFormat, QTextCharFormat)
 from binaryninjaui import (getMonospaceFont, getThemeColor, ThemeColor)
 
 
@@ -90,8 +96,8 @@ def __init__(self, document):
 		# Multi-line strings (expression, flag, style)
 		# FIXME: The triple-quotes in these two lines will mess up the
 		# syntax highlighting from this point onward
-		self.tri_single = (QRegExp("'''"), 1, STYLES['string2'])
-		self.tri_double = (QRegExp('"""'), 2, STYLES['string2'])
+		self.tri_single = (QRegularExpression("'''"), 1, STYLES['string2'])
+		self.tri_double = (QRegularExpression('"""'), 2, STYLES['string2'])
 
 		rules = []
 
@@ -128,7 +134,7 @@ def __init__(self, document):
 		]
 
 		# Build a QRegExp for each pattern
-		self.rules = [(QRegExp(pat), index, fmt)
+		self.rules = [(QRegularExpression(pat), index, fmt)
 			for (pat, index, fmt) in rules]
 
 
@@ -257,7 +263,7 @@ def paintEvent(self, event):
 
 		def getWidth(self):
 			count = self.editor.blockCount()
-			width = self.fontMetrics().width(str(count)) + 10
+			width = self.fontMetrics().horizontalAdvance(str(count)) + 10
 			return width
 
 		def updateWidth(self):

__init__.py

@@ -4,17 +4,26 @@
 import os
 import re
 import codecs
-from PySide2.QtWidgets import (QLineEdit, QPushButton, QApplication, QTextEdit, QWidget,
-     QVBoxLayout, QHBoxLayout, QDialog, QFileSystemModel, QTreeView, QLabel, QSplitter,
-     QInputDialog, QMessageBox, QHeaderView, QMenu, QAction, QKeySequenceEdit,
-     QPlainTextEdit)
-from PySide2.QtCore import (QDir, QObject, Qt, QFileInfo, QItemSelectionModel, QSettings, QUrl)
-from PySide2.QtGui import (QFont, QFontMetrics, QDesktopServices, QKeySequence, QIcon)
+import binaryninjaui
+from binaryninjaui import (getMonospaceFont, UIAction, UIActionHandler, Menu, DockHandler)
+if "qt_major_version" in binaryninjaui.__dict__ and binaryninjaui.qt_major_version == 6:
+    from PySide6.QtWidgets import (QLineEdit, QPushButton, QApplication, QTextEdit, QWidget,
+         QVBoxLayout, QHBoxLayout, QDialog, QFileSystemModel, QTreeView, QLabel, QSplitter,
+         QInputDialog, QMessageBox, QHeaderView, QMenu, QKeySequenceEdit,
+         QPlainTextEdit)
+    from PySide6.QtCore import (QDir, QObject, Qt, QFileInfo, QItemSelectionModel, QSettings, QUrl)
+    from PySide6.QtGui import (QAction, QFont, QFontMetrics, QDesktopServices, QKeySequence, QIcon)
+else:
+    from PySide2.QtWidgets import (QLineEdit, QPushButton, QApplication, QTextEdit, QWidget,
+         QVBoxLayout, QHBoxLayout, QDialog, QFileSystemModel, QTreeView, QLabel, QSplitter,
+         QInputDialog, QMessageBox, QHeaderView, QMenu, QKeySequenceEdit, QAction,
+         QPlainTextEdit)
+    from PySide2.QtCore import (QDir, QObject, Qt, QFileInfo, QItemSelectionModel, QSettings, QUrl)
+    from PySide2.QtGui import (QFont, QFontMetrics, QDesktopServices, QKeySequence, QIcon)
 from binaryninja import user_plugin_path
 from binaryninja.plugin import PluginCommand, MainThreadActionHandler
 from binaryninja.mainthread import execute_on_main_thread
 from binaryninja.log import (log_error, log_debug)
-from binaryninjaui import (getMonospaceFont, UIAction, UIActionHandler, Menu, DockHandler)
 import numbers
 from .QCodeEditor import QCodeEditor, PythonHighlighter
 
@@ -164,7 +173,7 @@ def __init__(self, context, parent=None):
         font = getMonospaceFont(self)
         self.edit.setFont(font)
         font = QFontMetrics(font)
-        self.edit.setTabStopWidth(4 * font.width(' ')) #TODO, replace with settings API
+        self.edit.setTabStopDistance(4 * font.horizontalAdvance(' ')) #TODO, replace with settings API
 
         #Files
         self.files = QFileSystemModel()