From 699495f01744b8860df15a7ebe112e0f736bd0f3 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 19 Oct 2010 08:55:55 +0200
Subject: [PATCH] Fix compiler warnings, constify.
---
src/libs/utils/filesearch.cpp | 16 +++++++---------
src/plugins/qt4projectmanager/profileeditor.cpp | 2 +-
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp
index 7e6f1ce3c9f..c2bb534d783 100644
--- a/src/libs/utils/filesearch.cpp
+++ b/src/libs/utils/filesearch.cpp
@@ -79,20 +79,18 @@ void runFileSearch(QFutureInterface<FileSearchResultList> &future,
future.setProgressRange(0, files->maxProgress());
future.setProgressValueAndText(files->currentProgress(), msgFound(searchTerm, numMatches, numFilesSearched));
- bool caseInsensitive = !(flags & QTextDocument::FindCaseSensitively);
- bool wholeWord = (flags & QTextDocument::FindWholeWords);
+ const bool caseInsensitive = !(flags & QTextDocument::FindCaseSensitively);
+ const bool wholeWord = (flags & QTextDocument::FindWholeWords);
const QString searchTermLower = searchTerm.toLower();
const QString searchTermUpper = searchTerm.toUpper();
- int termLength = searchTerm.length();
- int termMaxIndex = termLength - 1;
+ const int termLength = searchTerm.length();
+ const int termMaxIndex = termLength - 1;
const QChar *termData = searchTerm.constData();
const QChar *termDataLower = searchTermLower.constData();
const QChar *termDataUpper = searchTermUpper.constData();
- int chunkSize = qMax(100000, 2 * termLength);
-
QFile file;
QString str;
QTextStream stream;
@@ -295,7 +293,7 @@ QString Utils::expandRegExpReplacement(const QString &replaceText, const QString
{
// handles \1 \\ \& & \t
QString result;
- int numCaptures = capturedTexts.size() - 1;
+ const int numCaptures = capturedTexts.size() - 1;
for (int i = 0; i < replaceText.length(); ++i) {
QChar c = replaceText.at(i);
if (c == QLatin1Char('\\') && i < replaceText.length() - 1) {
@@ -408,8 +406,8 @@ bool SubDirFileIterator::hasNext() const
return true;
while(!m_dirs.isEmpty() && m_currentFiles.isEmpty()) {
QDir dir = m_dirs.pop();
- qreal dirProgressMax = m_progressValues.pop();
- bool processed = m_processedValues.pop();
+ const qreal dirProgressMax = m_progressValues.pop();
+ const bool processed = m_processedValues.pop();
if (dir.exists()) {
QStringList subDirs;
if (!processed) {
diff --git a/src/plugins/qt4projectmanager/profileeditor.cpp b/src/plugins/qt4projectmanager/profileeditor.cpp
index 21a66776e65..057000787c7 100644
--- a/src/plugins/qt4projectmanager/profileeditor.cpp
+++ b/src/plugins/qt4projectmanager/profileeditor.cpp
@@ -121,7 +121,7 @@ static bool isValidFileNameChar(const QChar &c)
}
ProFileEditor::Link ProFileEditor::findLinkAt(const QTextCursor &cursor,
- bool resolveTarget)
+ bool /* resolveTarget */)
{
Link link;
--
GitLab