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

Utils: Replace a few macros in qrcparser

Browse Source 
Change-Id: I8e3953ad7003115334a490d6ebf8222414722e85
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-03-19 10:23:42 +01:00
parent cc25120377
commit 06e3e23aa5
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libs/utils/qrcparser.cpp
View File

@@ -85,7 +85,7 @@ public:
QStringList languages() const; QStringList languages() const;
private: private:
static QString fixPrefix(const QString &prefix); static QString fixPrefix(const QString &prefix);
QStringList allUiLanguages(const QLocale *locale) const; const QStringList allUiLanguages(const QLocale *locale) const;
SMap m_resources; SMap m_resources;
SMap m_files; SMap m_files;
@@ -343,8 +343,7 @@ bool QrcParserPrivate::parseFile(const QString &path, const QString &contents)
QString QrcParserPrivate::firstFileAtPath(const QString &path, const QLocale &locale) const QString QrcParserPrivate::firstFileAtPath(const QString &path, const QLocale &locale) const
{ {
QTC_CHECK(path.startsWith(QLatin1Char('/'))); QTC_CHECK(path.startsWith(QLatin1Char('/')));
QStringList langs = allUiLanguages(&locale); for (const QString &language : allUiLanguages(&locale)) {
foreach (const QString &language, langs) {
if (m_languages.contains(language)) { if (m_languages.contains(language)) {
SMap::const_iterator res = m_resources.find(language + path); SMap::const_iterator res = m_resources.find(language + path);
if (res != m_resources.end()) if (res != m_resources.end())
@@ -358,8 +357,7 @@ void QrcParserPrivate::collectFilesAtPath(const QString &path, QStringList *file
const QLocale *locale) const const QLocale *locale) const
{ {
QTC_CHECK(path.startsWith(QLatin1Char('/'))); QTC_CHECK(path.startsWith(QLatin1Char('/')));
QStringList langs = allUiLanguages(locale); for (const QString &language : allUiLanguages(locale)) {
foreach (const QString &language, langs) {
if (m_languages.contains(language)) { if (m_languages.contains(language)) {
SMap::const_iterator res = m_resources.find(language + path); SMap::const_iterator res = m_resources.find(language + path);
if (res != m_resources.end()) if (res != m_resources.end())
@@ -373,8 +371,7 @@ bool QrcParserPrivate::hasDirAtPath(const QString &path, const QLocale *locale)
{ {
QTC_CHECK(path.startsWith(QLatin1Char('/'))); QTC_CHECK(path.startsWith(QLatin1Char('/')));
QTC_CHECK(path.endsWith(QLatin1Char('/'))); QTC_CHECK(path.endsWith(QLatin1Char('/')));
QStringList langs = allUiLanguages(locale); for (const QString &language : allUiLanguages(locale)) {
foreach (const QString &language, langs) {
if (m_languages.contains(language)) { if (m_languages.contains(language)) {
QString key = language + path; QString key = language + path;
SMap::const_iterator res = m_resources.lowerBound(key); SMap::const_iterator res = m_resources.lowerBound(key);
@@ -391,8 +388,7 @@ void QrcParserPrivate::collectFilesInPath(const QString &path, QMap<QString,QStr
QTC_CHECK(path.startsWith(QLatin1Char('/'))); QTC_CHECK(path.startsWith(QLatin1Char('/')));
QTC_CHECK(path.endsWith(QLatin1Char('/'))); QTC_CHECK(path.endsWith(QLatin1Char('/')));
SMap::const_iterator end = m_resources.end(); SMap::const_iterator end = m_resources.end();
QStringList langs = allUiLanguages(locale); for (const QString &language : allUiLanguages(locale)) {
foreach (const QString &language, langs) {
QString key = language + path; QString key = language + path;
SMap::const_iterator res = m_resources.lowerBound(key); SMap::const_iterator res = m_resources.lowerBound(key);
while (res != end && res.key().startsWith(key)) { while (res != end && res.key().startsWith(key)) {
@@ -401,7 +397,7 @@ void QrcParserPrivate::collectFilesInPath(const QString &path, QMap<QString,QStr
if (endDir == -1) { if (endDir == -1) {
QString fileName = res.key().right(res.key().size()-key.size()); QString fileName = res.key().right(res.key().size()-key.size());
QStringList &els = (*contents)[fileName]; QStringList &els = (*contents)[fileName];
foreach (const QString &val, res.value()) for (const QString &val : res.value())
if (!els.contains(val)) if (!els.contains(val))
els << val; els << val;
++res; ++res;
@@ -424,12 +420,12 @@ void QrcParserPrivate::collectResourceFilesForSourceFile(const QString &sourceFi
{ {
// TODO: use FileName from fileutils for file paths // TODO: use FileName from fileutils for file paths
QStringList langs = allUiLanguages(locale); const QStringList langs = allUiLanguages(locale);
SMap::const_iterator file = m_files.find(sourceFile); SMap::const_iterator file = m_files.find(sourceFile);
if (file == m_files.end()) if (file == m_files.end())
return; return;
foreach (const QString &resource, file.value()) { for (const QString &resource : file.value()) {
foreach (const QString &language, langs) { for (const QString &language : langs) {
if (resource.startsWith(language) && !results->contains(resource)) if (resource.startsWith(language) && !results->contains(resource))
results->append(resource); results->append(resource);
} }
@@ -463,7 +459,7 @@ QString QrcParserPrivate::fixPrefix(const QString &prefix)
return result; return result;
} }
QStringList QrcParserPrivate::allUiLanguages(const QLocale *locale) const const QStringList QrcParserPrivate::allUiLanguages(const QLocale *locale) const
{ {
if (!locale) if (!locale)
return languages(); return languages();