diff options
author | Montel Laurent <laurent.montel@kdab.com> | 2017-04-14 10:12:30 +0200 |
---|---|---|
committer | Laurent Montel <laurent.montel@kdab.com> | 2017-04-21 07:58:39 +0000 |
commit | 86ea365a0b2161e154cd3cb33b8d214db2e65e91 (patch) | |
tree | 3724cf19c331791e8662ceb078de52f9229d9b89 /src | |
parent | c60103fc66d6bb21e9a76e14ec44b8479a0d9dfd (diff) |
Use const'ref in theses methods
Change-Id: Idfa5ffdcf23d1ef80442276690b8082b8279dbfa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src')
27 files changed, 46 insertions, 46 deletions
diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp index 46dfdfb3be..2033218e10 100644 --- a/src/libs/cplusplus/MatchingText.cpp +++ b/src/libs/cplusplus/MatchingText.cpp @@ -107,7 +107,7 @@ static bool insertQuote(const QChar ch, const BackwardsScanner &tk) && 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; const int length = qMin(blockText.length(), textToProcess.length()); diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp index 4d44d17138..86b83ef85a 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp +++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp @@ -87,7 +87,7 @@ public: m_sequential->resume(); } } - void animate(int duration, QEasingCurve curve) { + void animate(int duration, const QEasingCurve &curve) { reset(); m_sequential = new QSequentialAnimationGroup; 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); } -void QmlEditorWidgets::EasingContextPane::on_easingShapeComboBox_currentIndexChanged(QString newShape) +void QmlEditorWidgets::EasingContextPane::on_easingShapeComboBox_currentIndexChanged(const QString &newShape) { if (newShape==QLatin1String("Linear")) 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) { m_easingGraph->setEasingExtremes(newExtremes); diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h index 8609f843b8..8f71a53d22 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h +++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h @@ -74,12 +74,12 @@ private: private slots: void on_playButton_clicked(); - void on_overshootSpinBox_valueChanged(double ); - void on_periodSpinBox_valueChanged(double ); - void on_amplitudeSpinBox_valueChanged(double ); - void on_easingExtremesComboBox_currentIndexChanged(QString ); - void on_easingShapeComboBox_currentIndexChanged(QString ); - void on_durationSpinBox_valueChanged(int ); + void on_overshootSpinBox_valueChanged(double); + void on_periodSpinBox_valueChanged(double); + void on_amplitudeSpinBox_valueChanged(double); + void on_easingExtremesComboBox_currentIndexChanged(const QString &); + void on_easingShapeComboBox_currentIndexChanged(const QString &); + void on_durationSpinBox_valueChanged(int); void switchToGraph(); }; diff --git a/src/libs/qmljs/qmljsimportdependencies.cpp b/src/libs/qmljs/qmljsimportdependencies.cpp index 4319920543..d9addb474c 100644 --- a/src/libs/qmljs/qmljsimportdependencies.cpp +++ b/src/libs/qmljs/qmljsimportdependencies.cpp @@ -58,7 +58,7 @@ ImportKind::Enum toImportKind(ImportType::Enum type) return ImportKind::Invalid; } -ImportMatchStrength::ImportMatchStrength(QList<int> match) +ImportMatchStrength::ImportMatchStrength(const QList<int> &match) : m_match(match) { } @@ -482,7 +482,7 @@ Export::Export() : 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) { } diff --git a/src/libs/qmljs/qmljsimportdependencies.h b/src/libs/qmljs/qmljsimportdependencies.h index f529629465..d228a0f095 100644 --- a/src/libs/qmljs/qmljsimportdependencies.h +++ b/src/libs/qmljs/qmljsimportdependencies.h @@ -56,7 +56,7 @@ class QMLJS_EXPORT ImportMatchStrength { public: explicit ImportMatchStrength() {} - ImportMatchStrength(QList<int> match); + ImportMatchStrength(const QList<int> &match); int compareMatch(const ImportMatchStrength &o) const; @@ -127,7 +127,7 @@ class QMLJS_EXPORT Export public: static QString libraryTypeName(); Export(); - Export(ImportKey exportName, QString pathRequired, bool intrinsic = false, + Export(ImportKey exportName, const QString &pathRequired, bool intrinsic = false, const QString &typeName = libraryTypeName()); ImportKey exportName; QString pathRequired; diff --git a/src/libs/qmljs/qmljslineinfo.h b/src/libs/qmljs/qmljslineinfo.h index d687a1e18b..1646ba64f3 100644 --- a/src/libs/qmljs/qmljslineinfo.h +++ b/src/libs/qmljs/qmljslineinfo.h @@ -94,7 +94,7 @@ protected: { public: Program() {} - Program(QTextBlock begin, QTextBlock end) + Program(const QTextBlock &begin, const QTextBlock &end) : begin(begin), end(end) {} QTextBlock firstBlock() const { return begin; } diff --git a/src/libs/qmljs/qmljsviewercontext.cpp b/src/libs/qmljs/qmljsviewercontext.cpp index 8fb8afe662..d034432dc4 100644 --- a/src/libs/qmljs/qmljsviewercontext.cpp +++ b/src/libs/qmljs/qmljsviewercontext.cpp @@ -39,7 +39,7 @@ ViewerContext::ViewerContext() : language(Dialect::Qml), flags(AddAllPaths) { } -ViewerContext::ViewerContext(QStringList selectors, QStringList paths, +ViewerContext::ViewerContext(const QStringList &selectors, const QStringList &paths, QmlJS::Dialect language, QmlJS::ViewerContext::Flags flags) : selectors(selectors), paths(paths), language(language), diff --git a/src/libs/qmljs/qmljsviewercontext.h b/src/libs/qmljs/qmljsviewercontext.h index 7724d872d0..a04596cdd3 100644 --- a/src/libs/qmljs/qmljsviewercontext.h +++ b/src/libs/qmljs/qmljsviewercontext.h @@ -44,7 +44,7 @@ public: }; ViewerContext(); - ViewerContext(QStringList selectors, QStringList paths, + ViewerContext(const QStringList &selectors, const QStringList &paths, Dialect language = Dialect::Qml, Flags flags = AddAllPaths); diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp index fde54b3d48..42ffa561f1 100644 --- a/src/libs/utils/filesearch.cpp +++ b/src/libs/utils/filesearch.cpp @@ -85,7 +85,7 @@ class FileSearch { public: FileSearch(const QString &searchTerm, QTextDocument::FindFlags flags, - QMap<QString, QString> fileToContentsMap); + const QMap<QString, QString> &fileToContentsMap); void operator()(QFutureInterface<FileSearchResultList> &futureInterface, const FileIterator::Item &item) const; @@ -105,7 +105,7 @@ class FileSearchRegExp { public: FileSearchRegExp(const QString &searchTerm, QTextDocument::FindFlags flags, - QMap<QString, QString> fileToContentsMap); + const QMap<QString, QString> &fileToContentsMap); FileSearchRegExp(const FileSearchRegExp &other); void operator()(QFutureInterface<FileSearchResultList> &futureInterface, const FileIterator::Item &item) const; @@ -119,7 +119,7 @@ private: }; FileSearch::FileSearch(const QString &searchTerm, QTextDocument::FindFlags flags, - QMap<QString, QString> fileToContentsMap) + const QMap<QString, QString> &fileToContentsMap) { this->fileToContentsMap = fileToContentsMap; caseSensitive = (flags & QTextDocument::FindCaseSensitively); @@ -225,7 +225,7 @@ void FileSearch::operator()(QFutureInterface<FileSearchResultList> &futureInterf } FileSearchRegExp::FileSearchRegExp(const QString &searchTerm, QTextDocument::FindFlags flags, - QMap<QString, QString> fileToContentsMap) + const QMap<QString, QString> &fileToContentsMap) { this->fileToContentsMap = fileToContentsMap; QString term = searchTerm; @@ -360,7 +360,7 @@ void cleanUpFileSearch(QFutureInterface<FileSearchResultList> &futureInterface, } // namespace 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(), [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, - QTextDocument::FindFlags flags, QMap<QString, QString> fileToContentsMap) + QTextDocument::FindFlags flags, const QMap<QString, QString> &fileToContentsMap) { return mapReduce(files->begin(), files->end(), [searchTerm, files](QFutureInterface<FileSearchResultList> &futureInterface) { @@ -585,7 +585,7 @@ FileIterator::const_iterator FileIterator::end() const // #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()) return encodings.at(index); diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h index 23336c3f11..6ddf18ab53 100644 --- a/src/libs/utils/filesearch.h +++ b/src/libs/utils/filesearch.h @@ -170,9 +170,9 @@ class QTCREATOR_UTILS_EXPORT FileSearchResult { public: FileSearchResult() {} - FileSearchResult(QString fileName, int lineNumber, QString matchingLine, + FileSearchResult(const QString &fileName, int lineNumber, const QString &matchingLine, int matchStart, int matchLength, - QStringList regexpCapturedTexts) + const QStringList ®expCapturedTexts) : fileName(fileName), lineNumber(lineNumber), matchingLine(matchingLine), @@ -192,10 +192,10 @@ public: typedef QList<FileSearchResult> FileSearchResultList; 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, - 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 matchCaseReplacement(const QString &originalText, const QString &replaceText); diff --git a/src/plugins/coreplugin/basefilewizardfactory.h b/src/plugins/coreplugin/basefilewizardfactory.h index 0026a1d638..61972f17e1 100644 --- a/src/plugins/coreplugin/basefilewizardfactory.h +++ b/src/plugins/coreplugin/basefilewizardfactory.h @@ -58,7 +58,7 @@ public: explicit WizardDialogParameters(const QString &defaultPath, Id platform, const QSet<Id> &requiredFeatures, DialogParameterFlags flags, - QVariantMap extraValues) + const QVariantMap &extraValues) : m_defaultPath(defaultPath), m_selectedPlatform(platform), m_requiredFeatures(requiredFeatures), diff --git a/src/plugins/coreplugin/find/highlightscrollbar.cpp b/src/plugins/coreplugin/find/highlightscrollbar.cpp index 7a7a9f13b0..c63daa158c 100644 --- a/src/plugins/coreplugin/find/highlightscrollbar.cpp +++ b/src/plugins/coreplugin/find/highlightscrollbar.cpp @@ -128,7 +128,7 @@ void HighlightScrollBar::setPriority(Id category, HighlightScrollBar::Priority p m_overlay->scheduleUpdate(); } -void HighlightScrollBar::addHighlights(Id category, QSet<int> highlights) +void HighlightScrollBar::addHighlights(Id category, const QSet<int> &highlights) { if (!m_overlay) return; diff --git a/src/plugins/coreplugin/find/highlightscrollbar.h b/src/plugins/coreplugin/find/highlightscrollbar.h index 505db15758..56129435c2 100644 --- a/src/plugins/coreplugin/find/highlightscrollbar.h +++ b/src/plugins/coreplugin/find/highlightscrollbar.h @@ -59,7 +59,7 @@ public: void setPriority(Id category, Priority prio); 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 removeAllHighlights(); diff --git a/src/plugins/coreplugin/iwizardfactory.cpp b/src/plugins/coreplugin/iwizardfactory.cpp index 72cda1a63f..238f992a32 100644 --- a/src/plugins/coreplugin/iwizardfactory.cpp +++ b/src/plugins/coreplugin/iwizardfactory.cpp @@ -159,7 +159,7 @@ QWidget *s_currentWizard = nullptr; class NewItemDialogData { 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) { QTC_ASSERT(!hasData(), return); diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 43d3b9469b..ca47ec0b20 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -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) { d->m_outputWindow->clearContents(); diff --git a/src/plugins/projectexplorer/buildmanager.h b/src/plugins/projectexplorer/buildmanager.h index 16832c8849..349dad44ad 100644 --- a/src/plugins/projectexplorer/buildmanager.h +++ b/src/plugins/projectexplorer/buildmanager.h @@ -95,7 +95,7 @@ private: static void startBuildQueue(); static void nextStep(); 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 decrementActiveBuildSteps(BuildStep *bs); static void disconnectOutput(BuildStep *bs); diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h index 3a596a6d3a..58958c08f2 100644 --- a/src/plugins/projectexplorer/projectexplorer.h +++ b/src/plugins/projectexplorer/projectexplorer.h @@ -72,7 +72,7 @@ public: class OpenProjectResult { public: - OpenProjectResult(QList<Project *> projects, QList<Project *> alreadyOpen, + OpenProjectResult(const QList<Project *> &projects, const QList<Project *> &alreadyOpen, const QString &errorMessage) : m_projects(projects), m_alreadyOpen(alreadyOpen), m_errorMessage(errorMessage) diff --git a/src/plugins/projectexplorer/sessiondialog.cpp b/src/plugins/projectexplorer/sessiondialog.cpp index d3eba933c5..a1bae82fc2 100644 --- a/src/plugins/projectexplorer/sessiondialog.cpp +++ b/src/plugins/projectexplorer/sessiondialog.cpp @@ -38,14 +38,14 @@ namespace Internal { class SessionValidator : public QValidator { public: - SessionValidator(QObject *parent, QStringList sessions); + SessionValidator(QObject *parent, const QStringList &sessions); void fixup(QString & input) const; QValidator::State validate(QString & input, int & pos) const; private: QStringList m_sessions; }; -SessionValidator::SessionValidator(QObject *parent, QStringList sessions) +SessionValidator::SessionValidator(QObject *parent, const QStringList &sessions) : QValidator(parent), m_sessions(sessions) { } diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp index 4920da03b5..6d97e506fa 100644 --- a/src/plugins/projectexplorer/settingsaccessor.cpp +++ b/src/plugins/projectexplorer/settingsaccessor.cpp @@ -139,7 +139,7 @@ public: private: struct TargetDescription { - TargetDescription(QString tid, QString dn) : + TargetDescription(const QString &tid, const QString &dn) : id(tid), displayName(dn) { diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index cd9315da2d..3b480e8266 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/src/plugins/projectexplorer/target.cpp @@ -474,7 +474,7 @@ QIcon Target::overlayIcon() const return d->m_overlayIcon; } -void Target::setOverlayIcon(QIcon icon) +void Target::setOverlayIcon(const QIcon &icon) { d->m_overlayIcon = icon; emit overlayIconChanged(); diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h index 550ad4a24a..61f3ed5615 100644 --- a/src/plugins/projectexplorer/target.h +++ b/src/plugins/projectexplorer/target.h @@ -97,7 +97,7 @@ public: QIcon icon() const; QIcon overlayIcon() const; - void setOverlayIcon(QIcon icon); + void setOverlayIcon(const QIcon &icon); QString overlayIconToolTip(); QVariantMap toMap() const override; diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 5d0e44e56b..d8337cf6ff 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -209,7 +209,7 @@ public: 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) { auto button = new QToolButton; diff --git a/src/plugins/texteditor/colorpreviewhoverhandler.cpp b/src/plugins/texteditor/colorpreviewhoverhandler.cpp index 448c40de41..c6ca5947d0 100644 --- a/src/plugins/texteditor/colorpreviewhoverhandler.cpp +++ b/src/plugins/texteditor/colorpreviewhoverhandler.cpp @@ -44,7 +44,7 @@ namespace TextEditor { * Qt::GlobalColor types (although there cannot be any spaces such as * "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()) return QString(); diff --git a/src/plugins/texteditor/tabsettings.cpp b/src/plugins/texteditor/tabsettings.cpp index 0bf4bc2995..fb9e93859b 100644 --- a/src/plugins/texteditor/tabsettings.cpp +++ b/src/plugins/texteditor/tabsettings.cpp @@ -312,7 +312,7 @@ QString TabSettings::indentationString(int startColumn, int targetColumn, int pa 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 int oldBlockLength = text.size(); diff --git a/src/plugins/texteditor/tabsettings.h b/src/plugins/texteditor/tabsettings.h index 01ea77c5bb..b1316b4cb1 100644 --- a/src/plugins/texteditor/tabsettings.h +++ b/src/plugins/texteditor/tabsettings.h @@ -74,7 +74,7 @@ public: int indentationColumn(const QString &text) const; 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; bool isIndentationClean(const QTextBlock &block, const int indent) const; diff --git a/src/plugins/texteditor/typingsettings.cpp b/src/plugins/texteditor/typingsettings.cpp index ae0f2149fc..13440c259f 100644 --- a/src/plugins/texteditor/typingsettings.cpp +++ b/src/plugins/texteditor/typingsettings.cpp @@ -80,7 +80,7 @@ bool TypingSettings::equals(const TypingSettings &ts) const && 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) return false; diff --git a/src/plugins/texteditor/typingsettings.h b/src/plugins/texteditor/typingsettings.h index f71fb3c6cc..2fd37f016e 100644 --- a/src/plugins/texteditor/typingsettings.h +++ b/src/plugins/texteditor/typingsettings.h @@ -56,7 +56,7 @@ public: 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 fromSettings(const QString &category, const QSettings *s); |