diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp index c014aee1267..3b06d63b6da 100644 --- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp +++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp @@ -100,8 +100,7 @@ public: , m_openInSplit(openInSplit) {} - bool isFragile() const - { return true; } + bool isFragile() const { return true; } IAssistProposalWidget *createWidget() const { return new VirtualFunctionProposalWidget(m_openInSplit); } diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp index 83872f48b4d..0dcd634b7e8 100644 --- a/src/plugins/cpptools/cppcompletionassist.cpp +++ b/src/plugins/cpptools/cppcompletionassist.cpp @@ -452,8 +452,8 @@ public: , m_replaceDotForArrow(static_cast(model)->m_replaceDotForArrow) {} - virtual bool isCorrective() const { return m_replaceDotForArrow; } - virtual void makeCorrection(BaseTextEditor *editor); + bool isCorrective() const { return m_replaceDotForArrow; } + void makeCorrection(BaseTextEditor *editor); private: bool m_replaceDotForArrow; diff --git a/src/plugins/texteditor/codeassist/functionhintproposal.h b/src/plugins/texteditor/codeassist/functionhintproposal.h index 4326ffd8469..2cc1753832f 100644 --- a/src/plugins/texteditor/codeassist/functionhintproposal.h +++ b/src/plugins/texteditor/codeassist/functionhintproposal.h @@ -42,12 +42,12 @@ public: FunctionHintProposal(int cursorPos, IFunctionHintProposalModel *model); virtual ~FunctionHintProposal(); - virtual bool isFragile() const; - virtual int basePosition() const; - virtual bool isCorrective() const; - virtual void makeCorrection(BaseTextEditor *editor); - virtual IAssistProposalModel *model() const; - virtual IAssistProposalWidget *createWidget() const; + bool isFragile() const; + int basePosition() const; + bool isCorrective() const; + void makeCorrection(BaseTextEditor *editor); + IAssistProposalModel *model() const; + IAssistProposalWidget *createWidget() const; private: int m_basePosition; diff --git a/src/plugins/texteditor/codeassist/genericproposal.h b/src/plugins/texteditor/codeassist/genericproposal.h index c0ed0390562..f21af1f04c1 100644 --- a/src/plugins/texteditor/codeassist/genericproposal.h +++ b/src/plugins/texteditor/codeassist/genericproposal.h @@ -40,14 +40,14 @@ class TEXTEDITOR_EXPORT GenericProposal : public IAssistProposal { public: GenericProposal(int cursorPos, IGenericProposalModel *model); - virtual ~GenericProposal(); + ~GenericProposal(); - virtual bool isFragile() const; - virtual int basePosition() const; - virtual bool isCorrective() const; - virtual void makeCorrection(BaseTextEditor *editor); - virtual IAssistProposalModel *model() const; - virtual IAssistProposalWidget *createWidget() const; + bool isFragile() const; + int basePosition() const; + bool isCorrective() const; + void makeCorrection(BaseTextEditor *editor); + IAssistProposalModel *model() const; + IAssistProposalWidget *createWidget() const; protected: void moveBasePosition(int length); diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.h b/src/plugins/texteditor/codeassist/genericproposalwidget.h index 0d625dc478f..6d5b584a788 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.h +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.h @@ -45,19 +45,19 @@ class TEXTEDITOR_EXPORT GenericProposalWidget : public IAssistProposalWidget public: GenericProposalWidget(); - virtual ~GenericProposalWidget(); + ~GenericProposalWidget(); - virtual void setAssistant(CodeAssistant *assistant); - virtual void setReason(AssistReason reason); - virtual void setKind(AssistKind kind); - virtual void setUnderlyingWidget(const QWidget *underlyingWidget); - virtual void setModel(IAssistProposalModel *model); - virtual void setDisplayRect(const QRect &rect); - virtual void setIsSynchronized(bool isSync); + void setAssistant(CodeAssistant *assistant); + void setReason(AssistReason reason); + void setKind(AssistKind kind); + void setUnderlyingWidget(const QWidget *underlyingWidget); + void setModel(IAssistProposalModel *model); + void setDisplayRect(const QRect &rect); + void setIsSynchronized(bool isSync); - virtual void showProposal(const QString &prefix); - virtual void updateProposal(const QString &prefix); - virtual void closeProposal(); + void showProposal(const QString &prefix); + void updateProposal(const QString &prefix); + void closeProposal(); private: bool updateAndCheck(const QString &prefix); @@ -70,7 +70,7 @@ private slots: void turnOnAutoWidth(); protected: - virtual bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(QObject *o, QEvent *e); bool activateCurrentProposalItem(); private: