feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Cleanup some redundant virtual keywords

Browse Source 
Change-Id: Ic6157a1d780551977ffbb65ba4fc374a40e95662
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Orgad Shaneh
2014-02-15 20:34:01 +02:00
committed by Orgad Shaneh
parent 10fa9c5c77
commit 9f06081a0a
5 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
View File

@@ -100,8 +100,7 @@ public:
, m_openInSplit(openInSplit) , m_openInSplit(openInSplit)
{} {}
bool isFragile() const bool isFragile() const { return true; }
{ return true; }
IAssistProposalWidget *createWidget() const IAssistProposalWidget *createWidget() const
{ return new VirtualFunctionProposalWidget(m_openInSplit); } { return new VirtualFunctionProposalWidget(m_openInSplit); }

4
src/plugins/cpptools/cppcompletionassist.cpp
View File

@@ -452,8 +452,8 @@ public:
, m_replaceDotForArrow(static_cast<CppAssistProposalModel *>(model)->m_replaceDotForArrow) , m_replaceDotForArrow(static_cast<CppAssistProposalModel *>(model)->m_replaceDotForArrow)
{} {}
virtual bool isCorrective() const { return m_replaceDotForArrow; } bool isCorrective() const { return m_replaceDotForArrow; }
virtual void makeCorrection(BaseTextEditor *editor); void makeCorrection(BaseTextEditor *editor);
private: private:
bool m_replaceDotForArrow; bool m_replaceDotForArrow;

12
src/plugins/texteditor/codeassist/functionhintproposal.h
View File

@@ -42,12 +42,12 @@ public:
FunctionHintProposal(int cursorPos, IFunctionHintProposalModel *model); FunctionHintProposal(int cursorPos, IFunctionHintProposalModel *model);
virtual ~FunctionHintProposal(); virtual ~FunctionHintProposal();
virtual bool isFragile() const; bool isFragile() const;
virtual int basePosition() const; int basePosition() const;
virtual bool isCorrective() const; bool isCorrective() const;
virtual void makeCorrection(BaseTextEditor *editor); void makeCorrection(BaseTextEditor *editor);
virtual IAssistProposalModel *model() const; IAssistProposalModel *model() const;
virtual IAssistProposalWidget *createWidget() const; IAssistProposalWidget *createWidget() const;
private: private:
int m_basePosition; int m_basePosition;

14
src/plugins/texteditor/codeassist/genericproposal.h
View File

@@ -40,14 +40,14 @@ class TEXTEDITOR_EXPORT GenericProposal : public IAssistProposal
{ {
public: public:
GenericProposal(int cursorPos, IGenericProposalModel *model); GenericProposal(int cursorPos, IGenericProposalModel *model);
virtual ~GenericProposal(); ~GenericProposal();
virtual bool isFragile() const; bool isFragile() const;
virtual int basePosition() const; int basePosition() const;
virtual bool isCorrective() const; bool isCorrective() const;
virtual void makeCorrection(BaseTextEditor *editor); void makeCorrection(BaseTextEditor *editor);
virtual IAssistProposalModel *model() const; IAssistProposalModel *model() const;
virtual IAssistProposalWidget *createWidget() const; IAssistProposalWidget *createWidget() const;
protected: protected:
void moveBasePosition(int length); void moveBasePosition(int length);

24
src/plugins/texteditor/codeassist/genericproposalwidget.h
View File

@@ -45,19 +45,19 @@ class TEXTEDITOR_EXPORT GenericProposalWidget : public IAssistProposalWidget
public: public:
GenericProposalWidget(); GenericProposalWidget();
virtual ~GenericProposalWidget(); ~GenericProposalWidget();
virtual void setAssistant(CodeAssistant *assistant); void setAssistant(CodeAssistant *assistant);
virtual void setReason(AssistReason reason); void setReason(AssistReason reason);
virtual void setKind(AssistKind kind); void setKind(AssistKind kind);
virtual void setUnderlyingWidget(const QWidget *underlyingWidget); void setUnderlyingWidget(const QWidget *underlyingWidget);
virtual void setModel(IAssistProposalModel *model); void setModel(IAssistProposalModel *model);
virtual void setDisplayRect(const QRect &rect); void setDisplayRect(const QRect &rect);
virtual void setIsSynchronized(bool isSync); void setIsSynchronized(bool isSync);
virtual void showProposal(const QString &prefix); void showProposal(const QString &prefix);
virtual void updateProposal(const QString &prefix); void updateProposal(const QString &prefix);
virtual void closeProposal(); void closeProposal();
private: private:
bool updateAndCheck(const QString &prefix); bool updateAndCheck(const QString &prefix);
@@ -70,7 +70,7 @@ private slots:
void turnOnAutoWidth(); void turnOnAutoWidth();
protected: protected:
virtual bool eventFilter(QObject *o, QEvent *e); bool eventFilter(QObject *o, QEvent *e);
bool activateCurrentProposalItem(); bool activateCurrentProposalItem();
private: private: