From 31b8fbbcbf71d0327fe7472dd7ac75605960952b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Fri, 4 Oct 2013 09:33:22 +0200
Subject: [PATCH] Fix MSVC-warnings in CppEditor.
cppfollowsymbolundercursor.cpp(174) : warning C4100: 'widget' :
unreferenced parameter
cppvirtualfunctionassistprovider.cpp(61) : warning C4138: '*/' found
outside of comment
Change-Id: I9c14aff54b88daa6eda9a217db2fc314e9f07742
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
---
src/plugins/cppeditor/cppfollowsymbolundercursor.cpp | 4 ++--
src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
index 22daa89d837..026b5c2e452 100644
--- a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
+++ b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
@@ -171,7 +171,7 @@ inline LookupItem skipForwardDeclarations(const QList<LookupItem> &resolvedSymbo
}
CPPEditorWidget::Link attemptFuncDeclDef(const QTextCursor &cursor,
- CPPEditorWidget *widget, CPlusPlus::Snapshot snapshot, const CPlusPlus::Document::Ptr &document,
+ CPPEditorWidget *, CPlusPlus::Snapshot snapshot, const CPlusPlus::Document::Ptr &document,
SymbolFinder *symbolFinder)
{
snapshot.insert(document);
@@ -228,7 +228,7 @@ CPPEditorWidget::Link attemptFuncDeclDef(const QTextCursor &cursor,
}
if (target) {
- result = widget->linkToSymbol(target);
+ result = CPPEditorWidget::linkToSymbol(target);
unsigned startLine, startColumn, endLine, endColumn;
document->translationUnit()->getTokenStartPosition(name->firstToken(), &startLine,
diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
index 3cbb4f99dff..4e8b1f3d790 100644
--- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
+++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
@@ -58,7 +58,7 @@ public:
VirtualFunctionProposalItem(const BaseTextEditorWidget::Link &link, bool openInSplit = true)
: m_link(link), m_openInSplit(openInSplit) {}
- void apply(BaseTextEditor */*editor*/, int /*basePosition*/) const
+ void apply(BaseTextEditor * /* editor */, int /* basePosition */) const
{
if (!m_link.hasValidTarget())
return;
--
GitLab