Use const'ref in theses methods

Change-Id: Idfa5ffdcf23d1ef80442276690b8082b8279dbfa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Montel Laurent
2017-04-14 10:12:30 +02:00
committed by Laurent Montel
parent c60103fc66
commit 86ea365a0b
27 changed files with 46 additions and 46 deletions

View File

@@ -107,7 +107,7 @@ static bool insertQuote(const QChar ch, const BackwardsScanner &tk)
&& stringLiteralPrefixes.contains(tk.text(index)); && stringLiteralPrefixes.contains(tk.text(index));
} }
static int countSkippedChars(const QString blockText, const QString &textToProcess) static int countSkippedChars(const QString &blockText, const QString &textToProcess)
{ {
int skippedChars = 0; int skippedChars = 0;
const int length = qMin(blockText.length(), textToProcess.length()); const int length = qMin(blockText.length(), textToProcess.length());

View File

@@ -87,7 +87,7 @@ public:
m_sequential->resume(); m_sequential->resume();
} }
} }
void animate(int duration, QEasingCurve curve) { void animate(int duration, const QEasingCurve &curve) {
reset(); reset();
m_sequential = new QSequentialAnimationGroup; m_sequential = new QSequentialAnimationGroup;
connect(m_sequential,&QAbstractAnimation::finished,this,&EasingSimulation::finished); connect(m_sequential,&QAbstractAnimation::finished,this,&EasingSimulation::finished);
@@ -288,7 +288,7 @@ void QmlEditorWidgets::EasingContextPane::on_durationSpinBox_valueChanged(int ne
emit propertyChanged(QLatin1String("duration"), newValue); emit propertyChanged(QLatin1String("duration"), newValue);
} }
void QmlEditorWidgets::EasingContextPane::on_easingShapeComboBox_currentIndexChanged(QString newShape) void QmlEditorWidgets::EasingContextPane::on_easingShapeComboBox_currentIndexChanged(const QString &newShape)
{ {
if (newShape==QLatin1String("Linear")) if (newShape==QLatin1String("Linear"))
setLinear(); setLinear();
@@ -312,7 +312,7 @@ void QmlEditorWidgets::EasingContextPane::on_easingShapeComboBox_currentIndexCha
} }
} }
void QmlEditorWidgets::EasingContextPane::on_easingExtremesComboBox_currentIndexChanged(QString newExtremes) void QmlEditorWidgets::EasingContextPane::on_easingExtremesComboBox_currentIndexChanged(const QString &newExtremes)
{ {
if (m_easingGraph->easingExtremes() != newExtremes) { if (m_easingGraph->easingExtremes() != newExtremes) {
m_easingGraph->setEasingExtremes(newExtremes); m_easingGraph->setEasingExtremes(newExtremes);

View File

@@ -74,12 +74,12 @@ private:
private slots: private slots:
void on_playButton_clicked(); void on_playButton_clicked();
void on_overshootSpinBox_valueChanged(double ); void on_overshootSpinBox_valueChanged(double);
void on_periodSpinBox_valueChanged(double ); void on_periodSpinBox_valueChanged(double);
void on_amplitudeSpinBox_valueChanged(double ); void on_amplitudeSpinBox_valueChanged(double);
void on_easingExtremesComboBox_currentIndexChanged(QString ); void on_easingExtremesComboBox_currentIndexChanged(const QString &);
void on_easingShapeComboBox_currentIndexChanged(QString ); void on_easingShapeComboBox_currentIndexChanged(const QString &);
void on_durationSpinBox_valueChanged(int ); void on_durationSpinBox_valueChanged(int);
void switchToGraph(); void switchToGraph();
}; };

View File

@@ -58,7 +58,7 @@ ImportKind::Enum toImportKind(ImportType::Enum type)
return ImportKind::Invalid; return ImportKind::Invalid;
} }
ImportMatchStrength::ImportMatchStrength(QList<int> match) ImportMatchStrength::ImportMatchStrength(const QList<int> &match)
: m_match(match) : m_match(match)
{ } { }
@@ -482,7 +482,7 @@ Export::Export()
: intrinsic(false) : intrinsic(false)
{ } { }
Export::Export(ImportKey exportName, QString pathRequired, bool intrinsic, const QString &typeName) Export::Export(ImportKey exportName, const QString &pathRequired, bool intrinsic, const QString &typeName)
: exportName(exportName), pathRequired(pathRequired), typeName(typeName), intrinsic(intrinsic) : exportName(exportName), pathRequired(pathRequired), typeName(typeName), intrinsic(intrinsic)
{ } { }

View File

