Migrate to Qt6 #619

trevorRO · 2025-02-20T22:28:36Z

No description provided.

trevorRO · 2025-02-21T00:13:19Z

openbr/CMakeLists.txt

+foreach(QT_DEPENDENCY IN LISTS QT_DEPENDENCIES)
+    target_link_libraries(openbr "Qt6::${QT_DEPENDENCY}")
+endforeach()


target_link_libraries wants the Qt components as Qt6::Core where find_package just wants Core

trevorRO · 2025-02-21T20:44:59Z

openbr/openbr.cpp

@@ -33,7 +33,7 @@ static int partialCopy(const QString &string, char *buffer, int buffer_length)
 {
    const QByteArray byteArray = string.toLocal8Bit();

-    int copyLength = std::min(buffer_length-1, byteArray.size());
+    int copyLength = std::min(buffer_length-1, (int)byteArray.size());


qsizetype needs to cast to an int here for std::min

trevorRO · 2025-02-21T20:50:44Z

openbr/openbr_plugin.h

@@ -348,7 +348,7 @@ struct TemplateList : public QList<Template>
            sum+=partitionSizes[i];
        }

-        if (sum != first().size()) qFatal("Partition sizes %i do not span template matrices %i properly", sum, first().size());
+        if (sum != first().size()) qFatal("Partition sizes %i do not span template matrices %lli properly", sum, first().size());


deal with the warning: format specifies type 'int' but the argument has type 'qsizetype' (aka 'long long') [-Wformat]

qsizetype is signed, so maybe lld should be used everywhere

I think %lld and %lliare the same here but lld is used everywhere else so I'll switch it for consistency

trevorRO · 2025-02-21T21:53:38Z

openbr/openbr_plugin.cpp

+    QStringList keys = this->localKeys();
+    keys.sort();


qSort has been removed and recommended to use std::sort which is implemented in QStringList::sort()

trevorRO · 2025-02-21T22:47:18Z

openbr/openbr_plugin.cpp

