summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2012-04-30 12:01:15 +0200
committerBradley T. Hughes <bradley.hughes@nokia.com>2012-04-30 14:32:08 +0200
commitfb9146a9c39b70f84b78c7b75ba7503214fd4296 (patch)
treef443c543127146c16553ee4aa300d73a0d81bfd7
parentd681bc10c9977036e02d84c9e3023bd86050abee (diff)
downloadqt-creator-fb9146a9c39b70f84b78c7b75ba7503214fd4296.tar.gz
Compile after qt5/qtbase commit 75a0c7f9
Commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848 in qt5/qtbase changed some QRegExp methods to be non-const (they were previously const). This change makes Qt Creator compile again. Change-Id: Ibc98c678126c3b3189df7fcc043463b940951445 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
-rw-r--r--src/libs/cplusplus/CppRewriter.cpp2
-rw-r--r--src/libs/qmljs/qmljscheck.cpp2
-rw-r--r--src/libs/utils/filenamevalidatinglineedit.cpp9
-rw-r--r--src/libs/utils/filesearch.cpp2
-rw-r--r--src/plugins/android/androidtarget.cpp2
-rw-r--r--src/plugins/bazaar/annotationhighlighter.h2
-rw-r--r--src/plugins/bazaar/bazaarclient.cpp4
-rw-r--r--src/plugins/bazaar/bazaarcommitwidget.cpp2
-rw-r--r--src/plugins/bazaar/bazaareditor.h6
-rw-r--r--src/plugins/coreplugin/mimedatabase.cpp5
-rw-r--r--src/plugins/cppeditor/cppclasswizard.cpp2
-rw-r--r--src/plugins/cpptools/cppcurrentdocumentfilter.cpp2
-rw-r--r--src/plugins/cpptools/cpplocatorfilter.cpp2
-rw-r--r--src/plugins/cvs/cvseditor.h4
-rw-r--r--src/plugins/cvs/cvsutils.cpp4
-rw-r--r--src/plugins/fakevim/fakevimplugin.cpp2
-rw-r--r--src/plugins/genericprojectmanager/genericproject.cpp2
-rw-r--r--src/plugins/genericprojectmanager/selectablefilesmodel.h2
-rw-r--r--src/plugins/git/gitclient.cpp2
-rw-r--r--src/plugins/git/giteditor.h4
-rw-r--r--src/plugins/git/gitorious/gitoriousprojectwidget.cpp2
-rw-r--r--src/plugins/git/gitsubmiteditorwidget.cpp2
-rw-r--r--src/plugins/help/helpplugin.cpp4
-rw-r--r--src/plugins/locator/basefilefilter.cpp2
-rw-r--r--src/plugins/locator/opendocumentsfilter.cpp2
-rw-r--r--src/plugins/madde/maddedevicetester.cpp2
-rw-r--r--src/plugins/madde/maemopackagecreationstep.cpp2
-rw-r--r--src/plugins/madde/qt4maemotarget.cpp3
-rw-r--r--src/plugins/mercurial/annotationhighlighter.h2
-rw-r--r--src/plugins/mercurial/mercurialcommitwidget.cpp2
-rw-r--r--src/plugins/mercurial/mercurialeditor.h6
-rw-r--r--src/plugins/perforce/perforceeditor.h2
-rw-r--r--src/plugins/perforce/perforcesubmiteditor.cpp2
-rw-r--r--src/plugins/projectexplorer/allprojectsfind.cpp2
-rw-r--r--src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp4
-rw-r--r--src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp2
-rw-r--r--src/plugins/qmljstools/qmljsfunctionfilter.cpp2
-rw-r--r--src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp2
-rw-r--r--src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp2
-rw-r--r--src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp3
-rw-r--r--src/plugins/qtsupport/qtoutputformatter.cpp10
-rw-r--r--src/plugins/qtsupport/qtoutputformatter.h10
-rw-r--r--src/plugins/subversion/subversioneditor.h4
-rw-r--r--src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp2
-rw-r--r--src/plugins/texteditor/generichighlighter/highlightersettings.cpp2
-rw-r--r--src/plugins/valgrind/memcheckengine.cpp4
-rw-r--r--src/plugins/vcsbase/diffhighlighter.cpp2
-rw-r--r--src/plugins/vcsbase/vcsbaseeditor.cpp2
-rw-r--r--src/shared/proparser/profileevaluator.cpp2
49 files changed, 74 insertions, 76 deletions
diff --git a/src/libs/cplusplus/CppRewriter.cpp b/src/libs/cplusplus/CppRewriter.cpp
index 0dfa030cfc..e487efb0a0 100644
--- a/src/libs/cplusplus/CppRewriter.cpp
+++ b/src/libs/cplusplus/CppRewriter.cpp
@@ -550,7 +550,7 @@ CPLUSPLUS_EXPORT QString simplifySTLType(const QString &typeIn)
simplifyStdString(QLatin1String("unsigned short"), QLatin1String("wstring"), &type);
}
// std::vector, std::deque, std::list
- const QRegExp re1(QString::fromLatin1("(vector|list|deque)<%1, ?%2\\s*>").arg(inner, alloc));
+ QRegExp re1(QString::fromLatin1("(vector|list|deque)<%1, ?%2\\s*>").arg(inner, alloc));
Q_ASSERT(re1.isValid());
if (re1.indexIn(type) != -1)
type.replace(re1.cap(0), QString::fromLatin1("%1<%2>").arg(re1.cap(1), inner));
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index 007bc0d4a3..eeb41b355f 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -1186,7 +1186,7 @@ void Check::addMessage(Type type, const SourceLocation &location, const QString
void Check::scanCommentsForAnnotations()
{
m_disabledMessageTypesByLine.clear();
- const QRegExp disableCommentPattern(Message::suppressionPattern());
+ QRegExp disableCommentPattern(Message::suppressionPattern());
foreach (const SourceLocation &commentLoc, _doc->engine()->comments()) {
const QString &comment = _doc->source().mid(commentLoc.begin(), commentLoc.length);
diff --git a/src/libs/utils/filenamevalidatinglineedit.cpp b/src/libs/utils/filenamevalidatinglineedit.cpp
index a90356e190..04d7a63772 100644
--- a/src/libs/utils/filenamevalidatinglineedit.cpp
+++ b/src/libs/utils/filenamevalidatinglineedit.cpp
@@ -50,17 +50,16 @@ namespace Utils {
// Naming a file like a device name will break on Windows, even if it is
// "com1.txt". Since we are cross-platform, we generally disallow such file
// names.
-static const QRegExp &windowsDeviceNoSubDirPattern()
+static QRegExp &windowsDeviceNoSubDirPattern()
{
- static const QRegExp rc(QLatin1String(WINDOWS_DEVICES),
- Qt::CaseInsensitive);
+ static QRegExp rc(QLatin1String(WINDOWS_DEVICES), Qt::CaseInsensitive);
QTC_ASSERT(rc.isValid(), return rc);
return rc;
}
-static const QRegExp &windowsDeviceSubDirPattern()
+static QRegExp &windowsDeviceSubDirPattern()
{
- static const QRegExp rc(QLatin1String(".*[/\\\\](" WINDOWS_DEVICES ")"), Qt::CaseInsensitive);
+ static QRegExp rc(QLatin1String(".*[/\\\\](" WINDOWS_DEVICES ")"), Qt::CaseInsensitive);
QTC_ASSERT(rc.isValid(), return rc);
return rc;
}
diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp
index 0f2f17dee9..13f3883ae8 100644
--- a/src/libs/utils/filesearch.cpp
+++ b/src/libs/utils/filesearch.cpp
@@ -223,7 +223,7 @@ void runFileSearchRegExp(QFutureInterface<FileSearchResultList> &future,
if (flags & QTextDocument::FindWholeWords)
searchTerm = QString::fromLatin1("\\b%1\\b").arg(searchTerm);
const Qt::CaseSensitivity caseSensitivity = (flags & QTextDocument::FindCaseSensitively) ? Qt::CaseSensitive : Qt::CaseInsensitive;
- const QRegExp expression(searchTerm, caseSensitivity);
+ QRegExp expression(searchTerm, caseSensitivity);
QFile file;
QString str;
diff --git a/src/plugins/android/androidtarget.cpp b/src/plugins/android/androidtarget.cpp
index 3204b8ecaf..2547c1d927 100644
--- a/src/plugins/android/androidtarget.cpp
+++ b/src/plugins/android/androidtarget.cpp
@@ -65,7 +65,7 @@ namespace {
QString cleanPackageName(QString packageName)
{
- const QRegExp legalChars(QLatin1String("[a-zA-Z0-9_\\.]"));
+ QRegExp legalChars(QLatin1String("[a-zA-Z0-9_\\.]"));
for (int i = 0; i < packageName.length(); ++i)
if (!legalChars.exactMatch(packageName.mid(i, 1)))
diff --git a/src/plugins/bazaar/annotationhighlighter.h b/src/plugins/bazaar/annotationhighlighter.h
index f97a4a9ae0..7a5f579788 100644
--- a/src/plugins/bazaar/annotationhighlighter.h
+++ b/src/plugins/bazaar/annotationhighlighter.h
@@ -47,7 +47,7 @@ public:
private:
virtual QString changeNumber(const QString &block) const;
- QRegExp m_changeset;
+ mutable QRegExp m_changeset;
};
} // namespace Internal
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index 9257fa9fa9..757a5dabd8 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -79,8 +79,8 @@ BranchInfo BazaarClient::synchronousBranchQuery(const QString &repositoryRoot) c
QTextStream ts(&branchConfFile);
QString branchLocation;
QString isBranchBound;
- const QRegExp branchLocationRx(QLatin1String("bound_location\\s*=\\s*(.+)$"));
- const QRegExp isBranchBoundRx(QLatin1String("bound\\s*=\\s*(.+)$"));
+ QRegExp branchLocationRx(QLatin1String("bound_location\\s*=\\s*(.+)$"));
+ QRegExp isBranchBoundRx(QLatin1String("bound\\s*=\\s*(.+)$"));
while (!ts.atEnd() && (branchLocation.isEmpty() || isBranchBound.isEmpty())) {
const QString line = ts.readLine();
if (branchLocationRx.indexIn(line) != -1)
diff --git a/src/plugins/bazaar/bazaarcommitwidget.cpp b/src/plugins/bazaar/bazaarcommitwidget.cpp
index f419b587db..2ab02c71be 100644
--- a/src/plugins/bazaar/bazaarcommitwidget.cpp
+++ b/src/plugins/bazaar/bazaarcommitwidget.cpp
@@ -70,7 +70,7 @@ public:
private:
enum State { Header, Comment, Other };
const QTextCharFormat m_commentFormat;
- const QRegExp m_keywordPattern;
+ QRegExp m_keywordPattern;
const QChar m_hashChar;
};
diff --git a/src/plugins/bazaar/bazaareditor.h b/src/plugins/bazaar/bazaareditor.h
index 4538c70043..7412953f69 100644
--- a/src/plugins/bazaar/bazaareditor.h
+++ b/src/plugins/bazaar/bazaareditor.h
@@ -54,9 +54,9 @@ private:
virtual VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes, const QColor &bg) const;
virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const;
- const QRegExp m_changesetId;
- const QRegExp m_exactChangesetId;
- const QRegExp m_diffFileId;
+ mutable QRegExp m_changesetId;
+ mutable QRegExp m_exactChangesetId;
+ mutable QRegExp m_diffFileId;
};
} // namespace Internal
diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp
index 7293374cad..86ce80ece9 100644
--- a/src/plugins/coreplugin/mimedatabase.cpp
+++ b/src/plugins/coreplugin/mimedatabase.cpp
@@ -548,7 +548,7 @@ public:
void assignSuffixes(const QStringList &patterns);
void debug(QTextStream &str, int indent = 0) const;
- const QRegExp suffixPattern;
+ QRegExp suffixPattern;
QString type;
QString comment;
@@ -814,7 +814,8 @@ unsigned MimeType::matchesFileBySuffix(Internal::FileMatchContext &c) const
{
// check globs
foreach (const MimeGlobPattern &gp, m_d->globPatterns) {
- if (gp.regExp().exactMatch(c.fileName()))
+ QRegExp regExp = gp.regExp();
+ if (regExp.exactMatch(c.fileName()))
return gp.weight();
}
return 0;
diff --git a/src/plugins/cppeditor/cppclasswizard.cpp b/src/plugins/cppeditor/cppclasswizard.cpp
index d41a7c204b..627bd4570e 100644
--- a/src/plugins/cppeditor/cppclasswizard.cpp
+++ b/src/plugins/cppeditor/cppclasswizard.cpp
@@ -234,7 +234,7 @@ bool CppClassWizard::generateHeaderAndSource(const CppClassWizardParameters &par
headerStr << headerLicense << "#ifndef " << guard
<< "\n#define " << guard << '\n';
- const QRegExp qtClassExpr(QLatin1String("^Q[A-Z3].+"));
+ QRegExp qtClassExpr(QLatin1String("^Q[A-Z3].+"));
QTC_CHECK(qtClassExpr.isValid());
// Determine parent QObject type for Qt types. Provide base
// class in case the user did not specify one.
diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
index ced6396422..6804fae7a5 100644
--- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
+++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
@@ -68,7 +68,7 @@ QList<Locator::FilterEntry> CppCurrentDocumentFilter::matchesFor(QFutureInterfac
QList<Locator::FilterEntry> betterEntries;
QStringMatcher matcher(entry, Qt::CaseInsensitive);
const QChar asterisk = QLatin1Char('*');
- const QRegExp regexp(asterisk + entry + asterisk, Qt::CaseInsensitive, QRegExp::Wildcard);
+ QRegExp regexp(asterisk + entry + asterisk, Qt::CaseInsensitive, QRegExp::Wildcard);
if (!regexp.isValid())
return goodEntries;
bool hasWildcard = (entry.contains(asterisk) || entry.contains('?'));
diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp
index bb5867b403..3d5edaae40 100644
--- a/src/plugins/cpptools/cpplocatorfilter.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter.cpp
@@ -86,7 +86,7 @@ QList<Locator::FilterEntry> CppLocatorFilter::matchesFor(QFutureInterface<Locato
QList<Locator::FilterEntry> betterEntries;
const QChar asterisk = QLatin1Char('*');
QStringMatcher matcher(entry, Qt::CaseInsensitive);
- const QRegExp regexp(asterisk + entry+ asterisk, Qt::CaseInsensitive, QRegExp::Wildcard);
+ QRegExp regexp(asterisk + entry+ asterisk, Qt::CaseInsensitive, QRegExp::Wildcard);
if (!regexp.isValid())
return goodEntries;
bool hasWildcard = (entry.contains(asterisk) || entry.contains('?'));
diff --git a/src/plugins/cvs/cvseditor.h b/src/plugins/cvs/cvseditor.h
index 856871d792..10b3177489 100644
--- a/src/plugins/cvs/cvseditor.h
+++ b/src/plugins/cvs/cvseditor.h
@@ -56,8 +56,8 @@ private:
QString fileNameFromDiffSpecification(const QTextBlock &diffFileName) const;
QStringList annotationPreviousVersions(const QString &revision) const;
- const QRegExp m_revisionAnnotationPattern;
- const QRegExp m_revisionLogPattern;
+ mutable QRegExp m_revisionAnnotationPattern;
+ mutable QRegExp m_revisionLogPattern;
QString m_diffBaseDir;
};
diff --git a/src/plugins/cvs/cvsutils.cpp b/src/plugins/cvs/cvsutils.cpp
index 4196eac41c..734cc5be6b 100644
--- a/src/plugins/cvs/cvsutils.cpp
+++ b/src/plugins/cvs/cvsutils.cpp
@@ -88,8 +88,8 @@ QList<CvsLogEntry> parseLogEntries(const QString &o,
const QString revisionPrefix = QLatin1String("revision ");
const QString statusPrefix = QLatin1String("date: ");
const QString commitId = QLatin1String("commitid: ");
- const QRegExp statusPattern = QRegExp(QLatin1String("^date: ([\\d\\-]+) .*commitid: ([^;]+);$"));
- const QRegExp revisionPattern = QRegExp(QLatin1String("^revision ([\\d\\.]+)$"));
+ QRegExp statusPattern = QRegExp(QLatin1String("^date: ([\\d\\-]+) .*commitid: ([^;]+);$"));
+ QRegExp revisionPattern = QRegExp(QLatin1String("^revision ([\\d\\.]+)$"));
const QChar slash = QLatin1Char('/');
Q_ASSERT(statusPattern.isValid() && revisionPattern.isValid());
const QString fileSeparator = QLatin1String("=============================================================================");
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 3253d9685b..d745385e0c 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -1572,7 +1572,7 @@ void FakeVimPluginPrivate::handleExCommand(bool *handled, const ExCommand &cmd)
const Iterator end = exCommandMap().constEnd();
for (Iterator it = exCommandMap().constBegin(); it != end; ++it) {
const QString &id = it.key();
- const QRegExp &re = it.value();
+ QRegExp re = it.value();
if (!re.pattern().isEmpty() && re.indexIn(cmd.cmd) != -1) {
triggerAction(Core::Id(id));
return;
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 06dfaa30c8..045d7c384c 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -307,7 +307,7 @@ void GenericProject::refresh(RefreshOptions options)
*/
static void expandEnvironmentVariables(const QProcessEnvironment &env, QString &string)
{
- const static QRegExp candidate(QLatin1String("\\$\\$\\((.+)\\)"));
+ static QRegExp candidate(QLatin1String("\\$\\$\\((.+)\\)"));
int index = candidate.indexIn(string);
while (index != -1) {
diff --git a/src/plugins/genericprojectmanager/selectablefilesmodel.h b/src/plugins/genericprojectmanager/selectablefilesmodel.h
index b25989700c..663346177f 100644
--- a/src/plugins/genericprojectmanager/selectablefilesmodel.h
+++ b/src/plugins/genericprojectmanager/selectablefilesmodel.h
@@ -64,7 +64,7 @@ struct Glob
enum Mode { EXACT, ENDSWITH, REGEXP };
Mode mode;
QString matchString;
- QRegExp matchRegexp;
+ mutable QRegExp matchRegexp;
};
class SelectableFilesModel : public QAbstractItemModel
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 66816af77f..a810c9c33e 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -2356,7 +2356,7 @@ unsigned GitClient::synchronousGitVersion(bool silent, QString *errorMessage) co
}
// cut 'git version 1.6.5.1.sha'
const QString output = commandOutputFromLocal8Bit(outputText);
- const QRegExp versionPattern(QLatin1String("^[^\\d]+([\\d])\\.([\\d])\\.([\\d]).*$"));
+ QRegExp versionPattern(QLatin1String("^[^\\d]+([\\d])\\.([\\d])\\.([\\d]).*$"));
QTC_ASSERT(versionPattern.isValid(), return 0);
QTC_ASSERT(versionPattern.exactMatch(output), return 0);
const unsigned major = versionPattern.cap(1).toUInt();
diff --git a/src/plugins/git/giteditor.h b/src/plugins/git/giteditor.h
index 65d237a5c5..9c5eb87a65 100644
--- a/src/plugins/git/giteditor.h
+++ b/src/plugins/git/giteditor.h
@@ -65,8 +65,8 @@ private:
virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileName) const;
virtual QStringList annotationPreviousVersions(const QString &revision) const;
- const QRegExp m_changeNumberPattern8;
- const QRegExp m_changeNumberPattern40;
+ mutable QRegExp m_changeNumberPattern8;
+ mutable QRegExp m_changeNumberPattern40;
};
} // namespace Git
diff --git a/src/plugins/git/gitorious/gitoriousprojectwidget.cpp b/src/plugins/git/gitorious/gitoriousprojectwidget.cpp
index e8e982b2d9..55a83e7013 100644
--- a/src/plugins/git/gitorious/gitoriousprojectwidget.cpp
+++ b/src/plugins/git/gitorious/gitoriousprojectwidget.cpp
@@ -231,7 +231,7 @@ void GitoriousProjectWidget::setDescription(const QString &description,
if (url) {
// Should the text contain an URL, extract
// Do not fall for "(http://XX)", strip special characters
- static const QRegExp urlRegExp(QLatin1String("(http://[\\w\\.-]+/[a-zA-Z0-9/\\-&]*)"));
+ static QRegExp urlRegExp(QLatin1String("(http://[\\w\\.-]+/[a-zA-Z0-9/\\-&]*)"));
QTC_CHECK(urlRegExp.isValid());
if (urlRegExp.indexIn(description) != -1) {
*url= urlRegExp.cap(1);
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index 36a1087fec..3e9a765ea7 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -69,7 +69,7 @@ public:
private:
enum State { Header, Comment, Other };
const QTextCharFormat m_commentFormat;
- const QRegExp m_keywordPattern;
+ QRegExp m_keywordPattern;
const QChar m_hashChar;
};
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 0ef8f145d9..509d08d246 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -514,7 +514,7 @@ void HelpPlugin::resetFilter()
{
const QString &filterInternal = QString::fromLatin1("Qt Creator %1.%2.%3")
.arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR).arg(IDE_VERSION_RELEASE);
- const QRegExp filterRegExp(QLatin1String("Qt Creator \\d*\\.\\d*\\.\\d*"));
+ QRegExp filterRegExp(QLatin1String("Qt Creator \\d*\\.\\d*\\.\\d*"));
QHelpEngineCore *engine = &LocalHelpManager::helpEngine();
const QStringList &filters = engine->customFilters();
@@ -900,7 +900,7 @@ void HelpPlugin::activateContext()
"available.</center></body></html>").arg(m_idFromContext));
} else {
int version = 0;
- const QRegExp exp("(\\d+)");
+ QRegExp exp("(\\d+)");
QUrl source = *links.begin();
const QLatin1String qtRefDoc = QLatin1String("com.trolltech.qt");
diff --git a/src/plugins/locator/basefilefilter.cpp b/src/plugins/locator/basefilefilter.cpp
index dc220f4f30..24d52c542b 100644
--- a/src/plugins/locator/basefilefilter.cpp
+++ b/src/plugins/locator/basefilefilter.cpp
@@ -53,7 +53,7 @@ QList<FilterEntry> BaseFileFilter::matchesFor(QFutureInterface<Locator::FilterEn
QString needle = trimWildcards(origEntry);
QStringMatcher matcher(needle, Qt::CaseInsensitive);
const QChar asterisk = QLatin1Char('*');
- const QRegExp regexp(asterisk + needle+ asterisk, Qt::CaseInsensitive, QRegExp::Wildcard);
+ QRegExp regexp(asterisk + needle+ asterisk, Qt::CaseInsensitive, QRegExp::Wildcard);
if (!regexp.isValid())
return matches;
const bool hasWildcard = needle.contains(asterisk) || needle.contains(QLatin1Char('?'));
diff --git a/src/plugins/locator/opendocumentsfilter.cpp b/src/plugins/locator/opendocumentsfilter.cpp
index 604a6b4759..40c84081a9 100644
--- a/src/plugins/locator/opendocumentsfilter.cpp
+++ b/src/plugins/locator/opendocumentsfilter.cpp
@@ -60,7 +60,7 @@ QList<FilterEntry> OpenDocumentsFilter::matchesFor(QFutureInterface<Locator::Fil
QString pattern = QString(asterisk);
pattern += entry;
pattern += asterisk;
- const QRegExp regexp(pattern, Qt::CaseInsensitive, QRegExp::Wildcard);
+ QRegExp regexp(pattern, Qt::CaseInsensitive, QRegExp::Wildcard);
if (!regexp.isValid())
return value;
foreach (const OpenEditorsModel::Entry &editorEntry, m_editors) {
diff --git a/src/plugins/madde/maddedevicetester.cpp b/src/plugins/madde/maddedevicetester.cpp
index c3e6498b11..c1d80ecfea 100644
--- a/src/plugins/madde/maddedevicetester.cpp
+++ b/src/plugins/madde/maddedevicetester.cpp
@@ -267,7 +267,7 @@ QString MaddeDeviceTester::processedQtLibsList()
patternString = QLatin1String("(libqt\\S+) ((\\d+)\\.(\\d+)\\.(\\d+))");
else
patternString = QLatin1String("(\\S+) (\\S*(\\d+)\\.(\\d+)\\.(\\d+)\\S*) \\S+ \\S+ \\S+");
- const QRegExp packagePattern(patternString);
+ QRegExp packagePattern(patternString);
int index = packagePattern.indexIn(unfilteredLibs);
if (index == -1)
return tr("No Qt packages installed.");
diff --git a/src/plugins/madde/maemopackagecreationstep.cpp b/src/plugins/madde/maemopackagecreationstep.cpp
index 082a2c0191..89b3a4e770 100644
--- a/src/plugins/madde/maemopackagecreationstep.cpp
+++ b/src/plugins/madde/maemopackagecreationstep.cpp
@@ -360,7 +360,7 @@ bool MaemoDebianPackageCreationStep::isMetaDataNewerThan(const QDateTime &packag
void MaemoDebianPackageCreationStep::checkProjectName()
{
- const QRegExp legalName(QLatin1String("[0-9-+a-z\\.]+"));
+ QRegExp legalName(QLatin1String("[0-9-+a-z\\.]+"));
if (!legalName.exactMatch(project()->displayName())) {
emit addTask(Task(Task::Warning,
tr("Your project name contains characters not allowed in "
diff --git a/src/plugins/madde/qt4maemotarget.cpp b/src/plugins/madde/qt4maemotarget.cpp
index 0c4ba4803c..d6f5327244 100644
--- a/src/plugins/madde/qt4maemotarget.cpp
+++ b/src/plugins/madde/qt4maemotarget.cpp
@@ -898,8 +898,7 @@ QString AbstractDebBasedQt4MaemoTarget::defaultPackageFileName() const
QString packageName = project()->displayName().toLower();
// We also replace dots, because OVI store chokes on them.
- const QRegExp legalLetter(QLatin1String("[a-z0-9+-]"), Qt::CaseSensitive,
- QRegExp::WildcardUnix);
+ QRegExp legalLetter(QLatin1String("[a-z0-9+-]"), Qt::CaseSensitive, QRegExp::WildcardUnix);
for (int i = 0; i < packageName.length(); ++i) {
if (!legalLetter.exactMatch(packageName.mid(i, 1)))
diff --git a/src/plugins/mercurial/annotationhighlighter.h b/src/plugins/mercurial/annotationhighlighter.h
index 92f2dc38b2..7b5abe254f 100644
--- a/src/plugins/mercurial/annotationhighlighter.h
+++ b/src/plugins/mercurial/annotationhighlighter.h
@@ -47,7 +47,7 @@ public:
private:
virtual QString changeNumber(const QString &block) const;
- QRegExp changeset;
+ mutable QRegExp changeset;
};
} //namespace Internal
diff --git a/src/plugins/mercurial/mercurialcommitwidget.cpp b/src/plugins/mercurial/mercurialcommitwidget.cpp
index 81f7cb468c..ec9ee9e537 100644
--- a/src/plugins/mercurial/mercurialcommitwidget.cpp
+++ b/src/plugins/mercurial/mercurialcommitwidget.cpp
@@ -69,7 +69,7 @@ public:
private:
enum State { Header, Comment, Other };
const QTextCharFormat m_commentFormat;
- const QRegExp m_keywordPattern;
+ QRegExp m_keywordPattern;
const QChar m_hashChar;
};
diff --git a/src/plugins/mercurial/mercurialeditor.h b/src/plugins/mercurial/mercurialeditor.h
index 03de664c35..bc1fe16dd5 100644
--- a/src/plugins/mercurial/mercurialeditor.h
+++ b/src/plugins/mercurial/mercurialeditor.h
@@ -54,9 +54,9 @@ private:
virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const;
virtual QStringList annotationPreviousVersions(const QString &revision) const;
- const QRegExp exactIdentifier12;
- const QRegExp exactIdentifier40;
- const QRegExp changesetIdentifier12;
+ mutable QRegExp exactIdentifier12;
+ mutable QRegExp exactIdentifier40;
+ mutable QRegExp changesetIdentifier12;
const QRegExp changesetIdentifier40;
const QRegExp diffIdentifier;
};
diff --git a/src/plugins/perforce/perforceeditor.h b/src/plugins/perforce/perforceeditor.h
index 801da2fa48..9e620fa067 100644
--- a/src/plugins/perforce/perforceeditor.h
+++ b/src/plugins/perforce/perforceeditor.h
@@ -58,7 +58,7 @@ private:
virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileName) const;
virtual QStringList annotationPreviousVersions(const QString &v) const;
- const QRegExp m_changeNumberPattern;
+ mutable QRegExp m_changeNumberPattern;
PerforcePlugin *m_plugin;
};
diff --git a/src/plugins/perforce/perforcesubmiteditor.cpp b/src/plugins/perforce/perforcesubmiteditor.cpp
index f49bb7d8cf..d421fd82b3 100644
--- a/src/plugins/perforce/perforcesubmiteditor.cpp
+++ b/src/plugins/perforce/perforcesubmiteditor.cpp
@@ -85,7 +85,7 @@ bool PerforceSubmitEditor::setFileContents(const QString &contents)
bool PerforceSubmitEditor::parseText(QString text)
{
- const QRegExp formField(QLatin1String("^\\S+:"));
+ QRegExp formField(QLatin1String("^\\S+:"));
const QString newLine = QString(QLatin1Char('\n'));
int match;
diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp
index 2952db901c..ca2d17db2a 100644
--- a/src/plugins/projectexplorer/allprojectsfind.cpp
+++ b/src/plugins/projectexplorer/allprojectsfind.cpp
@@ -97,7 +97,7 @@ Utils::FileIterator *AllProjectsFind::filesForProjects(const QStringList &nameFi
QStringList filteredFiles;
if (!filterRegs.isEmpty()) {
foreach (const QString &file, projectFiles) {
- foreach (const QRegExp &reg, filterRegs) {
+ foreach (QRegExp reg, filterRegs) {
if (reg.exactMatch(file) || reg.exactMatch(QFileInfo(file).fileName())) {
filteredFiles.append(file);
break;
diff --git a/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp b/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp
index 309068ede8..63ab92a531 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp
@@ -88,8 +88,8 @@ private:
mutable QRegExp m_ifPattern;
mutable QRegExp m_elsifPattern;
- const QRegExp m_elsePattern;
- const QRegExp m_endifPattern;
+ mutable QRegExp m_elsePattern;
+ mutable QRegExp m_endifPattern;
QStack<PreprocessStackEntry> m_sectionStack;
QScriptEngine m_scriptEngine;
diff --git a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
index 9f9f66f373..07d459334f 100644
--- a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
+++ b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
@@ -212,7 +212,7 @@ protected:
}
if (packageName.isEmpty() && _compound) {
// check the comments in _compound for annotations
- const QRegExp uriAnnotation(QLatin1String("@uri\\s*([\\w\\.]*)"));
+ QRegExp uriAnnotation(QLatin1String("@uri\\s*([\\w\\.]*)"));
// scan every comment between the pipes in
// {|
diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
index b48f4c3bf8..e0e4fee825 100644
--- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp
+++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
@@ -70,7 +70,7 @@ QList<Locator::FilterEntry> FunctionFilter::matchesFor(QFutureInterface<Locator:
QList<Locator::FilterEntry> betterEntries;
const QChar asterisk = QLatin1Char('*');
QStringMatcher matcher(entry, Qt::CaseInsensitive);
- const QRegExp regexp(asterisk + entry+ asterisk, Qt::CaseInsensitive, QRegExp::Wildcard);
+ QRegExp regexp(asterisk + entry+ asterisk, Qt::CaseInsensitive, QRegExp::Wildcard);
if (!regexp.isValid())
return goodEntries;
bool hasWildcard = (entry.contains(asterisk) || entry.contains('?'));
diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp
index 99b4169b8a..e13a201418 100644
--- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp
+++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp
@@ -272,7 +272,7 @@ bool FileFilterBaseItem::fileMatches(const QString &fileName) const
}
}
- foreach (const QRegExp &filter, m_regExpList) {
+ foreach (QRegExp filter, m_regExpList) {
if (filter.exactMatch(fileName)) {
return true;
}
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp
index 6f5c304bbc..fd37988e55 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp
@@ -62,7 +62,7 @@ public:
private:
void appendClass(const QString &);
- const QRegExp m_validator;
+ QRegExp m_validator;
const QString m_newClassPlaceHolder;
};
diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
index ceffa42107..21e30c9097 100644
--- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
@@ -130,8 +130,7 @@ RvctToolChain::RvctVersion RvctToolChain::version(const Utils::FileName &rvctPat
}
QString versionLine = QString::fromLocal8Bit(armcc.readAllStandardOutput());
versionLine += QString::fromLocal8Bit(armcc.readAllStandardError());
- const QRegExp versionRegExp(QLatin1String("^(\\d)(\\d)0*([1-9]\\d*)"),
- Qt::CaseInsensitive);
+ QRegExp versionRegExp(QLatin1String("^(\\d)(\\d)0*([1-9]\\d*)"), Qt::CaseInsensitive);
Q_ASSERT(versionRegExp.isValid());
if (versionRegExp.indexIn(versionLine) != -1) {
diff --git a/src/plugins/qtsupport/qtoutputformatter.cpp b/src/plugins/qtsupport/qtoutputformatter.cpp
index a08db73e2a..c4b14de5af 100644
--- a/src/plugins/qtsupport/qtoutputformatter.cpp
+++ b/src/plugins/qtsupport/qtoutputformatter.cpp
@@ -193,9 +193,9 @@ void QtOutputFormatter::appendLine(QTextCursor &cursor, LinkResult lr,
void QtOutputFormatter::handleLink(const QString &href)
{
if (!href.isEmpty()) {
- const QRegExp qmlLineColumnLink(QLatin1String("^(file:///.+)" // file url
- ":(\\d+)" // line
- ":(\\d+)$")); // column
+ QRegExp qmlLineColumnLink(QLatin1String("^(file:///.+)" // file url
+ ":(\\d+)" // line
+ ":(\\d+)$")); // column
if (qmlLineColumnLink.indexIn(href) != -1) {
const QUrl fileUrl = QUrl(qmlLineColumnLink.cap(1));
@@ -207,8 +207,8 @@ void QtOutputFormatter::handleLink(const QString &href)
return;
}
- const QRegExp qmlLineLink(QLatin1String("^(file:///.+)" // file url
- ":(\\d+)$")); // line
+ QRegExp qmlLineLink(QLatin1String("^(file:///.+)" // file url
+ ":(\\d+)$")); // line
if (qmlLineLink.indexIn(href) != -1) {
const QUrl fileUrl = QUrl(qmlLineLink.cap(1));
diff --git a/src/plugins/qtsupport/qtoutputformatter.h b/src/plugins/qtsupport/qtoutputformatter.h
index b9c7ccf8bf..7e3aebd72c 100644
--- a/src/plugins/qtsupport/qtoutputformatter.h
+++ b/src/plugins/qtsupport/qtoutputformatter.h
@@ -75,11 +75,11 @@ private:
void appendLine(QTextCursor & cursor, LinkResult lr,
const QString &line, Utils::OutputFormat);
- QRegExp m_qmlError;
- QRegExp m_qtError;
- QRegExp m_qtAssert;
- QRegExp m_qtAssertX;
- QRegExp m_qtTestFail;
+ mutable QRegExp m_qmlError;
+ mutable QRegExp m_qtError;
+ mutable QRegExp m_qtAssert;
+ mutable QRegExp m_qtAssertX;
+ mutable QRegExp m_qtTestFail;
QWeakPointer<ProjectExplorer::Project> m_project;
QString m_lastLine;
Utils::FileInProjectFinder m_projectFinder;
diff --git a/src/plugins/subversion/subversioneditor.h b/src/plugins/subversion/subversioneditor.h
index 74f413f2f9..38336ff344 100644
--- a/src/plugins/subversion/subversioneditor.h
+++ b/src/plugins/subversion/subversioneditor.h
@@ -56,8 +56,8 @@ private:
virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileName) const;
virtual QStringList annotationPreviousVersions(const QString &) const;
- const QRegExp m_changeNumberPattern;
- const QRegExp m_revisionNumberPattern;
+ mutable QRegExp m_changeNumberPattern;
+ mutable QRegExp m_revisionNumberPattern;
};
} // namespace Internal
diff --git a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp
index 041954419d..350a6567c3 100644
--- a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp
+++ b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp
@@ -204,7 +204,7 @@ void BasicProposalItemListModel::filter(const QString &prefix)
first = false;
}
- const QRegExp regExp(keyRegExp);
+ QRegExp regExp(keyRegExp);
m_currentItems.clear();
for (QList<BasicProposalItem *>::const_iterator it = m_originalItems.begin();
diff --git a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp
index d656ab424a..ad493df814 100644
--- a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp
+++ b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp
@@ -199,7 +199,7 @@ void HighlighterSettings::assignDefaultDefinitionsPath()
bool HighlighterSettings::isIgnoredFilePattern(const QString &fileName) const
{
- foreach (const QRegExp &regExp, m_ignoredFiles)
+ foreach (QRegExp regExp, m_ignoredFiles)
if (regExp.indexIn(fileName) != -1)
return true;
diff --git a/src/plugins/valgrind/memcheckengine.cpp b/src/plugins/valgrind/memcheckengine.cpp
index f012372740..8c4341db9e 100644
--- a/src/plugins/valgrind/memcheckengine.cpp
+++ b/src/plugins/valgrind/memcheckengine.cpp
@@ -135,8 +135,8 @@ void MemcheckEngine::receiveLogMessage(const QByteArray &b)
QString file;
int line = -1;
- const QRegExp suppressionError(QLatin1String("in suppressions file \"([^\"]+)\" near line (\\d+)"),
- Qt::CaseSensitive, QRegExp::RegExp2);
+ QRegExp suppressionError(QLatin1String("in suppressions file \"([^\"]+)\" near line (\\d+)"),
+ Qt::CaseSensitive, QRegExp::RegExp2);
if (suppressionError.indexIn(error) != -1) {
file = suppressionError.cap(1);
line = suppressionError.cap(2).toInt();
diff --git a/src/plugins/vcsbase/diffhighlighter.cpp b/src/plugins/vcsbase/diffhighlighter.cpp
index 4119ade372..5c6b225d11 100644
--- a/src/plugins/vcsbase/diffhighlighter.cpp
+++ b/src/plugins/vcsbase/diffhighlighter.cpp
@@ -95,7 +95,7 @@ public:
DiffFormats analyzeLine(const QString &block) const;
- const QRegExp m_filePattern;
+ mutable QRegExp m_filePattern;
const QString m_locationIndicator;
const QChar m_diffInIndicator;
const QChar m_diffOutIndicator;
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 855c298344..2777363307 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -466,7 +466,7 @@ bool UrlTextCursorHandler::findContentsUnderCursor(const QTextCursor &cursor)
if (cursorForUrl.hasSelection()) {
const QString line = cursorForUrl.selectedText();
const int cursorCol = cursor.columnNumber();
- const QRegExp urlRx(m_urlPattern);
+ QRegExp urlRx(m_urlPattern);
int urlMatchIndex = -1;
do {
urlMatchIndex = urlRx.indexIn(line, urlMatchIndex + 1);
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 078f6aadba..3585b17f79 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -2535,7 +2535,7 @@ ProStringList ProFileEvaluator::Private::evaluateExpandFunction(
}
r.detach(); // Keep m_tmp out of QRegExp's cache
- const QRegExp regex(r, Qt::CaseSensitive, QRegExp::Wildcard);
+ QRegExp regex(r, Qt::CaseSensitive, QRegExp::Wildcard);
for (int d = 0; d < dirs.count(); d++) {
QString dir = dirs[d];
QDir qdir(pfx + dir);