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

Update mime database from Qt

Browse Source 
qtbase/18367d0a1182d22f23fa1414432e52b429ae9fa8
  qmimeglobpattern: port some methods to QSV

Change-Id: I7e94df860c131163accad2c9848b8ba2a9a70bed
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2024-08-30 11:21:02 +02:00
parent f128903f20
commit 828ed1eff5
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/mimetypes2/mimeglobpattern.cpp
View File

@@ -58,7 +58,7 @@ void MimeGlobMatchResult::addMatch(const QString &mimeType, int weight, const QS
} }
} }
MimeGlobPattern::PatternType MimeGlobPattern::detectPatternType(const QString &pattern) const MimeGlobPattern::PatternType MimeGlobPattern::detectPatternType(QStringView pattern) const
{ {
const qsizetype patternLength = pattern.size(); const qsizetype patternLength = pattern.size();
if (!patternLength) if (!patternLength)
@@ -164,7 +164,7 @@ bool MimeGlobPattern::matchFileName(const QString &inputFileName) const
return false; return false;
} }
static bool isSimplePattern(const QString &pattern) static bool isSimplePattern(QStringView pattern)
{ {
// starts with "*.", has no other '*' // starts with "*.", has no other '*'
return pattern.lastIndexOf(u'*') == 0 return pattern.lastIndexOf(u'*') == 0
@@ -176,7 +176,7 @@ static bool isSimplePattern(const QString &pattern)
; ;
} }
static bool isFastPattern(const QString &pattern) static bool isFastPattern(QStringView pattern)
{ {
// starts with "*.", has no other '*' and no other '.' // starts with "*.", has no other '*' and no other '.'
return pattern.lastIndexOf(u'*') == 0 return pattern.lastIndexOf(u'*') == 0

20
src/libs/utils/mimetypes2/mimeglobpattern_p.h
View File

@@ -17,6 +17,8 @@
#include <QtCore/qstringlist.h> #include <QtCore/qstringlist.h>
#include <QtCore/qhash.h> #include <QtCore/qhash.h>
#include <algorithm.h>
namespace Utils { namespace Utils {
struct MimeGlobMatchResult struct MimeGlobMatchResult
@@ -72,7 +74,7 @@ private:
AnimPattern, // special handling for "*.anim[1-9j]" pattern AnimPattern, // special handling for "*.anim[1-9j]" pattern
OtherPattern OtherPattern
}; };
PatternType detectPatternType(const QString &pattern) const; PatternType detectPatternType(QStringView pattern) const;
QString m_pattern; QString m_pattern;
QString m_mimeType; QString m_mimeType;
@@ -86,22 +88,20 @@ using AddMatchFilterFunc = std::function<bool(const QString &)>;
class MimeGlobPatternList : public QList<MimeGlobPattern> class MimeGlobPatternList : public QList<MimeGlobPattern>
{ {
public: public:
bool hasPattern(const QString &mimeType, const QString &pattern) const bool hasPattern(QStringView mimeType, QStringView pattern) const
{ {
const_iterator it = begin(); auto matchesMimeAndPattern = [mimeType, pattern](const MimeGlobPattern &e) {
const const_iterator myend = end(); return e.pattern() == pattern && e.mimeType() == mimeType;
for (; it != myend; ++it) };
if ((*it).pattern() == pattern && (*it).mimeType() == mimeType) return std::any_of(begin(), end(), matchesMimeAndPattern);
return true;
return false;
} }
/*! /*!
"noglobs" is very rare occurrence, so it's ok if it's slow "noglobs" is very rare occurrence, so it's ok if it's slow
*/ */
void removeMimeType(const QString &mimeType) void removeMimeType(QStringView mimeType)
{ {
auto isMimeTypeEqual = [&mimeType](const MimeGlobPattern &pattern) { auto isMimeTypeEqual = [mimeType](const MimeGlobPattern &pattern) {
return pattern.mimeType() == mimeType; return pattern.mimeType() == mimeType;
}; };
erase(std::remove_if(begin(), end(), isMimeTypeEqual), end()); erase(std::remove_if(begin(), end(), isMimeTypeEqual), end());