@@ -1239,46 +1240,46 @@ QStringList br::Context::objects(const char *abstractions, const char *implement
    QRegExp abstractionsRegExp(abstractions);
    QRegExp implementationsRegExp(implementations);

-    if (abstractionsRegExp.exactMatch("Abbreviation"))
+    if (abstractionsRegExp.exactMatch("Abbreviation")) {


suppresses warning: add explicit braces to avoid dangling else [-Wdangling-else]

trevorRO · 2025-02-24T18:02:45Z

openbr/openbr_plugin.cpp

-        if (Globals->parallelism) futures.addFuture(QtConcurrent::run(this, &Distance::compareBlock, targets, queries, output, targetOffset, queryOffset));
+        if (Globals->parallelism) futures.addFuture(QtConcurrent::run(&Distance::compareBlock, this, targets, queries, output, targetOffset, queryOffset));


Update to QConcurrent::run described here https://doc.qt.io/qt-6/concurrent-changes-qt6.html

trevorRO · 2025-02-24T20:53:02Z

openbr/core/cluster.cpp

+        QList<int> allClusterIDs;
+        foreach(auto id, nextClusterIDs) {
+            if (!allClusterIDs.contains(id))
+                allClusterIDs.append(id);
+        }


fromList is no longer supported. Figured this was simply for removing duplicates so I just implemented that instead of relying on the QSet conversion to do it.

recommend using QSet range constructor instead
QSet<int> set(list.begin(), list.end());

I wasn't sure if there was any value to using QSet over manually removing the duplicates. QSet does feel cleaner but it didn't feel right to go from QList --> QSet --> QList

Updated, QSet feels better

trevorRO · 2025-02-24T20:57:43Z

openbr/core/cluster.cpp

-        foreach(int clustID, truthVals.toSet()) {
-            int cnt = truthVals.count(clustID);
-            if (cnt > max) {
-                max = cnt;
+
+        QList<int> tempTruthVal = QList<int>();
+        foreach(int clustID, truthVals) {
+            if (!tempTruthVal.contains(clustID)) {
+                int cnt = truthVals.count(clustID);
+                if (cnt > max) {
+                    max = cnt;
+                }
+
+                tempTruthVal.append(clustID);


Another example of using QSet to remove duplicates. toSet no longer supported.

recommend using QSet range constructor instead

agreed, reverted

trevorRO · 2025-02-25T21:19:43Z

openbr/plugins/output/eval.cpp

@@ -50,7 +50,7 @@ class evalOutput : public MatrixOutput
            } else {
                QFutureSynchronizer<float> futures;
                for (int i=0; i<Globals->crossValidate; i++)
-                    futures.addFuture(QtConcurrent::run(Evaluate, data, targetFiles, queryFiles, csv.arg(QString::number(i)), i));
+                    futures.addFuture(QtConcurrent::run(qOverload<const cv::Mat &, const FileList &, const FileList &, const File &, int>(Evaluate), data, targetFiles, queryFiles, csv.arg(QString::number(i)), i));


Note that QtConcurrent::run does not support calling overloaded functions directly.

KOConchobhair · 2025-02-26T15:11:02Z

openbr/core/cluster.cpp

+        QList<int> allClusterIDs;
+        foreach(auto id, nextClusterIDs) {
+            if (!allClusterIDs.contains(id))
+                allClusterIDs.append(id);
+        }


recommend using QSet range constructor instead
QSet<int> set(list.begin(), list.end());

KOConchobhair · 2025-02-26T15:11:27Z

openbr/core/cluster.cpp

-        foreach(int clustID, truthVals.toSet()) {
-            int cnt = truthVals.count(clustID);
-            if (cnt > max) {
-                max = cnt;
+
+        QList<int> tempTruthVal = QList<int>();
+        foreach(int clustID, truthVals) {
+            if (!tempTruthVal.contains(clustID)) {
+                int cnt = truthVals.count(clustID);
+                if (cnt > max) {
+                    max = cnt;
+                }
+
+                tempTruthVal.append(clustID);


recommend using QSet range constructor instead

KOConchobhair · 2025-02-26T15:17:32Z

openbr/openbr_plugin.h

@@ -348,7 +348,7 @@ struct TemplateList : public QList<Template>
            sum+=partitionSizes[i];
        }

-        if (sum != first().size()) qFatal("Partition sizes %i do not span template matrices %i properly", sum, first().size());
+        if (sum != first().size()) qFatal("Partition sizes %i do not span template matrices %lli properly", sum, first().size());


qsizetype is signed, so maybe lld should be used everywhere

KOConchobhair · 2025-02-26T15:17:57Z

openbr/plugins/format/ebts.cpp

@@ -58,7 +58,7 @@ class ebtsFormat : public Format
            ok = true;
            size = qFromBigEndian<quint32>((const uchar*)byteArray.mid(from,4).constData());
        } else {
-            int index = byteArray.indexOf(QChar(0x1D), from);
+            int index = byteArray.indexOf("0x1D", from);


"\x1D" i think

shouldn't we be able to drop the quotes and just put 0x1D

trevorRO · 2025-02-26T17:24:45Z

openbr/core/eval.cpp

@@ -254,7 +254,7 @@ float Evaluate(const Mat &simmat, const Mat &mask, const File &csv, const QStrin
    std::vector<float> impostors; impostors.reserve(comparisons.size());
    QVector<int> firstGenuineReturns(simmat.rows, 0);

-    size_t falsePositives = 0, previousFalsePositives = 0;
+    size_t falsePositives = 0;


@jklontz previousFalsePositives was unused. Just giving it visibility if it should be used.

trevorRO · 2025-02-26T18:08:10Z

openbr/core/qtutils.cpp

-    if (variant.canConvert(QVariant::List)) return toString(qvariant_cast<QVariantList>(variant));
-    else if (variant.canConvert(QVariant::String)) return variant.toString();
-    else if (variant.canConvert(QVariant::PointF)) {
+    if (variant.canConvert(QMetaType(QMetaType::QVariantList))) return toString(qvariant_cast<QVariantList>(variant));


this version of canConvert is deprecated

Use canConvert(QMetaType(targetTypeId)) instead.

QMetaType()

trevorRO · 2025-02-26T18:44:35Z

openbr/core/utility.cpp

-    QRegExp re(fileInfo.fileName());
-    re.setPatternSyntax(QRegExp::Wildcard);
-
+    QRegularExpression re = QRegularExpression(QRegularExpression::wildcardToRegularExpression(fileInfo.fileName()));


I'm not sold on this is correct. Need to test it in practice. Trying to follow the guide to port to Qt6 here: https://doc.qt.io/qt-6/qregexp.html#porting-to-qregularexpression

trevorRO · 2025-02-26T18:46:09Z

openbr/core/utility.cpp

    QStringList files;
    foreach (const QString &fileName, dir.entryList(QDir::Files))
-        if (re.exactMatch(fileName))
+        if (re.match(fileName).hasMatch())


QRegExp::exactMatch() served two purposes: it exactly matched a regular expression against a subject string, and it implemented partial matching.

Need to figure out still which version of exactMatch we were looking for. Throughout this PR i've implemented the partial match solution

Following guide here: https://doc.qt.io/qt-6/qregexp.html#porting-to-qregularexpression

trevorRO · 2025-02-26T22:16:54Z

openbr/core/cluster.cpp

@@ -223,19 +223,17 @@ Neighborhood br::loadkNN(const QString &infile)
    file.close();
    int min_idx = INT_MAX;
    int max_idx = -1;
-    int count = 0;


count was unused

find qt6

f664f13

trevorRO changed the title ~~find qt6~~ Migrate to Qt6 Feb 20, 2025

trevorRO added 2 commits February 20, 2025 16:11

updated add resrouce

8126506

added prefix

4d06549