Compile with Qt6

Author: tmontaigu

CloudCompare-PythonRuntime.qrc

@@ -20,7 +20,7 @@
         <file>images/editor/ccPencil.png</file>
         <file>images/editor/ccSave.png</file>
         <file>images/editor/dbHObjectSymbol.png</file>
-        <!--        <file>images/editor/dbHObjectSymbolLocked.png</file>-->
+        <file>images/editor/dbHObjectSymbolLocked.png</file>
         <file>images/editor/dbLockSymbol.png</file>
         <file>images/editor/smallTrash.png</file>
         <file>images/editor/smallValidate.png</file>

images/editor/dbHObjectSymbolLocked.png

@@ -550,7 +550,7 @@ void PythonEditor::readSettings()
     const QByteArray geometry = settings.value("geometry", QByteArray()).toByteArray();
     if (geometry.isEmpty())
     {
-        const QRect availableGeometry = QApplication::desktop()->availableGeometry(this);
+        const QRect availableGeometry = this->screen()->availableGeometry();;
         resize(availableGeometry.width() / 3, availableGeometry.height() / 2);
         move((availableGeometry.width() - width()) / 2,
              (availableGeometry.height() - height()) / 2);

src/CodeEditor/PythonEditor.cpp

@@ -18,16 +18,14 @@
 #include "PythonInterpreter.h"
 #include "Resources.h"
 
-#include <QDialog>
 #include <QDir>
 #include <QIcon>
 #include <QInputDialog>
 #include <QMessageBox>
 #include <QPlainTextEdit>
 #include <QProcess>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QTableWidgetItem>
-#include <QTextCodec>
 #include <QtGlobal>
 
 #include <ccLog.h>
@@ -292,12 +290,12 @@ void PackageManager::refreshInstalledPackagesList()
     m_pythonProcess->setArguments(arguments);
 
     QEventLoop loop;
-    QObject::connect(
+    connect(
         m_pythonProcess,
-        static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+        &QProcess::finished,
         &loop,
         &QEventLoop::quit);
-    QObject::connect(m_pythonProcess, &QProcess::errorOccurred, &loop, &QEventLoop::quit);
+    connect(m_pythonProcess, &QProcess::errorOccurred, &loop, &QEventLoop::quit);
     m_pythonProcess->start(QIODevice::ReadOnly);
     if (m_pythonProcess->state() != QProcess::ProcessState::Starting &&
         m_pythonProcess->state() != QProcess::ProcessState::Running)
@@ -316,11 +314,11 @@ void PackageManager::refreshInstalledPackagesList()
     }
 
     const QString output =
-        QTextCodec::codecForName("utf-8")->toUnicode(m_pythonProcess->readAllStandardOutput());
+       QString::fromUtf8(m_pythonProcess->readAllStandardOutput());
 
-    const QVector<QStringRef> lines = output.splitRef("\n");
+    const QStringList lines = output.split("\n");
 
-    const QRegExp regex(R"((\S*)(?:\s*)(\S*)(?:\s*)(\S?))");
+    const QRegularExpression regex(R"((\S*)(?:\s*)(\S*)(?:\s*)(\S?))");
 
     // First line is a header, second is separator
     // and last one seems to always be empty
@@ -333,15 +331,15 @@ void PackageManager::refreshInstalledPackagesList()
 
     for (int i{2}; i < lines.size() - 1; ++i)
     {
-        const QStringRef &currentLine = lines[i];
+        const QString &currentLine = lines[i];
 
         // Do it this way to avoid an extra allocation
-        int pos = regex.indexIn(currentLine.toString());
-        if (pos != -1)
+       const  QRegularExpressionMatch match = regex.match(currentLine);
+        if (match.hasMatch())
         {
             for (int j = 1; j < 3; ++j)
             {
-                const QString lol = regex.cap(j);
+                const QString lol = match.captured(j);
                 auto *thing = new QTableWidgetItem(lol);
                 if (j != 1)
                 {
@@ -353,7 +351,7 @@ void PackageManager::refreshInstalledPackagesList()
     }
 
     const QString errorOutput =
-        QTextCodec::codecForName("utf-8")->toUnicode(m_pythonProcess->readAllStandardError());
+        QString::fromUtf8(m_pythonProcess->readAllStandardError());
 
     if (!errorOutput.isEmpty())
     {
@@ -469,13 +467,12 @@ void PackageManager::executeCommand(const QStringList &arguments)
     m_outputDialog->clear();
     m_pythonProcess->setArguments(arguments);
     m_pythonProcess->start(QIODevice::ReadOnly);
-    QTextCodec *utf8Codec = QTextCodec::codecForName("utf-8");
 
     while (m_pythonProcess->state() != QProcess::ProcessState::NotRunning)
     {
         if (m_pythonProcess->waitForReadyRead())
         {
-            const QString output = utf8Codec->toUnicode(m_pythonProcess->readAll());
+            const QString output = QString::fromUtf8(m_pythonProcess->readAll());
             m_outputDialog->appendPlainText(output);
             QApplication::processEvents();
         }

src/PackageManager.cpp

@@ -22,9 +22,9 @@
 #include <QDir>
 #include <QMessageBox>
 #include <QProcess>
-#include <QTextCodec>
 #include <QVector>
 #include <QtGlobal>
+#include <QStringView>
 
 #if !defined(USE_EMBEDDED_MODULES) && defined(Q_OS_WINDOWS)
 static QString WindowsBundledSitePackagesPath()
@@ -36,9 +36,9 @@ static QString WindowsBundledSitePackagesPath()
 
 //================================================================================
 
-Version::Version(const QStringRef &versionStr) : Version()
+Version::Version(const QString &versionStr) : Version()
 {
-    QVector<QStringRef> parts = versionStr.split('.');
+    const QStringList parts = versionStr.split('.');
     if (parts.size() == 3)
     {
         major = parts[0].toUInt();
@@ -63,13 +63,12 @@ static Version GetPythonExeVersion(QProcess &pythonProcess)
     pythonProcess.start(QIODevice::ReadOnly);
     pythonProcess.waitForFinished();
 
-    const QString versionStr =
-        QTextCodec::codecForName("utf-8")->toUnicode(pythonProcess.readAllStandardOutput());
+    const QString versionStr = QString::fromUtf8(pythonProcess.readAllStandardOutput());
 
-    QVector<QStringRef> splits = versionStr.splitRef(" ");
+    const QStringList splits = versionStr.split(" ");
     if (splits.size() == 2 && splits[0].contains("Python"))
     {
-        return Version(splits[1]);
+        return Version(splits.at(1));
     }
     return Version{};
 }
@@ -113,7 +112,7 @@ PyVenvCfg PyVenvCfg::FromFile(const QString &path)
                 }
                 else if (name == "version")
                 {
-                    cfg.version = Version(QStringRef(&value));
+                    cfg.version = Version(value);
                 }
             }
         }
@@ -398,8 +397,7 @@ void PythonConfig::initFromPythonExecutable(const QString &pythonExecutable)
     pythonProcess.start(QIODevice::ReadOnly);
     pythonProcess.waitForFinished();
 
-    const QString result =
-        QTextCodec::codecForName("utf-8")->toUnicode(pythonProcess.readAllStandardOutput());
+    const QString result = QString::fromUtf8(pythonProcess.readAllStandardOutput());
 
     QStringList pathsAndHome = result.split('\n');
 

src/PythonConfig.cpp

@@ -41,7 +41,7 @@ struct Version
     {
     }
 
-    explicit Version(const QStringRef &versionStr);
+    explicit Version(const QString &versionStr);
 
     /// Checks whether the Python version number described by
     /// this instance is compatible with the Python version the plugin

src/PythonConfig.h

@@ -57,7 +57,7 @@ static const QStringList s_Operators = {"=",
                                         "<<"};
 
 // Python braces
-static const QStringList s_Braces = {"\\{", "\\}", "\\(", "\\)", R"([)", R"(])"};
+static const QStringList s_Braces = {"\\{", "\\}", "\\(", "\\)", R"(\[)", R"(\])"};
 
 QString PythonHighlighter::CodeElementName(PythonHighlighter::CodeElement e)
 {
@@ -145,7 +145,7 @@ void PythonHighlighter::initialize()
     m_highlightingRules += HighlightingRule(CodeElement::Definition, R"(\bclass\b\s*(\w+))", 1);
 
     // From '#' until a newline
-    m_highlightingRules += HighlightingRule(CodeElement::Comment, "#[^\\n]*", 0);
+    m_highlightingRules += HighlightingRule(CodeElement::Comment, "#[^\r\n]*", 0);
 
     // Numeric literals
     m_highlightingRules += HighlightingRule(CodeElement::Numbers, "\\b[+-]?[0-9]+[lL]?\\b", 0);
@@ -160,22 +160,18 @@ void PythonHighlighter::highlightPythonBlock(const QString &text)
     if (text.isEmpty())
         return;
 
-    int index = -1;
-
     // Do other syntax formatting
     for (const auto &rule : m_highlightingRules)
     {
-        index = rule.pattern.indexIn(text, 0);
-
-        // We actually want the index of the nth match
-        while (index >= 0)
+        QRegularExpressionMatchIterator i = rule.pattern.globalMatch(text);
+        while (i.hasNext())
         {
-            index = rule.pattern.pos(rule.matchIndex);
-            int length = rule.pattern.cap(rule.matchIndex).length();
+            QRegularExpressionMatch match = i.next();
+            const int index = match.capturedStart(rule.matchIndex);
+            const int length = match.captured(rule.matchIndex).length();
             if (length > 0)
             {
                 setFormat(index, length, rule.format);
-                index = rule.pattern.indexIn(text, index + length);
             }
         }
     }
@@ -196,7 +192,7 @@ inside a multi-line string when this function is finished.
 */
 bool PythonHighlighter::matchMultiLine(const QString &text, const HighlightingRule &rule)
 {
-    int start, add, end, length;
+    int start, add, length;
 
     // If inside triple-single quotes, start at 0
     if (previousBlockState() == rule.matchIndex)
@@ -207,36 +203,42 @@ bool PythonHighlighter::matchMultiLine(const QString &text, const HighlightingRu
     // Otherwise, look for the delimiter on this line
     else
     {
-        start = rule.pattern.indexIn(text);
-        // Move past this match
-        add = rule.pattern.matchedLength();
+        QRegularExpressionMatch match = rule.pattern.match(text);
+        if (match.hasMatch()) {
+            start = match.capturedStart(0);
+            add = match.capturedLength(0);
+        } else {
+            start = -1;
+            add = 0;
+        }
     }
 
-    // As long as there's a delimiter match on this line...
     while (start >= 0)
     {
         // Look for the ending delimiter
-        end = rule.pattern.indexIn(text, start + add);
-        // Ending delimiter on this line?
+        QRegularExpressionMatch endMatch = rule.pattern.match(text, start + add);
+        int end = endMatch.hasMatch() ? endMatch.capturedStart(0) : -1;
+
         if (end >= add)
         {
-            length = end - start + add + rule.pattern.matchedLength();
+            // Ending delimiter on this line
+            length = end - start + add + endMatch.capturedLength(0);
             setCurrentBlockState(0);
         }
-        // No; multi-line string
         else
         {
+            // No; multi-line string
             setCurrentBlockState(rule.matchIndex);
             length = text.length() - start + add;
         }
 
-        // Apply formatting
         setFormat(start, length, rule.format);
 
         // Look for the next match
-        start = rule.pattern.indexIn(text, start + length);
+        QRegularExpressionMatch nextMatch = rule.pattern.match(text, start + length);
+        start = nextMatch.hasMatch() ? nextMatch.capturedStart(0) : -1;
+        add = nextMatch.hasMatch() ? nextMatch.capturedLength(0) : 0;
     }
 
-    // Return True if still inside a multi-line string, False otherwise
     return currentBlockState() == rule.matchIndex;
-}
+}

src/PythonHighlighter.cpp

@@ -23,6 +23,7 @@
 #define PYTHON_HIGHLIGHTER_H
 
 #include <QSyntaxHighlighter>
+#include <QRegularExpression>
 
 class ColorScheme;
 
@@ -59,14 +60,14 @@ class PythonHighlighter final : public QSyntaxHighlighter
     struct HighlightingRule
     {
         CodeElement element = CodeElement::End;
-        QRegExp pattern;
+        QRegularExpression pattern;
         QTextCharFormat format;
         int matchIndex = 0;
 
         HighlightingRule() = default;
 
         HighlightingRule(const CodeElement e, const QString &p, const int i)
-            : element(e), pattern(QRegExp(p)), matchIndex(i)
+            : element(e), pattern(QRegularExpression(p)), matchIndex(i)
         {
         }
     };

src/PythonHighlighter.h

@@ -26,7 +26,6 @@
 #include <QDir>
 #include <QListWidgetItem>
 #include <QMessageBox>
-#include <QTextCodec>
 
 #include <ccLog.h>
 
@@ -45,7 +44,7 @@ static py::dict CreateGlobals()
 {
     py::dict globals;
     globals["__name__"] = "__main__";
-    // Someday we should require pybind11 > 2.6 and use py::detail::ensure_builtins_in_globals ?
+    // TODO Someday we should require pybind11 > 2.6 and use py::detail::ensure_builtins_in_globals ?
     globals["__builtins__"] = PyEval_GetBuiltins();
     return globals;
 }

src/PythonInterpreter.cpp

@@ -176,7 +176,7 @@ void PythonRepl::setupUI()
 
     codeEdit()->installEventFilter(keyPressEater);
     codeEdit()->resize(codeEdit()->width(), 20);
-    codeEdit()->setTabStopWidth(codeEdit()->fontMetrics().width(' ') * 8);
+    codeEdit()->setTabStopDistance(codeEdit()->fontMetrics().horizontalAdvance(' ') * 8);
 
     QFont font("Monospace");
     font.setStyleHint(QFont::TypeWriter);