feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

MarketPlace: Fix issues pointed out by static analyzer

Browse Source 
- Use static regular expressions
- Don't mix iterator and const_iterator
- Use const Qt container in range based for loop

Change-Id: Iaa3a6a1eda28c6b962f28bd09bfaa53e6f5f8453
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Eike Ziller
2023-01-10 11:50:50 +01:00
parent 237d1b2c8e
commit 2f70875ee3
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/marketplace/productlistmodel.cpp
View File

@@ -3,8 +3,6 @@
#include "productlistmodel.h" #include "productlistmodel.h"
#include "marketplaceplugin.h"
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/executeondestruction.h> #include <utils/executeondestruction.h>
#include <utils/networkaccessmanager.h> #include <utils/networkaccessmanager.h>
@@ -102,12 +100,14 @@ static const QNetworkRequest constructRequest(const QString &collection)
static const QString plainTextFromHtml(const QString &original) static const QString plainTextFromHtml(const QString &original)
{ {
QString plainText(original); QString plainText(original);
QRegularExpression breakReturn("<\\s*br/?\\s*>", QRegularExpression::CaseInsensitiveOption); static const QRegularExpression breakReturn("<\\s*br/?\\s*>",
QRegularExpression::CaseInsensitiveOption);
static const QRegularExpression allTags("<[^>]*>");
static const QRegularExpression moreThan2NewLines("\n{3,}");
plainText.replace(breakReturn, "\n"); // "translate" <br/> into newline plainText.replace(breakReturn, "\n"); // "translate" <br/> into newline
plainText.remove(QRegularExpression("<[^>]*>")); // remove all tags plainText.remove(allTags); // remove all tags
plainText = plainText.trimmed(); plainText = plainText.trimmed();
plainText.replace(QRegularExpression("\n{3,}"), "\n\n"); // consolidate some newlines plainText.replace(moreThan2NewLines, "\n\n"); // consolidate some newlines
// FIXME the description text is usually too long and needs to get elided sensibly // FIXME the description text is usually too long and needs to get elided sensibly
return (plainText.length() > 157) ? plainText.left(157).append("...") : plainText; return (plainText.length() > 157) ? plainText.left(157).append("...") : plainText;
@@ -240,7 +240,8 @@ void SectionedProducts::onFetchSingleCollectionFinished(QNetworkReply *reply)
product->description = plainTextFromHtml(obj.value("body_html").toString()); product->description = plainTextFromHtml(obj.value("body_html").toString());
product->handle = handle; product->handle = handle;
for (auto val : obj.value("tags").toArray()) const QJsonArray tags = obj.value("tags").toArray();
for (auto val : tags)
product->tags.append(val.toString()); product->tags.append(val.toString());
const auto images = obj.value("images").toArray(); const auto images = obj.value("images").toArray();
@@ -302,7 +303,7 @@ void SectionedProducts::fetchNextImage()
return; return;
} }
const auto it = m_pendingImages.begin(); const auto it = m_pendingImages.constBegin();
const QString nextUrl = *it; const QString nextUrl = *it;
m_pendingImages.erase(it); m_pendingImages.erase(it);