@@ -56,7 +56,7 @@ class QMLJS_EXPORT ImportMatchStrength
{ {
public: public:
explicit ImportMatchStrength() {} explicit ImportMatchStrength() {}
ImportMatchStrength(QList<int> match); ImportMatchStrength(const QList<int> &match);
int compareMatch(const ImportMatchStrength &o) const; int compareMatch(const ImportMatchStrength &o) const;
@@ -127,7 +127,7 @@ class QMLJS_EXPORT Export
public: public:
static QString libraryTypeName(); static QString libraryTypeName();
Export(); Export();
Export(ImportKey exportName, QString pathRequired, bool intrinsic = false, Export(ImportKey exportName, const QString &pathRequired, bool intrinsic = false,
const QString &typeName = libraryTypeName()); const QString &typeName = libraryTypeName());
ImportKey exportName; ImportKey exportName;
QString pathRequired; QString pathRequired;

View File

@@ -94,7 +94,7 @@ protected:
{ {
public: public:
Program() {} Program() {}
Program(QTextBlock begin, QTextBlock end) Program(const QTextBlock &begin, const QTextBlock &end)
: begin(begin), end(end) {} : begin(begin), end(end) {}
QTextBlock firstBlock() const { return begin; } QTextBlock firstBlock() const { return begin; }

View File

@@ -39,7 +39,7 @@ ViewerContext::ViewerContext()
: language(Dialect::Qml), flags(AddAllPaths) : language(Dialect::Qml), flags(AddAllPaths)
{ } { }
ViewerContext::ViewerContext(QStringList selectors, QStringList paths, ViewerContext::ViewerContext(const QStringList &selectors, const QStringList &paths,
QmlJS::Dialect language, QmlJS::Dialect language,
QmlJS::ViewerContext::Flags flags) QmlJS::ViewerContext::Flags flags)
: selectors(selectors), paths(paths), language(language), : selectors(selectors), paths(paths), language(language),

View File

@@ -44,7 +44,7 @@ public:
}; };
ViewerContext(); ViewerContext();
ViewerContext(QStringList selectors, QStringList paths, ViewerContext(const QStringList &selectors, const QStringList &paths,
Dialect language = Dialect::Qml, Dialect language = Dialect::Qml,
Flags flags = AddAllPaths); Flags flags = AddAllPaths);

View File

@@ -85,7 +85,7 @@ class FileSearch
{ {
public: public:
FileSearch(const QString &searchTerm, QTextDocument::FindFlags flags, FileSearch(const QString &searchTerm, QTextDocument::FindFlags flags,
QMap<QString, QString> fileToContentsMap); const QMap<QString, QString> &fileToContentsMap);
void operator()(QFutureInterface<FileSearchResultList> &futureInterface, void operator()(QFutureInterface<FileSearchResultList> &futureInterface,
const FileIterator::Item &item) const; const FileIterator::Item &item) const;
@@ -105,7 +105,7 @@ class FileSearchRegExp
{ {
public: public:
FileSearchRegExp(const QString &searchTerm, QTextDocument::FindFlags flags, FileSearchRegExp(const QString &searchTerm, QTextDocument::FindFlags flags,
QMap<QString, QString> fileToContentsMap); const QMap<QString, QString> &fileToContentsMap);
FileSearchRegExp(const FileSearchRegExp &other); FileSearchRegExp(const FileSearchRegExp &other);
void operator()(QFutureInterface<FileSearchResultList> &futureInterface, void operator()(QFutureInterface<FileSearchResultList> &futureInterface,
const FileIterator::Item &item) const; const FileIterator::Item &item) const;
@@ -119,7 +119,7 @@ private:
}; };
FileSearch::FileSearch(const QString &searchTerm, QTextDocument::FindFlags flags, FileSearch::FileSearch(const QString &searchTerm, QTextDocument::FindFlags flags,
QMap<QString, QString> fileToContentsMap) const QMap<QString, QString> &fileToContentsMap)
{ {
this->fileToContentsMap = fileToContentsMap; this->fileToContentsMap = fileToContentsMap;
caseSensitive = (flags & QTextDocument::FindCaseSensitively); caseSensitive = (flags & QTextDocument::FindCaseSensitively);
@@ -225,7 +225,7 @@ void FileSearch::operator()(QFutureInterface<FileSearchResultList> &futureInterf
} }
FileSearchRegExp::FileSearchRegExp(const QString &searchTerm, QTextDocument::FindFlags flags, FileSearchRegExp::FileSearchRegExp(const QString &searchTerm, QTextDocument::FindFlags flags,
QMap<QString, QString> fileToContentsMap) const QMap<QString, QString> &fileToContentsMap)
{ {
this->fileToContentsMap = fileToContentsMap; this->fileToContentsMap = fileToContentsMap;
QString term = searchTerm; QString term = searchTerm;
@@ -360,7 +360,7 @@ void cleanUpFileSearch(QFutureInterface<FileSearchResultList> &futureInterface,
} // namespace } // namespace
QFuture<FileSearchResultList> Utils::findInFiles(const QString &searchTerm, FileIterator *files, QFuture<FileSearchResultList> Utils::findInFiles(const QString &searchTerm, FileIterator *files,
QTextDocument::FindFlags flags, QMap<QString, QString> fileToContentsMap) QTextDocument::FindFlags flags, const QMap<QString, QString> &fileToContentsMap)
{ {
return mapReduce(files->begin(), files->end(), return mapReduce(files->begin(), files->end(),
[searchTerm, files](QFutureInterface<FileSearchResultList> &futureInterface) { [searchTerm, files](QFutureInterface<FileSearchResultList> &futureInterface) {
@@ -372,7 +372,7 @@ QFuture<FileSearchResultList> Utils::findInFiles(const QString &searchTerm, File
} }
QFuture<FileSearchResultList> Utils::findInFilesRegExp(const QString &searchTerm, FileIterator *files, QFuture<FileSearchResultList> Utils::findInFilesRegExp(const QString &searchTerm, FileIterator *files,
QTextDocument::FindFlags flags, QMap<QString, QString> fileToContentsMap) QTextDocument::FindFlags flags, const QMap<QString, QString> &fileToContentsMap)
{ {
return mapReduce(files->begin(), files->end(), return mapReduce(files->begin(), files->end(),
[searchTerm, files](QFutureInterface<FileSearchResultList> &futureInterface) { [searchTerm, files](QFutureInterface<FileSearchResultList> &futureInterface) {
@@ -585,7 +585,7 @@ FileIterator::const_iterator FileIterator::end() const
// #pragma mark -- FileListIterator // #pragma mark -- FileListIterator
QTextCodec *encodingAt(const QList<QTextCodec *> encodings, int index) QTextCodec *encodingAt(const QList<QTextCodec *> &encodings, int index)
{ {
if (index >= 0 && index < encodings.size()) if (index >= 0 && index < encodings.size())
return encodings.at(index); return encodings.at(index);

View File

@@ -170,9 +170,9 @@ class QTCREATOR_UTILS_EXPORT FileSearchResult
{ {
public: public:
FileSearchResult() {} FileSearchResult() {}
FileSearchResult(QString fileName, int lineNumber, QString matchingLine, FileSearchResult(const QString &fileName, int lineNumber, const QString &matchingLine,
int matchStart, int matchLength, int matchStart, int matchLength,
QStringList regexpCapturedTexts) const QStringList &regexpCapturedTexts)
: fileName(fileName), : fileName(fileName),
lineNumber(lineNumber), lineNumber(lineNumber),
matchingLine(matchingLine), matchingLine(matchingLine),
@@ -192,10 +192,10 @@ public:
typedef QList<FileSearchResult> FileSearchResultList; typedef QList<FileSearchResult> FileSearchResultList;
QTCREATOR_UTILS_EXPORT QFuture<FileSearchResultList> findInFiles(const QString &searchTerm, FileIterator *files, QTCREATOR_UTILS_EXPORT QFuture<FileSearchResultList> findInFiles(const QString &searchTerm, FileIterator *files,
QTextDocument::FindFlags flags, QMap<QString, QString> fileToContentsMap = QMap<QString, QString>()); QTextDocument::FindFlags flags, const QMap<QString, QString> &fileToContentsMap = QMap<QString, QString>());
QTCREATOR_UTILS_EXPORT QFuture<FileSearchResultList> findInFilesRegExp(const QString &searchTerm, FileIterator *files, QTCREATOR_UTILS_EXPORT QFuture<FileSearchResultList> findInFilesRegExp(const QString &searchTerm, FileIterator *files,
QTextDocument::FindFlags flags, QMap<QString, QString> fileToContentsMap = QMap<QString, QString>()); QTextDocument::FindFlags flags, const QMap<QString, QString> &fileToContentsMap = QMap<QString, QString>());
QTCREATOR_UTILS_EXPORT QString expandRegExpReplacement(const QString &replaceText, const QStringList &capturedTexts); QTCREATOR_UTILS_EXPORT QString expandRegExpReplacement(const QString &replaceText, const QStringList &capturedTexts);
QTCREATOR_UTILS_EXPORT QString matchCaseReplacement(const QString &originalText, const QString &replaceText); QTCREATOR_UTILS_EXPORT QString matchCaseReplacement(const QString &originalText, const QString &replaceText);

View File

@@ -58,7 +58,7 @@ public:
explicit WizardDialogParameters(const QString &defaultPath, Id platform, explicit WizardDialogParameters(const QString &defaultPath, Id platform,
const QSet<Id> &requiredFeatures, DialogParameterFlags flags, const QSet<Id> &requiredFeatures, DialogParameterFlags flags,
QVariantMap extraValues) const QVariantMap &extraValues)
: m_defaultPath(defaultPath), : m_defaultPath(defaultPath),
m_selectedPlatform(platform), m_selectedPlatform(platform),
m_requiredFeatures(requiredFeatures), m_requiredFeatures(requiredFeatures),

View File

@@ -128,7 +128,7 @@ void HighlightScrollBar::setPriority(Id category, HighlightScrollBar::Priority p
m_overlay->scheduleUpdate(); m_overlay->scheduleUpdate();
} }
void HighlightScrollBar::addHighlights(Id category, QSet<int> highlights) void HighlightScrollBar::addHighlights(Id category, const QSet<int> &highlights)
{ {
if (!m_overlay) if (!m_overlay)
return; return;

View File

@@ -59,7 +59,7 @@ public:
void setPriority(Id category, Priority prio); void setPriority(Id category, Priority prio);
void addHighlight(Id category, int highlight); void addHighlight(Id category, int highlight);
void addHighlights(Id category, QSet<int> highlights); void addHighlights(Id category, const QSet<int> &highlights);
void removeHighlights(Id id); void removeHighlights(Id id);
void removeAllHighlights(); void removeAllHighlights();

View File

@@ -159,7 +159,7 @@ QWidget *s_currentWizard = nullptr;
class NewItemDialogData class NewItemDialogData
{ {
public: public:
void setData(const QString t, const QList<IWizardFactory *> f, void setData(const QString &t, const QList<IWizardFactory *> &f,
const QString &dl, const QVariantMap &ev) const QString &dl, const QVariantMap &ev)
{ {
QTC_ASSERT(!hasData(), return); QTC_ASSERT(!hasData(), return);

View File

@@ -462,7 +462,7 @@ void BuildManager::nextStep()
} }
} }
bool BuildManager::buildQueueAppend(QList<BuildStep *> steps, QStringList names, const QStringList &preambleMessage) bool BuildManager::buildQueueAppend(const QList<BuildStep *> &steps, QStringList names, const QStringList &preambleMessage)
{ {
if (!d->m_running) { if (!d->m_running) {
d->m_outputWindow->clearContents(); d->m_outputWindow->clearContents();

View File

@@ -95,7 +95,7 @@ private:
static void startBuildQueue(); static void startBuildQueue();
static void nextStep(); static void nextStep();
static void clearBuildQueue(); static void clearBuildQueue();
static bool buildQueueAppend(QList<BuildStep *> steps, QStringList names, const QStringList &preambleMessage = QStringList()); static bool buildQueueAppend(const QList<BuildStep *> &steps, QStringList names, const QStringList &preambleMessage = QStringList());
static void incrementActiveBuildSteps(BuildStep *bs); static void incrementActiveBuildSteps(BuildStep *bs);
static void decrementActiveBuildSteps(BuildStep *bs); static void decrementActiveBuildSteps(BuildStep *bs);
static void disconnectOutput(BuildStep *bs); static void disconnectOutput(BuildStep *bs);

View File

@@ -72,7 +72,7 @@ public:
class OpenProjectResult class OpenProjectResult
{ {
public: public:
OpenProjectResult(QList<Project *> projects, QList<Project *> alreadyOpen, OpenProjectResult(const QList<Project *> &projects, const QList<Project *> &alreadyOpen,
const QString &errorMessage) const QString &errorMessage)
: m_projects(projects), m_alreadyOpen(alreadyOpen), : m_projects(projects), m_alreadyOpen(alreadyOpen),
m_errorMessage(errorMessage) m_errorMessage(errorMessage)

View File

@@ -38,14 +38,14 @@ namespace Internal {
class SessionValidator : public QValidator class SessionValidator : public QValidator
{ {
public: public:
SessionValidator(QObject *parent, QStringList sessions); SessionValidator(QObject *parent, const QStringList &sessions);
void fixup(QString & input) const; void fixup(QString & input) const;
QValidator::State validate(QString & input, int & pos) const; QValidator::State validate(QString & input, int & pos) const;
private: private:
QStringList m_sessions; QStringList m_sessions;
}; };
SessionValidator::SessionValidator(QObject *parent, QStringList sessions) SessionValidator::SessionValidator(QObject *parent, const QStringList &sessions)
: QValidator(parent), m_sessions(sessions) : QValidator(parent), m_sessions(sessions)
{ {
} }

View File

@@ -139,7 +139,7 @@ public:
private: private:
struct TargetDescription struct TargetDescription
{ {
TargetDescription(QString tid, QString dn) : TargetDescription(const QString &tid, const QString &dn) :
id(tid), id(tid),
displayName(dn) displayName(dn)
{ {

View File

@@ -474,7 +474,7 @@ QIcon Target::overlayIcon() const
return d->m_overlayIcon; return d->m_overlayIcon;
} }
void Target::setOverlayIcon(QIcon icon) void Target::setOverlayIcon(const QIcon &icon)
{ {
d->m_overlayIcon = icon; d->m_overlayIcon = icon;
emit overlayIconChanged(); emit overlayIconChanged();

View File

@@ -97,7 +97,7 @@ public:
QIcon icon() const; QIcon icon() const;
QIcon overlayIcon() const; QIcon overlayIcon() const;
void setOverlayIcon(QIcon icon); void setOverlayIcon(const QIcon &icon);
QString overlayIconToolTip(); QString overlayIconToolTip();
QVariantMap toMap() const override; QVariantMap toMap() const override;

View File

@@ -209,7 +209,7 @@ public:
QList<QAction *> m_actions; QList<QAction *> m_actions;
}; };
static QToolButton *createFilterButton(QIcon icon, const QString &toolTip, static QToolButton *createFilterButton(const QIcon &icon, const QString &toolTip,
QObject *receiver, std::function<void(bool)> lambda) QObject *receiver, std::function<void(bool)> lambda)
{ {
auto button = new QToolButton; auto button = new QToolButton;

View File

@@ -44,7 +44,7 @@ namespace TextEditor {
* Qt::GlobalColor types (although there cannot be any spaces such as * Qt::GlobalColor types (although there cannot be any spaces such as
* "Qt:: yellow") * "Qt:: yellow")
*/ */
static QString extractColorString(const QString s, int pos) static QString extractColorString(const QString &s, int pos)
{ {
if (s.length() < 3 || pos < 0 || pos >= s.length()) if (s.length() < 3 || pos < 0 || pos >= s.length())
return QString(); return QString();

View File

@@ -312,7 +312,7 @@ QString TabSettings::indentationString(int startColumn, int targetColumn, int pa
return s; return s;
} }
void TabSettings::indentLine(QTextBlock block, int newIndent, int padding) const void TabSettings::indentLine(const QTextBlock &block, int newIndent, int padding) const
{ {
const QString text = block.text(); const QString text = block.text();
const int oldBlockLength = text.size(); const int oldBlockLength = text.size();

View File

@@ -74,7 +74,7 @@ public:
int indentationColumn(const QString &text) const; int indentationColumn(const QString &text) const;
static int maximumPadding(const QString &text); static int maximumPadding(const QString &text);
void indentLine(QTextBlock block, int newIndent, int padding = 0) const; void indentLine(const QTextBlock &block, int newIndent, int padding = 0) const;
void reindentLine(QTextBlock block, int delta) const; void reindentLine(QTextBlock block, int delta) const;
bool isIndentationClean(const QTextBlock &block, const int indent) const; bool isIndentationClean(const QTextBlock &block, const int indent) const;

View File

@@ -80,7 +80,7 @@ bool TypingSettings::equals(const TypingSettings &ts) const
&& m_smartBackspaceBehavior == ts.m_smartBackspaceBehavior; && m_smartBackspaceBehavior == ts.m_smartBackspaceBehavior;
} }
bool TypingSettings::tabShouldIndent(const QTextDocument *document, QTextCursor cursor, int *suggestedPosition) const bool TypingSettings::tabShouldIndent(const QTextDocument *document, const QTextCursor &cursor, int *suggestedPosition) const
{ {
if (m_tabKeyBehavior == TabNeverIndents) if (m_tabKeyBehavior == TabNeverIndents)
return false; return false;

View File

@@ -56,7 +56,7 @@ public:
TypingSettings(); TypingSettings();
bool tabShouldIndent(const QTextDocument *document, QTextCursor cursor, int *suggestedPosition) const; bool tabShouldIndent(const QTextDocument *document, const QTextCursor &cursor, int *suggestedPosition) const;
void toSettings(const QString &category, QSettings *s) const; void toSettings(const QString &category, QSettings *s) const;
void fromSettings(const QString &category, const QSettings *s); void fromSettings(const QString &category, const QSettings *s);