From a167bd9ad280b80a7da85f2fa982d4bb83519696 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 3 Jun 2022 15:17:33 +0200 Subject: [PATCH] Do not pass Utils::LinkHandler by rvalue ref There is nothing special about this type that justifies it sticking out everywhere it appears. Change-Id: Iccdc95163d477db8a031d0d520f28fea26432a44 Reviewed-by: Qt CI Bot Reviewed-by: Reviewed-by: hjk --- src/plugins/clangcodemodel/clangdclient.cpp | 19 +++++++++---------- src/plugins/clangcodemodel/clangdclient.h | 4 ++-- .../clangmodelmanagersupport.cpp | 13 ++++++------- .../clangcodemodel/clangmodelmanagersupport.h | 4 ++-- .../cmakeprojectmanager/cmakeeditor.cpp | 4 ++-- .../cppbuiltinmodelmanagersupport.cpp | 8 ++++---- .../cppeditor/cppbuiltinmodelmanagersupport.h | 4 ++-- src/plugins/cppeditor/cppeditorwidget.cpp | 6 +++--- src/plugins/cppeditor/cppeditorwidget.h | 2 +- .../cppeditor/cppfollowsymbolundercursor.cpp | 4 ++-- .../cppeditor/cppfollowsymbolundercursor.h | 4 ++-- src/plugins/cppeditor/cppmodelmanager.cpp | 8 ++++---- src/plugins/cppeditor/cppmodelmanager.h | 4 ++-- .../cppeditor/cppmodelmanagersupport.h | 4 ++-- .../languageclient/languageclientmanager.cpp | 2 +- .../nim/editor/nimtexteditorwidget.cpp | 4 ++-- src/plugins/nim/editor/nimtexteditorwidget.h | 2 +- .../qmakeprojectmanager/profileeditor.cpp | 4 ++-- src/plugins/qmljseditor/qmljseditor.cpp | 2 +- src/plugins/qmljseditor/qmljseditor.h | 2 +- src/plugins/texteditor/texteditor.cpp | 2 +- src/plugins/texteditor/texteditor.h | 4 ++-- 22 files changed, 54 insertions(+), 56 deletions(-) diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp index fc3088d7649..7d5970c2915 100644 --- a/src/plugins/clangcodemodel/clangdclient.cpp +++ b/src/plugins/clangcodemodel/clangdclient.cpp @@ -359,10 +359,10 @@ class ClangdClient::FollowSymbolData { public: FollowSymbolData(ClangdClient *q, quint64 id, const QTextCursor &cursor, CppEditor::CppEditorWidget *editorWidget, - const DocumentUri &uri, Utils::LinkHandler &&callback, + const DocumentUri &uri, const Utils::LinkHandler &callback, bool openInSplit) : q(q), id(id), cursor(cursor), editorWidget(editorWidget), uri(uri), - callback(std::move(callback)), virtualFuncAssistProvider(q->d), + callback(callback), virtualFuncAssistProvider(q->d), docRevision(editorWidget ? editorWidget->textDocument()->document()->revision() : -1), openInSplit(openInSplit) {} @@ -418,9 +418,9 @@ class SwitchDeclDefData { public: SwitchDeclDefData(quint64 id, TextDocument *doc, const QTextCursor &cursor, CppEditor::CppEditorWidget *editorWidget, - Utils::LinkHandler &&callback) + const Utils::LinkHandler &callback) : id(id), document(doc), uri(DocumentUri::fromFilePath(doc->filePath())), - cursor(cursor), editorWidget(editorWidget), callback(std::move(callback)) {} + cursor(cursor), editorWidget(editorWidget), callback(callback) {} Utils::optional getFunctionNode() const { @@ -1726,7 +1726,7 @@ void ClangdClient::Private::finishSearch(const ReferencesData &refData, bool can void ClangdClient::followSymbol(TextDocument *document, const QTextCursor &cursor, CppEditor::CppEditorWidget *editorWidget, - Utils::LinkHandler &&callback, + const Utils::LinkHandler &callback, bool resolveTarget, bool openInSplit ) @@ -1735,7 +1735,7 @@ void ClangdClient::followSymbol(TextDocument *document, const QTextCursor adjustedCursor = d->adjustedCursor(cursor, document); if (!resolveTarget) { d->followSymbolData.reset(); - symbolSupport().findLinkAt(document, adjustedCursor, std::move(callback), false); + symbolSupport().findLinkAt(document, adjustedCursor, callback, false); return; } @@ -1743,7 +1743,7 @@ void ClangdClient::followSymbol(TextDocument *document, << adjustedCursor.blockNumber() << adjustedCursor.positionInBlock(); d->followSymbolData.emplace(this, ++d->nextJobId, adjustedCursor, editorWidget, DocumentUri::fromFilePath(document->filePath()), - std::move(callback), openInSplit); + callback, openInSplit); // Step 1: Follow the symbol via "Go to Definition". At the same time, request the // AST node corresponding to the cursor position, so we can find out whether @@ -1777,14 +1777,13 @@ void ClangdClient::followSymbol(TextDocument *document, void ClangdClient::switchDeclDef(TextDocument *document, const QTextCursor &cursor, CppEditor::CppEditorWidget *editorWidget, - Utils::LinkHandler &&callback) + const Utils::LinkHandler &callback) { QTC_ASSERT(documentOpen(document), openDocument(document)); qCDebug(clangdLog) << "switch decl/dev requested" << document->filePath() << cursor.blockNumber() << cursor.positionInBlock(); - d->switchDeclDefData.emplace(++d->nextJobId, document, cursor, editorWidget, - std::move(callback)); + d->switchDeclDefData.emplace(++d->nextJobId, document, cursor, editorWidget, callback); // Retrieve AST and document symbols. const auto astHandler = [this, id = d->switchDeclDefData->id](const ClangdAstNode &ast, diff --git a/src/plugins/clangcodemodel/clangdclient.h b/src/plugins/clangcodemodel/clangdclient.h index b2681a1cac7..b644749f469 100644 --- a/src/plugins/clangcodemodel/clangdclient.h +++ b/src/plugins/clangcodemodel/clangdclient.h @@ -70,14 +70,14 @@ public: void followSymbol(TextEditor::TextDocument *document, const QTextCursor &cursor, CppEditor::CppEditorWidget *editorWidget, - Utils::LinkHandler &&callback, + const Utils::LinkHandler &callback, bool resolveTarget, bool openInSplit); void switchDeclDef(TextEditor::TextDocument *document, const QTextCursor &cursor, CppEditor::CppEditorWidget *editorWidget, - Utils::LinkHandler &&callback); + const Utils::LinkHandler &callback); void switchHeaderSource(const Utils::FilePath &filePath, bool inNextSplit); void findLocalUsages(TextEditor::TextDocument *document, const QTextCursor &cursor, diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp index 572bfc93624..66ff519725b 100644 --- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp +++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp @@ -191,32 +191,31 @@ CppEditor::CppCompletionAssistProvider *ClangModelManagerSupport::functionHintAs } void ClangModelManagerSupport::followSymbol(const CppEditor::CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback, bool resolveTarget, + const Utils::LinkHandler &processLinkCallback, bool resolveTarget, bool inNextSplit) { if (ClangdClient * const client = clientForFile(data.filePath()); client && client->isFullyIndexed()) { client->followSymbol(data.textDocument(), data.cursor(), data.editorWidget(), - std::move(processLinkCallback), resolveTarget, inNextSplit); + processLinkCallback, resolveTarget, inNextSplit); return; } - CppModelManager::followSymbol(data, std::move(processLinkCallback), resolveTarget, inNextSplit, + CppModelManager::followSymbol(data, processLinkCallback, resolveTarget, inNextSplit, CppModelManager::Backend::Builtin); } void ClangModelManagerSupport::switchDeclDef(const CppEditor::CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback) + const Utils::LinkHandler &processLinkCallback) { if (ClangdClient * const client = clientForFile(data.filePath()); client && client->isFullyIndexed()) { client->switchDeclDef(data.textDocument(), data.cursor(), data.editorWidget(), - std::move(processLinkCallback)); + processLinkCallback); return; } - CppModelManager::switchDeclDef(data, std::move(processLinkCallback), - CppModelManager::Backend::Builtin); + CppModelManager::switchDeclDef(data, processLinkCallback, CppModelManager::Backend::Builtin); } void ClangModelManagerSupport::startLocalRenaming(const CppEditor::CursorInEditor &data, diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.h b/src/plugins/clangcodemodel/clangmodelmanagersupport.h index e1402d30706..01a4d7429ce 100644 --- a/src/plugins/clangcodemodel/clangmodelmanagersupport.h +++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.h @@ -80,10 +80,10 @@ signals: private: void followSymbol(const CppEditor::CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback, bool resolveTarget, + const Utils::LinkHandler &processLinkCallback, bool resolveTarget, bool inNextSplit) override; void switchDeclDef(const CppEditor::CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback) override; + const Utils::LinkHandler &processLinkCallback) override; void startLocalRenaming(const CppEditor::CursorInEditor &data, const CppEditor::ProjectPart *projectPart, CppEditor::RenameCallback &&renameSymbolsCallback) override; diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp index 3be75101d1e..7ca0c54f327 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp @@ -108,7 +108,7 @@ public: private: bool save(const QString &fileName = QString()); void findLinkAt(const QTextCursor &cursor, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, bool resolveTarget = true, bool inNextSplit = false) override; void contextMenuEvent(QContextMenuEvent *e) override; @@ -152,7 +152,7 @@ static QString unescape(const QString &s) } void CMakeEditorWidget::findLinkAt(const QTextCursor &cursor, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, bool/* resolveTarget*/, bool /*inNextSplit*/) { diff --git a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp index a4111c7867b..50e8387a232 100644 --- a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp +++ b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp @@ -140,20 +140,20 @@ std::unique_ptr BuiltinModelManagerSupport::createOvervie } void BuiltinModelManagerSupport::followSymbol(const CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, bool resolveTarget, bool inNextSplit) { SymbolFinder finder; - m_followSymbol->findLink(data, std::move(processLinkCallback), + m_followSymbol->findLink(data, processLinkCallback, resolveTarget, CppModelManager::instance()->snapshot(), data.editorWidget()->semanticInfo().doc, &finder, inNextSplit); } void BuiltinModelManagerSupport::switchDeclDef(const CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback) + const Utils::LinkHandler &processLinkCallback) { SymbolFinder finder; - m_followSymbol->switchDeclDef(data, std::move(processLinkCallback), + m_followSymbol->switchDeclDef(data, processLinkCallback, CppModelManager::instance()->snapshot(), data.editorWidget()->semanticInfo().doc, &finder); } diff --git a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h index c57ad860ed0..e6583cb09a0 100644 --- a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h +++ b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h @@ -51,10 +51,10 @@ public: FollowSymbolUnderCursor &followSymbolInterface() { return *m_followSymbol; } private: - void followSymbol(const CursorInEditor &data, Utils::LinkHandler &&processLinkCallback, + void followSymbol(const CursorInEditor &data, const Utils::LinkHandler &processLinkCallback, bool resolveTarget, bool inNextSplit) override; void switchDeclDef(const CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback) override; + const Utils::LinkHandler &processLinkCallback) override; void startLocalRenaming(const CursorInEditor &data, const ProjectPart *projectPart, RenameCallback &&renameSymbolsCallback) override; diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp index 185e907e904..1129e107444 100644 --- a/src/plugins/cppeditor/cppeditorwidget.cpp +++ b/src/plugins/cppeditor/cppeditorwidget.cpp @@ -889,7 +889,7 @@ void CppEditorWidget::switchDeclarationDefinition(bool inNextSplit) } void CppEditorWidget::findLinkAt(const QTextCursor &cursor, - LinkHandler &&processLinkCallback, + const LinkHandler &processLinkCallback, bool resolveTarget, bool inNextSplit) { @@ -903,7 +903,7 @@ void CppEditorWidget::findLinkAt(const QTextCursor &cursor, QTextCursor c(cursor); c.select(QTextCursor::WordUnderCursor); LinkHandler callbackWrapper = [start = c.selectionStart(), end = c.selectionEnd(), - doc = QPointer(cursor.document()), callback = std::move(processLinkCallback), + doc = QPointer(cursor.document()), callback = processLinkCallback, filePath](const Link &link) { const int linkPos = doc ? Text::positionInText(doc, link.targetLine, link.targetColumn + 1) : -1; @@ -927,7 +927,7 @@ void CppEditorWidget::findLinkAt(const QTextCursor &cursor, }; CppModelManager::followSymbol( CursorInEditor{cursor, filePath, this, textDocument()}, - std::move(callbackWrapper), + callbackWrapper, resolveTarget, inNextSplit); } diff --git a/src/plugins/cppeditor/cppeditorwidget.h b/src/plugins/cppeditor/cppeditorwidget.h index 2dcc85ca05a..5b27c4e4451 100644 --- a/src/plugins/cppeditor/cppeditorwidget.h +++ b/src/plugins/cppeditor/cppeditorwidget.h @@ -116,7 +116,7 @@ protected: bool handleStringSplitting(QKeyEvent *e) const; void findLinkAt(const QTextCursor &cursor, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, bool resolveTarget = true, bool inNextSplit = false) override; diff --git a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp index 346f58086f5..23a377bc1d0 100644 --- a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp +++ b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp @@ -492,7 +492,7 @@ static int skipMatchingParentheses(const Tokens &tokens, int idx, int initialDep void FollowSymbolUnderCursor::findLink( const CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, bool resolveTarget, const Snapshot &theSnapshot, const Document::Ptr &documentFromSemanticInfo, @@ -803,7 +803,7 @@ void FollowSymbolUnderCursor::findLink( void FollowSymbolUnderCursor::switchDeclDef( const CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, const CPlusPlus::Snapshot &snapshot, const CPlusPlus::Document::Ptr &documentFromSemanticInfo, SymbolFinder *symbolFinder) diff --git a/src/plugins/cppeditor/cppfollowsymbolundercursor.h b/src/plugins/cppeditor/cppfollowsymbolundercursor.h index 0f3b6376e2d..d5780d948ec 100644 --- a/src/plugins/cppeditor/cppfollowsymbolundercursor.h +++ b/src/plugins/cppeditor/cppfollowsymbolundercursor.h @@ -42,7 +42,7 @@ public: FollowSymbolUnderCursor(); void findLink(const CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, bool resolveTarget, const CPlusPlus::Snapshot &snapshot, const CPlusPlus::Document::Ptr &documentFromSemanticInfo, @@ -50,7 +50,7 @@ public: bool inNextSplit); void switchDeclDef(const CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, const CPlusPlus::Snapshot &snapshot, const CPlusPlus::Document::Ptr &documentFromSemanticInfo, SymbolFinder *symbolFinder); diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp index 1cd0621eaba..6afbe669e60 100644 --- a/src/plugins/cppeditor/cppmodelmanager.cpp +++ b/src/plugins/cppeditor/cppmodelmanager.cpp @@ -1631,18 +1631,18 @@ TextEditor::BaseHoverHandler *CppModelManager::createHoverHandler() const } void CppModelManager::followSymbol(const CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, bool resolveTarget, bool inNextSplit, Backend backend) { - instance()->modelManagerSupport(backend)->followSymbol(data, std::move(processLinkCallback), + instance()->modelManagerSupport(backend)->followSymbol(data, processLinkCallback, resolveTarget, inNextSplit); } void CppModelManager::switchDeclDef(const CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, Backend backend) { - instance()->modelManagerSupport(backend)->switchDeclDef(data, std::move(processLinkCallback)); + instance()->modelManagerSupport(backend)->switchDeclDef(data, processLinkCallback); } Core::ILocatorFilter *CppModelManager::createAuxiliaryCurrentDocumentFilter() diff --git a/src/plugins/cppeditor/cppmodelmanager.h b/src/plugins/cppeditor/cppmodelmanager.h index 0ca1a0d191c..0177d43d5b7 100644 --- a/src/plugins/cppeditor/cppmodelmanager.h +++ b/src/plugins/cppeditor/cppmodelmanager.h @@ -170,10 +170,10 @@ public: enum class Backend { Builtin, Best }; static void followSymbol(const CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, bool resolveTarget, bool inNextSplit, Backend backend = Backend::Best); static void switchDeclDef(const CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, Backend backend = Backend::Best); static void startLocalRenaming(const CursorInEditor &data, const ProjectPart *projectPart, RenameCallback &&renameSymbolsCallback, diff --git a/src/plugins/cppeditor/cppmodelmanagersupport.h b/src/plugins/cppeditor/cppmodelmanagersupport.h index 49f3470bc9e..5be236c5d52 100644 --- a/src/plugins/cppeditor/cppmodelmanagersupport.h +++ b/src/plugins/cppeditor/cppmodelmanagersupport.h @@ -65,10 +65,10 @@ public: virtual bool usesClangd(const TextEditor::TextDocument *) const { return false; } virtual void followSymbol(const CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, bool resolveTarget, bool inNextSplit) = 0; virtual void switchDeclDef(const CursorInEditor &data, - Utils::LinkHandler &&processLinkCallback) = 0; + const Utils::LinkHandler &processLinkCallback) = 0; virtual void startLocalRenaming(const CursorInEditor &data, const ProjectPart *projectPart, RenameCallback &&renameSymbolsCallback) = 0; diff --git a/src/plugins/languageclient/languageclientmanager.cpp b/src/plugins/languageclient/languageclientmanager.cpp index 8352ee678fd..0c5872486c5 100644 --- a/src/plugins/languageclient/languageclientmanager.cpp +++ b/src/plugins/languageclient/languageclientmanager.cpp @@ -456,7 +456,7 @@ void LanguageClientManager::editorOpened(Core::IEditor *editor) if (TextEditorWidget *widget = textEditor->editorWidget()) { connect(widget, &TextEditorWidget::requestLinkAt, this, [document = textEditor->textDocument()] - (const QTextCursor &cursor, Utils::LinkHandler &callback, bool resolveTarget) { + (const QTextCursor &cursor, const Utils::LinkHandler &callback, bool resolveTarget) { if (auto client = clientForDocument(document)) client->symbolSupport().findLinkAt(document, cursor, callback, resolveTarget); }); diff --git a/src/plugins/nim/editor/nimtexteditorwidget.cpp b/src/plugins/nim/editor/nimtexteditorwidget.cpp index 73e06a1d31c..8f0c517ac71 100644 --- a/src/plugins/nim/editor/nimtexteditorwidget.cpp +++ b/src/plugins/nim/editor/nimtexteditorwidget.cpp @@ -60,7 +60,7 @@ NimTextEditorWidget::NimTextEditorWidget(QWidget *parent) setLanguageSettingsId(Nim::Constants::C_NIMLANGUAGE_ID); } -void NimTextEditorWidget::findLinkAt(const QTextCursor &c, Utils::LinkHandler &&processLinkCallback, bool /*resolveTarget*/, bool /*inNextSplit*/) +void NimTextEditorWidget::findLinkAt(const QTextCursor &c, const Utils::LinkHandler &processLinkCallback, bool /*resolveTarget*/, bool /*inNextSplit*/) { const Utils::FilePath &path = textDocument()->filePath(); @@ -90,7 +90,7 @@ void NimTextEditorWidget::findLinkAt(const QTextCursor &c, Utils::LinkHandler && m_callback(Utils::Link()); m_dirtyFile = std::move(dirtyFile); - m_callback = std::move(processLinkCallback); + m_callback = processLinkCallback; m_request = std::move(request); QObject::connect(m_request.get(), &NimSuggestClientRequest::finished, this, &NimTextEditorWidget::onFindLinkFinished); diff --git a/src/plugins/nim/editor/nimtexteditorwidget.h b/src/plugins/nim/editor/nimtexteditorwidget.h index dede2d3205b..097e81507ca 100644 --- a/src/plugins/nim/editor/nimtexteditorwidget.h +++ b/src/plugins/nim/editor/nimtexteditorwidget.h @@ -36,7 +36,7 @@ public: NimTextEditorWidget(QWidget* parent = nullptr); protected: - void findLinkAt(const QTextCursor &, Utils::LinkHandler &&processLinkCallback, bool resolveTarget, bool inNextSplit); + void findLinkAt(const QTextCursor &, const Utils::LinkHandler &processLinkCallback, bool resolveTarget, bool inNextSplit); private: void onFindLinkFinished(); diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp index fc393bb3e0e..ecb3bfbda78 100644 --- a/src/plugins/qmakeprojectmanager/profileeditor.cpp +++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp @@ -62,7 +62,7 @@ class ProFileEditorWidget : public TextEditorWidget { private: void findLinkAt(const QTextCursor &, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, bool resolveTarget = true, bool inNextSplit = false) override; void contextMenuEvent(QContextMenuEvent *) override; @@ -125,7 +125,7 @@ QString ProFileEditorWidget::checkForPrfFile(const QString &baseName) const } void ProFileEditorWidget::findLinkAt(const QTextCursor &cursor, - Utils::LinkHandler &&processLinkCallback, + const LinkHandler &processLinkCallback, bool /*resolveTarget*/, bool /*inNextSplit*/) { diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 42e9d31f21e..894e0be8d99 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -753,7 +753,7 @@ void QmlJSEditorWidget::inspectElementUnderCursor() const } void QmlJSEditorWidget::findLinkAt(const QTextCursor &cursor, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, bool /*resolveTarget*/, bool /*inNextSplit*/) { diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h index a1b30ee16c3..03e0796fe0e 100644 --- a/src/plugins/qmljseditor/qmljseditor.h +++ b/src/plugins/qmljseditor/qmljseditor.h @@ -102,7 +102,7 @@ protected: void applyFontSettings() override; void createToolBar(); void findLinkAt(const QTextCursor &cursor, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, bool resolveTarget = true, bool inNextSplit = false) override; QString foldReplacementText(const QTextBlock &block) const override; diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 2e5b2c6f6f7..8d0441f47dd 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -6081,7 +6081,7 @@ void TextEditorWidget::zoomReset() } void TextEditorWidget::findLinkAt(const QTextCursor &cursor, - Utils::LinkHandler &&callback, + const Utils::LinkHandler &callback, bool resolveTarget, bool inNextSplit) { diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h index c15a852bb97..b29b69b9ccf 100644 --- a/src/plugins/texteditor/texteditor.h +++ b/src/plugins/texteditor/texteditor.h @@ -496,7 +496,7 @@ signals: void requestBlockUpdate(const QTextBlock &); - void requestLinkAt(const QTextCursor &cursor, Utils::LinkHandler &callback, + void requestLinkAt(const QTextCursor &cursor, const Utils::LinkHandler &callback, bool resolveTarget, bool inNextSplit); void requestUsages(const QTextCursor &cursor); void requestRename(const QTextCursor &cursor); @@ -582,7 +582,7 @@ protected: (it isn't until the link is used). */ virtual void findLinkAt(const QTextCursor &, - Utils::LinkHandler &&processLinkCallback, + const Utils::LinkHandler &processLinkCallback, bool resolveTarget = true, bool inNextSplit = false);