From 278eb8f93d03d70126db013395ab7338bc867019 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh <orgad.shaneh@audiocodes.com> Date: Mon, 19 May 2014 23:32:19 +0300 Subject: [PATCH] CppEditor: Pass some values by reference Change-Id: I18af0c97c22ef2189ebaeaacd32030b22f838c3d Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> --- src/plugins/cppeditor/cppquickfix_test.cpp | 2 +- src/plugins/cppeditor/cppquickfix_test.h | 2 +- src/plugins/cppeditor/cppquickfixes.cpp | 10 +++++----- src/plugins/cppeditor/fileandtokenactions_test.cpp | 8 +++++--- .../followsymbol_switchmethoddecldef_test.cpp | 4 ++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/cppquickfix_test.cpp index 21a8c7b90ca..4733947174a 100644 --- a/src/plugins/cppeditor/cppquickfix_test.cpp +++ b/src/plugins/cppeditor/cppquickfix_test.cpp @@ -124,7 +124,7 @@ static QByteArray &removeTrailingWhitespace(QByteArray &input) /// The '@' in the originalSource is the position from where the quick-fix discovery is triggered. /// Exactly one TestFile must contain the cursor position marker '@' in the originalSource. -QuickFixTestCase::QuickFixTestCase(const QList<QuickFixTestDocument::Ptr> theTestFiles, +QuickFixTestCase::QuickFixTestCase(const QList<QuickFixTestDocument::Ptr> &theTestFiles, CppQuickFixFactory *factory, const QStringList &includePaths, int resultIndex) diff --git a/src/plugins/cppeditor/cppquickfix_test.h b/src/plugins/cppeditor/cppquickfix_test.h index 58eaa1f949e..2046f7a4831 100644 --- a/src/plugins/cppeditor/cppquickfix_test.h +++ b/src/plugins/cppeditor/cppquickfix_test.h @@ -72,7 +72,7 @@ public: class QuickFixTestCase : public TestCase { public: - QuickFixTestCase(const QList<QuickFixTestDocument::Ptr> theTestFiles, + QuickFixTestCase(const QList<QuickFixTestDocument::Ptr> &theTestFiles, CppQuickFixFactory *factory, const QStringList &includePaths = QStringList(), int resultIndex = 0); diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 7ea9e1d253c..6a24bb44e3b 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -4163,7 +4163,7 @@ public: }; MoveFuncDefOutsideOp(const QSharedPointer<const CppQuickFixAssistInterface> &interface, - MoveType type, FunctionDefinitionAST *funcDef, const QString cppFileName) + MoveType type, FunctionDefinitionAST *funcDef, const QString &cppFileName) : CppQuickFixOperation(interface, 0) , m_funcDef(funcDef) , m_type(type) @@ -4297,9 +4297,9 @@ class MoveFuncDefToDeclOp : public CppQuickFixOperation { public: MoveFuncDefToDeclOp(const QSharedPointer<const CppQuickFixAssistInterface> &interface, - const QString fromFileName, const QString toFileName, - FunctionDefinitionAST *funcDef, const QString declText, - const ChangeSet::Range toRange) + const QString &fromFileName, const QString &toFileName, + FunctionDefinitionAST *funcDef, const QString &declText, + const ChangeSet::Range &toRange) : CppQuickFixOperation(interface, 0) , m_fromFileName(fromFileName) , m_toFileName(toFileName) @@ -4680,7 +4680,7 @@ class OptimizeForLoopOperation: public CppQuickFixOperation public: OptimizeForLoopOperation(const CppQuickFixInterface &interface, const ForStatementAST *forAst, const bool optimizePostcrement, const ExpressionAST *expression, - const FullySpecifiedType type) + const FullySpecifiedType &type) : CppQuickFixOperation(interface) , m_forAst(forAst) , m_optimizePostcrement(optimizePostcrement) diff --git a/src/plugins/cppeditor/fileandtokenactions_test.cpp b/src/plugins/cppeditor/fileandtokenactions_test.cpp index e3693bf34a5..41050e3f73f 100644 --- a/src/plugins/cppeditor/fileandtokenactions_test.cpp +++ b/src/plugins/cppeditor/fileandtokenactions_test.cpp @@ -116,7 +116,7 @@ public: private: /// Move word camel case wise from current cursor position until given token (not included) /// and execute the tokenActions for each new position. - static void moveWordCamelCaseToToken(TranslationUnit *translationUnit, Token token, + static void moveWordCamelCaseToToken(TranslationUnit *translationUnit, const Token &token, CPPEditor *editor, const Actions &tokenActions); static void undoAllChangesAndCloseAllEditors(); @@ -282,8 +282,10 @@ void TestActionsTestCase::executeActionsOnEditorWidget(CPPEditorWidget *editorWi QApplication::processEvents(); } -void TestActionsTestCase::moveWordCamelCaseToToken(TranslationUnit *translationUnit, Token token, - CPPEditor *editor, const Actions &tokenActions) +void TestActionsTestCase::moveWordCamelCaseToToken(TranslationUnit *translationUnit, + const Token &token, + CPPEditor *editor, + const Actions &tokenActions) { QVERIFY(translationUnit); QVERIFY(editor); diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp index 91a563ce152..09af39efc9e 100644 --- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp +++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp @@ -225,7 +225,7 @@ public: }; F2TestCase(CppEditorAction action, - const QList<TestDocumentPtr> testFiles, + const QList<TestDocumentPtr> &testFiles, const OverrideItemList &expectedVirtualFunctionProposal = OverrideItemList()); private: @@ -238,7 +238,7 @@ private: /// Exactly one test document must be provided that contains '$', the target position marker. /// It can be the same document. F2TestCase::F2TestCase(CppEditorAction action, - const QList<TestDocumentPtr> testFiles, + const QList<TestDocumentPtr> &testFiles, const OverrideItemList &expectedVirtualFunctionProposal) { QVERIFY(succeededSoFar()); -- GitLab