Skip to content

Commit 88ed786

Browse files
bgalloisbgallois
committed
[opti] global: fix qstring-allocations
https://github.com/KDE/clazy/blob/master/docs/checks/README-qstring-allocations.md
1 parent 11d5d66 commit 88ed786

File tree

12 files changed

+344
-344
lines changed

12 files changed

+344
-344
lines changed

‎src/annotation.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void Annotation::clear() {
3737
if (!annotationFile->fileName().isEmpty()) {
3838
writeToFile();
3939
annotationFile->close();
40-
annotationFile->setFileName("");
40+
annotationFile->setFileName(QLatin1String(""));
4141
}
4242
findIndexes.clear();
4343
findIndex = -1;
@@ -58,10 +58,10 @@ bool Annotation::setPath(const QString &filePath) {
5858

5959
QTextStream in(annotationFile);
6060
QString data = in.readAll();
61-
QStringList annotationEntries = data.split("\n\t\n");
61+
QStringList annotationEntries = data.split(QStringLiteral("\n\t\n"));
6262

6363
for (auto const &a : annotationEntries) {
64-
QStringList entry = a.split("\t\n\t");
64+
QStringList entry = a.split(QStringLiteral("\t\n\t"));
6565
if (entry.length() == 2) {
6666
annotations->insert(entry[0].toInt(), entry[1]);
6767
}

‎src/autolevel.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ AutoLevel::AutoLevel(const string &path, const UMat &background, const QMap<QStr
4949
QString savingFilename = savingInfo.baseName();
5050
m_savedPath = savingInfo.absolutePath();
5151
if (video.isSequence()) {
52-
m_savedPath.append(QString("/Tracking_Result"));
52+
m_savedPath.append(QStringLiteral("/Tracking_Result"));
5353
}
5454
else {
55-
m_savedPath.append(QString("/Tracking_Result_") + savingFilename);
55+
m_savedPath.append(QStringLiteral("/Tracking_Result_") + savingFilename);
5656
}
5757
QDir r;
5858
r.rename(m_savedPath, m_savedPath + "tmp");
@@ -69,22 +69,22 @@ QMap<QString, double> AutoLevel::level() {
6969
double stdDist = static_cast<double>(rand() % 500 + 1);
7070
double stdArea = static_cast<double>(rand() % 500 + 1);
7171
double stdPerimeter = static_cast<double>(rand() % 500 + 1);
72-
int spot = m_parameters.value("spot").toInt();
72+
int spot = m_parameters.value(QStringLiteral("spot")).toInt();
7373
if (spot == 0) {
74-
m_spotSuffix = "Head";
74+
m_spotSuffix = QStringLiteral("Head");
7575
}
7676
else if (spot == 1) {
77-
m_spotSuffix = "Tail";
77+
m_spotSuffix = QStringLiteral("Tail");
7878
}
7979
else if (spot == 2) {
80-
m_spotSuffix = "Body";
80+
m_spotSuffix = QStringLiteral("Body");
8181
}
8282
int counter = 0;
83-
while (abs(stdAngle - m_parameters.value("normAngle").toDouble()) > 1E-3 && abs(stdDist - m_parameters.value("normDist").toDouble()) > 1E-3 && abs(stdArea - m_parameters.value("normArea").toDouble()) > 1E-3 && abs(stdPerimeter - m_parameters.value("normPerim").toDouble()) > 1E-3) {
84-
m_parameters.insert("normAngle", QString::number(stdAngle));
85-
m_parameters.insert("normDist", QString::number(stdDist));
86-
m_parameters.insert("normArea", QString::number(stdArea));
87-
m_parameters.insert("normPerim", QString::number(stdPerimeter));
83+
while (abs(stdAngle - m_parameters.value(QStringLiteral("normAngle")).toDouble()) > 1E-3 && abs(stdDist - m_parameters.value(QStringLiteral("normDist")).toDouble()) > 1E-3 && abs(stdArea - m_parameters.value(QStringLiteral("normArea")).toDouble()) > 1E-3 && abs(stdPerimeter - m_parameters.value(QStringLiteral("normPerim")).toDouble()) > 1E-3) {
84+
m_parameters.insert(QStringLiteral("normAngle"), QString::number(stdAngle));
85+
m_parameters.insert(QStringLiteral("normDist"), QString::number(stdDist));
86+
m_parameters.insert(QStringLiteral("normArea"), QString::number(stdArea));
87+
m_parameters.insert(QStringLiteral("normPerim"), QString::number(stdPerimeter));
8888
Tracking tracking = Tracking(m_path, m_background, 0, m_endImage);
8989
tracking.updatingParameters(m_parameters);
9090
tracking.startProcess();
@@ -103,11 +103,11 @@ QMap<QString, double> AutoLevel::level() {
103103
}
104104
}
105105
QMap<QString, double> levelParameters;
106-
levelParameters.insert("normAngle", stdAngle);
107-
levelParameters.insert("normDist", stdDist);
108-
levelParameters.insert("normArea", stdArea);
109-
levelParameters.insert("normPerim", stdPerimeter);
110-
levelParameters.insert("nIterations", double(counter));
106+
levelParameters.insert(QStringLiteral("normAngle"), stdAngle);
107+
levelParameters.insert(QStringLiteral("normDist"), stdDist);
108+
levelParameters.insert(QStringLiteral("normArea"), stdArea);
109+
levelParameters.insert(QStringLiteral("normPerim"), stdPerimeter);
110+
levelParameters.insert(QStringLiteral("nIterations"), double(counter));
111111
emit levelParametersChanged(levelParameters);
112112
emit finished();
113113
return levelParameters;
@@ -145,8 +145,8 @@ double AutoLevel::computeStdAngle(const Data &data) {
145145
QList<double> angleDiff(i.value("t" + m_spotSuffix).size());
146146
QList<double> ang = i.value("t" + m_spotSuffix);
147147
std::adjacent_difference(ang.begin(), ang.end(), angleDiff.begin(), [](double a, double b) { return Tracking::angleDifference(b, a); });
148-
QList<double> tDiff(i.value("imageNumber").size());
149-
QList<double> image = i.value("imageNumber");
148+
QList<double> tDiff(i.value(QStringLiteral("imageNumber")).size());
149+
QList<double> image = i.value(QStringLiteral("imageNumber"));
150150
std::adjacent_difference(image.begin(), image.end(), tDiff.begin());
151151
std::transform(angleDiff.begin(), angleDiff.end(), tDiff.begin(), angleDiff.begin(), std::divides<double>{}); // Divide the distance by the time to account for time gaps
152152
angleDiff.removeFirst();
@@ -171,8 +171,8 @@ double AutoLevel::computeStdDistance(const Data &data) {
171171
QList<double> yDiff(i.value("y" + m_spotSuffix).size());
172172
QList<double> y = i.value("y" + m_spotSuffix);
173173
std::adjacent_difference(y.begin(), y.end(), yDiff.begin());
174-
QList<double> tDiff(i.value("imageNumber").size());
175-
QList<double> image = i.value("imageNumber");
174+
QList<double> tDiff(i.value(QStringLiteral("imageNumber")).size());
175+
QList<double> image = i.value(QStringLiteral("imageNumber"));
176176
std::adjacent_difference(image.begin(), image.end(), tDiff.begin());
177177
QList<double> dist(xDiff.size());
178178
std::transform(xDiff.begin(), xDiff.end(), yDiff.begin(), dist.begin(), [](double a, double b) { return std::pow(std::pow(a, 2) + std::pow(b, 2), 0.5); });
@@ -193,8 +193,8 @@ double AutoLevel::computeStdArea(const Data &data) {
193193
QList<int> ids = data.getId(0, data.maxFrameIndex);
194194
for (const int &a : ids) {
195195
QHash<QString, QList<double>> i = data.getDataId(a);
196-
QList<double> areaDiff(i.value("areaBody").size());
197-
QList<double> ar = i.value("areaBody");
196+
QList<double> areaDiff(i.value(QStringLiteral("areaBody")).size());
197+
QList<double> ar = i.value(QStringLiteral("areaBody"));
198198
std::adjacent_difference(ar.begin(), ar.end(), areaDiff.begin());
199199
areaDiff.removeFirst();
200200
area.append(areaDiff);
@@ -212,8 +212,8 @@ double AutoLevel::computeStdPerimeter(const Data &data) {
212212
QList<int> ids = data.getId(0, data.maxFrameIndex);
213213
for (const int &a : ids) {
214214
QHash<QString, QList<double>> i = data.getDataId(a);
215-
QList<double> perimDiff(i.value("perimeterBody").size());
216-
QList<double> perim = i.value("perimeterBody");
215+
QList<double> perimDiff(i.value(QStringLiteral("perimeterBody")).size());
216+
QList<double> perim = i.value(QStringLiteral("perimeterBody"));
217217
std::adjacent_difference(perim.begin(), perim.end(), perimDiff.begin());
218218
perimDiff.removeFirst();
219219
perimeter.append(perimDiff);

0 commit comments

Comments
 (0)