aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolai Kosjar <[email protected]>2015-11-30 09:59:52 +0100
committerNikolai Kosjar <[email protected]>2015-12-01 12:07:57 +0000
commita5a08647417af4cfc0e79bfc27ec4e28bc642174 (patch)
treeef857ffebd0392a63cdf863f7f0dc56cebba0841
parentd579608e8a74c2179d44192556cf0b9debe817a4 (diff)
Clang: Fix warnings about unused members
Remove the unused members and remove also ClangAssistProposalModel::[m_]replaceDotForArrow, which is a needled indirection. Change-Id: If6e0f65678b05fabd5fa16823a7a4c634b9fbdef Reviewed-by: Marco Bubke <[email protected]>
-rw-r--r--src/plugins/clangcodemodel/clangassistproposal.cpp2
-rw-r--r--src/plugins/clangcodemodel/clangassistproposal.h3
-rw-r--r--src/plugins/clangcodemodel/clangassistproposalmodel.cpp7
-rw-r--r--src/plugins/clangcodemodel/clangassistproposalmodel.h13
4 files changed, 1 insertions, 24 deletions
diff --git a/src/plugins/clangcodemodel/clangassistproposal.cpp b/src/plugins/clangcodemodel/clangassistproposal.cpp
index 4bb34a97c1d..6904f9abfcb 100644
--- a/src/plugins/clangcodemodel/clangassistproposal.cpp
+++ b/src/plugins/clangcodemodel/clangassistproposal.cpp
@@ -42,7 +42,7 @@ ClangAssistProposal::ClangAssistProposal(int cursorPos, TextEditor::GenericPropo
bool ClangAssistProposal::isCorrective() const
{
- return ClangAssistProposalModel::replaceDotForArrow(model());
+ return false;
}
void ClangAssistProposal::makeCorrection(TextEditor::TextEditorWidget *editorWidget)
diff --git a/src/plugins/clangcodemodel/clangassistproposal.h b/src/plugins/clangcodemodel/clangassistproposal.h
index 6a0ada3d79e..198f7397422 100644
--- a/src/plugins/clangcodemodel/clangassistproposal.h
+++ b/src/plugins/clangcodemodel/clangassistproposal.h
@@ -45,9 +45,6 @@ public:
virtual bool isCorrective() const;
virtual void makeCorrection(TextEditor::TextEditorWidget *editorWidget);
-
-private:
- bool m_replaceDotForArrow;
};
} // namespace Internal
diff --git a/src/plugins/clangcodemodel/clangassistproposalmodel.cpp b/src/plugins/clangcodemodel/clangassistproposalmodel.cpp
index b07b2eb42e4..d4085b39298 100644
--- a/src/plugins/clangcodemodel/clangassistproposalmodel.cpp
+++ b/src/plugins/clangcodemodel/clangassistproposalmodel.cpp
@@ -39,13 +39,6 @@
namespace ClangCodeModel {
namespace Internal {
-bool ClangAssistProposalModel::replaceDotForArrow(TextEditor::IAssistProposalModel *model)
-{
- auto clangAssistProposalModel = static_cast<ClangAssistProposalModel*>(model);
-
- return clangAssistProposalModel->m_replaceDotForArrow;
-}
-
bool ClangAssistProposalModel::isSortable(const QString &/*prefix*/) const
{
return true;
diff --git a/src/plugins/clangcodemodel/clangassistproposalmodel.h b/src/plugins/clangcodemodel/clangassistproposalmodel.h
index 408ee990ebd..5f7b1f502a0 100644
--- a/src/plugins/clangcodemodel/clangassistproposalmodel.h
+++ b/src/plugins/clangcodemodel/clangassistproposalmodel.h
@@ -41,21 +41,8 @@ namespace Internal {
class ClangAssistProposalModel : public TextEditor::GenericProposalModel
{
public:
- ClangAssistProposalModel()
- : m_sortable(false)
- , m_completionOperator(CPlusPlus::T_EOF_SYMBOL)
- , m_replaceDotForArrow(false)
- {}
-
bool isSortable(const QString &prefix) const override;
void sort(const QString &prefix) override;
-
- static bool replaceDotForArrow(IAssistProposalModel *model);
-
-private:
- bool m_sortable;
- unsigned m_completionOperator;
- bool m_replaceDotForArrow;
};
} // namespace Internal