From ccf96391ca827524df89236b783c839297f6eaa8 Mon Sep 17 00:00:00 2001
From: Daniel Savchenko <dsavchenko@carlos.informatik.rwth-aachen.de>
Date: Wed, 19 Feb 2025 14:22:52 +0100
Subject: [PATCH] resolve conflict
---
LicenseManager/keyGen/keygenWidget.cc | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/LicenseManager/keyGen/keygenWidget.cc b/LicenseManager/keyGen/keygenWidget.cc
index 8f74df5d..98057853 100644
--- a/LicenseManager/keyGen/keygenWidget.cc
+++ b/LicenseManager/keyGen/keygenWidget.cc
@@ -150,13 +150,13 @@ QString KeyGen::filterString(QString in) {
std::vector<KeyGen> KeyGen::CreateFromMessyString(QString info)
{
- const QString dirt = "[\\s;>]*";
+ const QString dirt = "[\\s;>]*";
const QRegularExpression rx("\\b([\\w-]+)" + dirt + "((?:(?:[a-f0-9]" + dirt + "){40}){6,})\\b");
const QRegularExpression partRe("((?:[a-f0-9]" + dirt + "){40})");
std::vector<KeyGen> R;
QRegularExpressionMatch rxMatch;
- int pos = 0;
+ int pos = 0;
while ((pos = info.indexOf(rx, pos, &rxMatch)) != -1) {
QString hashesStr = rxMatch.captured(2);
QStringList hashes;
@@ -165,23 +165,23 @@ std::vector<KeyGen> KeyGen::CreateFromMessyString(QString info)
while ((hashPos = hashesStr.indexOf(partRe, hashPos, &partReMatch)) != -1) {
hashes.append(filterString(partReMatch.captured(1)));
hashPos += partReMatch.capturedLength(1);
- }
+ }
- QStringList macList;
- std::copy(hashes.begin() + 4, hashes.end() - 1, std::back_inserter(macList));
+ QStringList macList;
+ std::copy(hashes.begin() + 4, hashes.end() - 1, std::back_inserter(macList));
KeyGen K(rxMatch.captured(1),
- hashes[0],
- hashes[1],
- hashes[2],
- hashes[3],
- macList,
+ hashes[0],
+ hashes[1],
+ hashes[2],
+ hashes[3],
+ macList,
hashes[hashes.count() - 1]);
- R.push_back(K);
+ R.push_back(K);
pos += rxMatch.capturedLength(0);
- }
+ }
- return R;
+ return R;
}
KeyGenWidget::KeyGenWidget(QMainWindow *parent)
--
GitLab