summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/coreplugin/editormanager/BinFiles.mimetypes.xml12
-rw-r--r--src/plugins/coreplugin/mimedatabase.cpp229
-rw-r--r--src/plugins/coreplugin/mimedatabase.h75
-rw-r--r--src/plugins/genericprojectmanager/genericprojectwizard.cpp4
-rw-r--r--src/plugins/projectexplorer/pluginfilefactory.cpp2
-rw-r--r--src/plugins/projectexplorer/projectexplorer.cpp4
-rw-r--r--src/plugins/qmljseditor/qmljsmodelmanager.cpp8
-rw-r--r--src/plugins/texteditor/generichighlighter/manager.cpp9
8 files changed, 254 insertions, 89 deletions
diff --git a/src/plugins/coreplugin/editormanager/BinFiles.mimetypes.xml b/src/plugins/coreplugin/editormanager/BinFiles.mimetypes.xml
index 7791d07203..670ff3c481 100644
--- a/src/plugins/coreplugin/editormanager/BinFiles.mimetypes.xml
+++ b/src/plugins/coreplugin/editormanager/BinFiles.mimetypes.xml
@@ -2,5 +2,17 @@
<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
<mime-type type="application/octet-stream">
<comment>unknown</comment>
+ <glob pattern="*.a"/>
+ <glob pattern="*.dll"/>
+ <glob pattern="*.exe"/>
+ <glob pattern="*.lib"/>
+ <glob pattern="*.o"/>
+ <glob pattern="*.obj"/>
+ <glob pattern="*.out"/>
+ <glob pattern="*.so"/>
+ <!-- Magic for ELF binaries -->
+ <magic priority="99">
+ <match type="byte" offset="0" value="\0x7f\0x45\0x4c\0x46"/>
+ </magic>
</mime-type>
</mime-info>
diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp
index b98f010d39..06a235d83b 100644
--- a/src/plugins/coreplugin/mimedatabase.cpp
+++ b/src/plugins/coreplugin/mimedatabase.cpp
@@ -59,6 +59,7 @@ static const char *commentTagC = "comment";
static const char *globTagC = "glob";
static const char *aliasTagC = "alias";
static const char *patternAttributeC = "pattern";
+static const char *weightAttributeC = "weight";
static const char *localeAttributeC = "xml:lang";
static const char *magicTagC = "magic";
@@ -67,6 +68,7 @@ static const char *matchTagC = "match";
static const char *matchValueAttributeC = "value";
static const char *matchTypeAttributeC = "type";
static const char *matchStringTypeValueC = "string";
+static const char *matchByteTypeValueC = "byte";
static const char *matchOffsetAttributeC = "offset";
// Types
@@ -78,7 +80,10 @@ static const char bigEndianByteOrderMarkC[] = "\xFE\xFF";
static const char littleEndianByteOrderMarkC[] = "\xFF\xFE";
// Fallback priorities, must be low.
-enum { BinaryMatchPriority = 1, TextMatchPriority = 2};
+enum {
+ BinaryMatchPriority = Core::MimeGlobPattern::MinWeight + 1,
+ TextMatchPriority
+};
/* Parse sth like (<mime-info> being optional):
*\code
@@ -87,7 +92,7 @@ enum { BinaryMatchPriority = 1, TextMatchPriority = 2};
<!-- Mime types must match the desktop file associations -->
<mime-type type="application/vnd.nokia.qt.qmakeprofile">
<comment xml:lang="en">Qt qmake Profile</comment>
- <glob pattern="*.pro"/>
+ <glob pattern="*.pro" weight="50"/>
</mime-type>
</mime-info>
*\endcode
@@ -199,33 +204,92 @@ bool HeuristicTextMagicMatcher::matches(const QByteArray &data) const
} // namespace Internal
// MagicRule
-MagicRule::MagicRule(const QByteArray &pattern, int startPos, int endPos) :
- m_pattern(pattern),
- m_startPos(startPos),
- m_endPos(endPos)
+MagicRule::MagicRule(int startPos, int endPos) : m_startPos(startPos), m_endPos(endPos)
{
}
-bool MagicRule::matches(const QByteArray &data) const
+MagicRule::~MagicRule()
+{
+}
+
+int MagicRule::startPos() const
+{
+ return m_startPos;
+}
+
+int MagicRule::endPos() const
+{
+ return m_endPos;
+}
+
+MagicStringRule::MagicStringRule(const QString &s, int startPos, int endPos) :
+ MagicRule(startPos, endPos), m_pattern(s.toUtf8())
+{
+}
+
+MagicStringRule::~MagicStringRule()
+{
+}
+
+bool MagicStringRule::matches(const QByteArray &data) const
{
// Quick check
- const int dataSize = data.size();
- if ((m_startPos + m_pattern.size()) >= dataSize)
+ if ((startPos() + m_pattern.size()) > data.size())
return false;
// Most common: some string at position 0:
- if (m_startPos == 0 && m_startPos == m_endPos)
+ if (startPos() == 0 && startPos() == endPos())
return data.startsWith(m_pattern);
// Range
- const int index = data.indexOf(m_pattern, m_startPos);
- const bool rc = index != -1 && index < m_endPos;
+ const int index = data.indexOf(m_pattern, startPos());
+ const bool rc = index != -1 && index <= endPos();
if (debugMimeDB)
- qDebug() << "Checking " << m_pattern << m_startPos << m_endPos << " returns " << rc;
+ qDebug() << "Checking " << m_pattern << startPos() << endPos() << " returns " << rc;
return rc;
}
-MagicRule *MagicRule::createStringRule(const QString &c, int startPos, int endPos)
+MagicByteRule::MagicByteRule(const QString &s, int startPos, int endPos) :
+ MagicRule(startPos, endPos)
{
- return new MagicRule(c.toUtf8(), startPos, endPos);
+ // Expect an hex format value like this: \0x7f\0x45\0x4c\0x46
+ const QStringList &bytes = s.split(QLatin1Char('\\'), QString::SkipEmptyParts);
+ foreach (const QString &byte, bytes) {
+ bool ok;
+ const int hex = byte.toInt(&ok, 16);
+ if (ok) {
+ m_bytes.push_back(hex);
+ } else {
+ m_bytes.clear();
+ break;
+ }
+ }
+ m_bytesSize = m_bytes.size();
+}
+
+MagicByteRule::~MagicByteRule()
+{
+}
+
+bool MagicByteRule::matches(const QByteArray &data) const
+{
+ if (m_bytesSize == 0)
+ return false;
+
+ const int dataSize = data.size();
+ for (int start = startPos(); start <= endPos(); ++start) {
+ if ((start + m_bytesSize) > dataSize)
+ return false;
+
+ int matchAt = 0;
+ while (matchAt < m_bytesSize) {
+ if (data.at(start + matchAt) != m_bytes.at(matchAt))
+ break;
+ ++matchAt;
+ }
+ if (matchAt == m_bytesSize)
+ return true;
+ }
+
+ return false;
}
// List matcher
@@ -258,6 +322,26 @@ void MagicRuleMatcher::setPriority(int p)
m_priority = p;
}
+// GlobPattern
+MimeGlobPattern::MimeGlobPattern(const QRegExp &regExp, int weight) :
+ m_regExp(regExp), m_weight(weight)
+{
+}
+
+MimeGlobPattern::~MimeGlobPattern()
+{
+}
+
+const QRegExp &MimeGlobPattern::regExp() const
+{
+ return m_regExp;
+}
+
+int MimeGlobPattern::weight() const
+{
+ return m_weight;
+}
+
// ---------- MimeTypeData
class MimeTypeData : public QSharedData {
public:
@@ -270,7 +354,7 @@ public:
LocaleHash localeComments;
QStringList aliases;
- QList<QRegExp> globPatterns;
+ QList<MimeGlobPattern> globPatterns;
QStringList subClassesOf;
QString preferredSuffix;
QStringList suffixes;
@@ -305,8 +389,8 @@ void MimeTypeData::debug(QTextStream &str, int indent) const
str << indentS << "SubClassesOf: " << subClassesOf.join(comma) << '\n';
if (!globPatterns.empty()) {
str << indentS << "Glob: ";
- foreach (const QRegExp &r, globPatterns)
- str << r.pattern() << ' ';
+ foreach (const MimeGlobPattern &gp, globPatterns)
+ str << gp.regExp().pattern() << ' (' << gp.weight() << ') ';
str << '\n';
if (!suffixes.empty()) {
str << indentS << "Suffixes: " << suffixes.join(comma)
@@ -417,12 +501,12 @@ void MimeType::setAliases(const QStringList &a)
m_d->aliases = a;
}
-QList<QRegExp> MimeType::globPatterns() const
+QList<MimeGlobPattern> MimeType::globPatterns() const
{
return m_d->globPatterns;
}
-void MimeType::setGlobPatterns(const QList<QRegExp> &g)
+void MimeType::setGlobPatterns(const QList<MimeGlobPattern> &g)
{
m_d->globPatterns = g;
}
@@ -455,7 +539,7 @@ bool MimeType::setPreferredSuffix(const QString &s)
return true;
}
-QString MimeType::formatFilterString(const QString &description, const QList<QRegExp> &globs)
+QString MimeType::formatFilterString(const QString &description, const QList<MimeGlobPattern> &globs)
{
QString rc;
if (globs.empty()) // Binary files
@@ -469,7 +553,7 @@ QString MimeType::formatFilterString(const QString &description, const QList<QRe
for (int i = 0; i < size; i++) {
if (i)
str << ' ';
- str << globs.at(i).pattern();
+ str << globs.at(i).regExp().pattern();
}
str << ')';
}
@@ -491,35 +575,41 @@ bool MimeType::matchesType(const QString &type) const
unsigned MimeType::matchesFile(const QFileInfo &file) const
{
Internal::FileMatchContext context(file);
- if (const unsigned suffixPriority = matchesFileBySuffix(context))
+ const unsigned suffixPriority = matchesFileBySuffix(context);
+ if (suffixPriority >= MimeGlobPattern::MaxWeight)
return suffixPriority;
- return matchesFileByContent(context);
+ return qMax(suffixPriority, matchesFileByContent(context));
}
unsigned MimeType::matchesFileBySuffix(Internal::FileMatchContext &c) const
{
// check globs
- foreach (const QRegExp &pattern, m_d->globPatterns) {
- if (pattern.exactMatch(c.fileName()))
- return GlobMatchPriority;
+ foreach (const MimeGlobPattern &gp, m_d->globPatterns) {
+ if (gp.regExp().exactMatch(c.fileName()))
+ return gp.weight();
}
return 0;
}
unsigned MimeType::matchesFileByContent(Internal::FileMatchContext &c) const
{
+ unsigned priority = 0;
+
// Nope, try magic matchers on context data
if (m_d->magicMatchers.isEmpty())
- return 0;
+ return priority;
const QByteArray data = c.data();
if (!data.isEmpty()) {
foreach (const MimeTypeData::IMagicMatcherSharedPointer &matcher, m_d->magicMatchers) {
- if (matcher->matches(data))
- return matcher->priority();
+ if (matcher->matches(data)) {
+ const unsigned magicPriority = matcher->priority();
+ if (magicPriority > priority)
+ priority = magicPriority;
+ }
}
}
- return 0;
+ return priority;
}
QStringList MimeType::suffixes() const
@@ -564,7 +654,7 @@ private:
// Overwrite to process the sequence of parsed data
virtual bool process(const MimeType &t, QString *errorMessage) = 0;
- void addGlobPattern(const QString &pattern, MimeTypeData *d) const;
+ void addGlobPattern(const QString &pattern, const QString &weight, MimeTypeData *d) const;
enum ParseStage { ParseBeginning,
ParseMimeInfo,
@@ -591,7 +681,7 @@ BaseMimeTypeParser:: BaseMimeTypeParser() :
QTC_ASSERT(m_suffixPattern.isValid(), /**/);
}
-void BaseMimeTypeParser::addGlobPattern(const QString &pattern, MimeTypeData *d) const
+void BaseMimeTypeParser::addGlobPattern(const QString &pattern, const QString &weight, MimeTypeData *d) const
{
if (pattern.isEmpty())
return;
@@ -604,7 +694,11 @@ void BaseMimeTypeParser::addGlobPattern(const QString &pattern, MimeTypeData *d)
return;
}
- d->globPatterns.push_back(wildCard);
+ if (weight.isEmpty())
+ d->globPatterns.push_back(MimeGlobPattern(wildCard));
+ else
+ d->globPatterns.push_back(MimeGlobPattern(wildCard, weight.toInt()));
+
if (m_suffixPattern.exactMatch(pattern)) {
const QString suffix = pattern.right(pattern.size() - 2);
d->suffixes.push_back(suffix);
@@ -674,7 +768,8 @@ static bool addMagicMatchRule(const QXmlStreamAttributes &atts,
QString *errorMessage)
{
const QString type = atts.value(QLatin1String(matchTypeAttributeC)).toString();
- if (type != QLatin1String(matchStringTypeValueC)) {
+ if (type != QLatin1String(matchStringTypeValueC) &&
+ type != QLatin1String(matchByteTypeValueC)) {
qWarning("%s: match type %s is not supported.", Q_FUNC_INFO, type.toUtf8().constData());
return true;
}
@@ -693,7 +788,11 @@ static bool addMagicMatchRule(const QXmlStreamAttributes &atts,
return false;
if (debugMimeDB)
qDebug() << Q_FUNC_INFO << value << startPos << endPos;
- ruleMatcher->add(QSharedPointer<MagicRule>(MagicRule::createStringRule(value, startPos, endPos)));
+
+ if (type == QLatin1String(matchStringTypeValueC))
+ ruleMatcher->add(QSharedPointer<MagicRule>(new MagicStringRule(value, startPos, endPos)));
+ else
+ ruleMatcher->add(QSharedPointer<MagicRule>(new MagicByteRule(value, startPos, endPos)));
return true;
}
@@ -703,13 +802,15 @@ bool BaseMimeTypeParser::parse(QIODevice *dev, const QString &fileName, QString
MagicRuleMatcherPtr ruleMatcher;
QXmlStreamReader reader(dev);
ParseStage ps = ParseBeginning;
+ QXmlStreamAttributes atts;
while (!reader.atEnd()) {
switch (reader.readNext()) {
case QXmlStreamReader::StartElement:
ps = nextStage(ps, reader.name());
+ atts = reader.attributes();
switch (ps) {
case ParseMimeType: { // start parsing a type
- const QString type = reader.attributes().value(QLatin1String(mimeTypeAttributeC)).toString();
+ const QString type = atts.value(QLatin1String(mimeTypeAttributeC)).toString();
if (type.isEmpty()) {
reader.raiseError(QString::fromLatin1("Missing 'type'-attribute"));
} else {
@@ -718,17 +819,18 @@ bool BaseMimeTypeParser::parse(QIODevice *dev, const QString &fileName, QString
}
break;
case ParseGlobPattern:
- addGlobPattern(reader.attributes().value(QLatin1String(patternAttributeC)).toString(), &data);
+ addGlobPattern(atts.value(QLatin1String(patternAttributeC)).toString(),
+ atts.value(QLatin1String(weightAttributeC)).toString(), &data);
break;
case ParseSubClass: {
- const QString inheritsFrom = reader.attributes().value(QLatin1String(mimeTypeAttributeC)).toString();
+ const QString inheritsFrom = atts.value(QLatin1String(mimeTypeAttributeC)).toString();
if (!inheritsFrom.isEmpty())
data.subClassesOf.push_back(inheritsFrom);
}
break;
case ParseComment: {
// comments have locale attributes. We want the default, English one
- QString locale = reader.attributes().value(QLatin1String(localeAttributeC)).toString();
+ QString locale = atts.value(QLatin1String(localeAttributeC)).toString();
const QString comment = QCoreApplication::translate("MimeType", reader.readElementText().toAscii());
if (locale.isEmpty()) {
data.comment = comment;
@@ -738,14 +840,14 @@ bool BaseMimeTypeParser::parse(QIODevice *dev, const QString &fileName, QString
}
break;
case ParseAlias: {
- const QString alias = reader.attributes().value(QLatin1String(mimeTypeAttributeC)).toString();
+ const QString alias = atts.value(QLatin1String(mimeTypeAttributeC)).toString();
if (!alias.isEmpty())
data.aliases.push_back(alias);
}
break;
case ParseMagic: {
int priority = 0;
- const QString priorityS = reader.attributes().value(QLatin1String(priorityAttributeC)).toString();
+ const QString priorityS = atts.value(QLatin1String(priorityAttributeC)).toString();
if (!priorityS.isEmpty()) {
if (!parseNumber(priorityS, &priority, errorMessage))
return false;
@@ -757,7 +859,7 @@ bool BaseMimeTypeParser::parse(QIODevice *dev, const QString &fileName, QString
break;
case ParseMagicMatchRule:
QTC_ASSERT(!ruleMatcher.isNull(), return false)
- if (!addMagicMatchRule(reader.attributes(), ruleMatcher, errorMessage))
+ if (!addMagicMatchRule(atts, ruleMatcher, errorMessage))
return false;
break;
case ParseError:
@@ -927,7 +1029,7 @@ bool MimeDatabasePrivate::addMimeType(MimeType mt)
mt.addMagicMatcher(QSharedPointer<IMagicMatcher>(new Internal::HeuristicTextMagicMatcher));
} else {
if (type == QLatin1String(binaryTypeC))
- mt.addMagicMatcher(QSharedPointer<IMagicMatcher>(new Internal::BinaryMatcher));
+ mt.addMagicMatcher(QSharedPointer<IMagicMatcher>(new Internal::BinaryMatcher));
}
// insert the type.
m_typeMimeTypeMap.insert(type, MimeMapEntry(mt));
@@ -1057,35 +1159,44 @@ MimeType MimeDatabasePrivate::findByFile(const QFileInfo &f, unsigned *priorityP
MimeDatabasePrivate *db = const_cast<MimeDatabasePrivate *>(this);
db->determineLevels();
}
- // Starting from max level (most specific): Try to find a match of
- // best (max) priority. Return if a glob match triggers.
+
+ // First, glob patterns are evaluated. If there is a match with max weight,
+ // this one is selected and we are done. Otherwise, the file contents are
+ // evaluated and the match with the highest value (either a magic priority or
+ // a glob pattern weight) is selected. Matching starts from max level (most
+ // specific) in both cases, even when there is already a suffix matching candidate.
*priorityPtr = 0;
+ MimeType candidate;
Internal::FileMatchContext context(f);
+
// Pass 1) Try to match on suffix
const TypeMimeTypeMap::const_iterator cend = m_typeMimeTypeMap.constEnd();
- for (int level = m_maxLevel; level >= 0; level--)
+ for (int level = m_maxLevel; level >= 0 && candidate.isNull(); level--)
for (TypeMimeTypeMap::const_iterator it = m_typeMimeTypeMap.constBegin(); it != cend; ++it)
- if (it.value().level == level)
- if (const unsigned suffixPriority = it.value().type.matchesFileBySuffix(context)) {
+ if (it.value().level == level) {
+ const unsigned suffixPriority = it.value().type.matchesFileBySuffix(context);
+ if (suffixPriority && suffixPriority > *priorityPtr) {
*priorityPtr = suffixPriority;
- return it.value().type;
+ candidate = it.value().type;
+ if (suffixPriority >= MimeGlobPattern::MaxWeight)
+ return candidate;
}
+ }
+
// Pass 2) Match on content
- MimeType rc;
if (!f.isReadable())
- return rc;
- unsigned maxPriority = 0;
+ return candidate;
for (int level = m_maxLevel; level >= 0; level--)
for (TypeMimeTypeMap::const_iterator it = m_typeMimeTypeMap.constBegin(); it != cend; ++it)
if (it.value().level == level) {
- const unsigned priority = it.value().type.matchesFileByContent(context);
- if (priority && priority > maxPriority) {
- rc = it.value().type;
- maxPriority = priority;
+ const unsigned contentPriority = it.value().type.matchesFileByContent(context);
+ if (contentPriority && contentPriority > *priorityPtr) {
+ *priorityPtr = contentPriority;
+ candidate = it.value().type;
}
}
- *priorityPtr = maxPriority;
- return rc;
+
+ return candidate;
}
// Return all known suffixes
diff --git a/src/plugins/coreplugin/mimedatabase.h b/src/plugins/coreplugin/mimedatabase.h
index 751447f6d8..a82a777169 100644
--- a/src/plugins/coreplugin/mimedatabase.h
+++ b/src/plugins/coreplugin/mimedatabase.h
@@ -69,25 +69,52 @@ public:
virtual ~IMagicMatcher() {}
};
-/* Utility class: A standard Magic match rule based on contents. Provides
- * static factory methods for creation (currently only for "string". This can
- * be extended to handle "little16"/"big16", etc.). */
+/* Utility class: A standard Magic match rule based on contents. Currently there are
+ * implementations for "string" and "byte". (Others like little16, big16, etc. can be
+ * created whenever there is a need.) */
class CORE_EXPORT MagicRule
{
Q_DISABLE_COPY(MagicRule)
public:
- explicit MagicRule(const QByteArray &pattern, int startPos, int endPos);
- bool matches(const QByteArray &data) const;
+ MagicRule(int startPos, int endPos);
+ virtual ~MagicRule();
- // Convenience factory methods
- static MagicRule *createStringRule(const QString &c, int startPos, int endPos);
+ virtual bool matches(const QByteArray &data) const = 0;
+
+protected:
+ int startPos() const;
+ int endPos() const;
private:
- const QByteArray m_pattern;
const int m_startPos;
const int m_endPos;
};
+class CORE_EXPORT MagicStringRule : public MagicRule
+{
+public:
+ MagicStringRule(const QString &s, int startPos, int endPos);
+ virtual ~MagicStringRule();
+
+ virtual bool matches(const QByteArray &data) const;
+
+private:
+ const QByteArray m_pattern;
+};
+
+class CORE_EXPORT MagicByteRule : public MagicRule
+{
+public:
+ MagicByteRule(const QString &s, int startPos, int endPos);
+ virtual ~MagicByteRule();
+
+ virtual bool matches(const QByteArray &data) const;
+
+private:
+ QList<int> m_bytes;
+ int m_bytesSize;
+};
+
/* Utility class: A Magic matcher that checks a number of rules based on
* operator "or". It is used for rules parsed from XML files. */
class CORE_EXPORT MagicRuleMatcher : public IMagicMatcher
@@ -109,6 +136,23 @@ private:
int m_priority;
};
+class CORE_EXPORT MimeGlobPattern
+{
+public:
+ static const int MaxWeight = 100;
+ static const int MinWeight = 1;
+
+ explicit MimeGlobPattern(const QRegExp &regExp, int weight = MaxWeight);
+ ~MimeGlobPattern();
+
+ const QRegExp &regExp() const;
+ int weight() const;
+
+private:
+ const QRegExp m_regExp;
+ const int m_weight;
+};
+
/* Mime type data used in Qt Creator. Contains most information from
* standard mime type XML database files.
* Omissions:
@@ -121,9 +165,6 @@ private:
class CORE_EXPORT MimeType
{
public:
- /* Return value of a glob match, which is higher than magic */
- enum { GlobMatchPriority = 101 };
-
MimeType();
MimeType(const MimeType&);
MimeType &operator=(const MimeType&);
@@ -147,8 +188,8 @@ public:
QString localeComment(const QString &locale = QString() /* en, de...*/) const;
void setLocaleComment(const QString &locale, const QString &comment);
- QList<QRegExp> globPatterns() const;
- void setGlobPatterns(const QList<QRegExp> &);
+ QList<MimeGlobPattern> globPatterns() const;
+ void setGlobPatterns(const QList<MimeGlobPattern> &);
QStringList subClassesOf() const;
void setSubClassesOf(const QStringList &);
@@ -163,9 +204,9 @@ public:
// Check for type or one of the aliases
bool matchesType(const QString &type) const;
- // Check glob patterns and magic. Returns the match priority (0 no match,
- // 1..100 indicating a magic match or GlobMatchPriority indicating an
- // exact glob match).
+
+ // Check glob patterns weights and magic priorities so the highest
+ // value is returned. A 0 (zero) indicates no match.
unsigned matchesFile(const QFileInfo &file) const;
// Return a filter string usable for a file dialog
@@ -176,7 +217,7 @@ public:
friend QDebug operator<<(QDebug d, const MimeType &mt);
- static QString formatFilterString(const QString &description, const QList<QRegExp> &globs);
+ static QString formatFilterString(const QString &description, const QList<MimeGlobPattern> &globs);
private:
explicit MimeType(const MimeTypeData &d);
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index b7f184e3e4..f94f52da0b 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -197,8 +197,8 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
Core::MimeType headerTy = mimeDatabase->findByType(QLatin1String("text/x-chdr"));
QStringList nameFilters;
- foreach (const QRegExp &rx, headerTy.globPatterns())
- nameFilters.append(rx.pattern());
+ foreach (const Core::MimeGlobPattern &gp, headerTy.globPatterns())
+ nameFilters.append(gp.regExp().pattern());
QStringList includePaths;
foreach (const QString &path, paths) {
diff --git a/src/plugins/projectexplorer/pluginfilefactory.cpp b/src/plugins/projectexplorer/pluginfilefactory.cpp
index c8bfe397ca..8c00fa8221 100644
--- a/src/plugins/projectexplorer/pluginfilefactory.cpp
+++ b/src/plugins/projectexplorer/pluginfilefactory.cpp
@@ -87,7 +87,7 @@ QList<ProjectFileFactory *> ProjectFileFactory::createFactories(QString *filterS
QList<IProjectManager*> projectManagers =
ExtensionSystem::PluginManager::instance()->getObjects<IProjectManager>();
- QList<QRegExp> allGlobPatterns;
+ QList<Core::MimeGlobPattern> allGlobPatterns;
const QString filterSeparator = QLatin1String(";;");
filterString->clear();
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 00901e289b..a17b36ddd1 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2352,8 +2352,8 @@ QStringList ProjectExplorerPlugin::projectFilePatterns()
const Core::MimeDatabase *mdb = Core::ICore::instance()->mimeDatabase();
foreach(const IProjectManager *pm, allProjectManagers())
if (const Core::MimeType mt = mdb->findByType(pm->mimeType()))
- foreach(const QRegExp &re, mt.globPatterns())
- patterns += re.pattern();
+ foreach(const Core::MimeGlobPattern &gp, mt.globPatterns())
+ patterns += gp.regExp().pattern();
return patterns;
}
diff --git a/src/plugins/qmljseditor/qmljsmodelmanager.cpp b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
index 2de3c60c76..e4bf78f5eb 100644
--- a/src/plugins/qmljseditor/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
@@ -244,10 +244,10 @@ static QStringList qmlFilesInDirectory(const QString &path)
Core::MimeType qmlSourceTy = db->findByType(QmlJSEditor::Constants::QML_MIMETYPE);
QStringList pattern;
- foreach (const QRegExp &glob, jsSourceTy.globPatterns())
- pattern << glob.pattern();
- foreach (const QRegExp &glob, qmlSourceTy.globPatterns())
- pattern << glob.pattern();
+ foreach (const Core::MimeGlobPattern &glob, jsSourceTy.globPatterns())
+ pattern << glob.regExp().pattern();
+ foreach (const Core::MimeGlobPattern &glob, qmlSourceTy.globPatterns())
+ pattern << glob.regExp().pattern();
QStringList files;
diff --git a/src/plugins/texteditor/generichighlighter/manager.cpp b/src/plugins/texteditor/generichighlighter/manager.cpp
index 37c285e5e4..a0c03556ae 100644
--- a/src/plugins/texteditor/generichighlighter/manager.cpp
+++ b/src/plugins/texteditor/generichighlighter/manager.cpp
@@ -215,7 +215,7 @@ void Manager::gatherDefinitionsMimeTypes(QFutureInterface<Core::MimeType> &futur
// tell which patterns belong to which MIME types nor whether a MIME type is just
// an alias for the other. Currently, I associate all patterns with all MIME
// types from a definition.
- QList<QRegExp> patterns;
+ QList<Core::MimeGlobPattern> globPatterns;
foreach (const QString &type, metaData->mimeTypes()) {
if (m_idByMimeType.contains(type))
continue;
@@ -223,7 +223,7 @@ void Manager::gatherDefinitionsMimeTypes(QFutureInterface<Core::MimeType> &futur
m_idByMimeType.insert(type, id);
Core::MimeType mimeType = mimeDatabase->findByType(type);
if (mimeType.isNull()) {
- if (patterns.isEmpty()) {
+ if (globPatterns.isEmpty()) {
foreach (const QString &pattern, metaData->patterns()) {
static const QLatin1String mark("*.");
if (pattern.startsWith(mark)) {
@@ -233,14 +233,15 @@ void Manager::gatherDefinitionsMimeTypes(QFutureInterface<Core::MimeType> &futur
else
continue;
}
- patterns.append(QRegExp(pattern, Qt::CaseSensitive, QRegExp::Wildcard));
+ QRegExp regExp(pattern, Qt::CaseSensitive, QRegExp::Wildcard);
+ globPatterns.append(Core::MimeGlobPattern(regExp, 50));
}
}
mimeType.setType(type);
mimeType.setSubClassesOf(textPlain);
mimeType.setComment(metaData->name());
- mimeType.setGlobPatterns(patterns);
+ mimeType.setGlobPatterns(globPatterns);
mimeDatabase->addMimeType(mimeType);
future.reportResult(mimeType);
View Lorry Controller Status