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

Add override keyword to IEditor & TextEditorWidget implementations

Browse Source 
Change-Id: I403101d788d9edfea5c5c9440ab4f39ad00e81f7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-06-01 17:55:31 +02:00
parent 686def2dc2
commit e00aa54f4e
32 changed files with 161 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/qmljseditor/qmljseditor.h
View File

@@ -67,14 +67,14 @@ class QmlJSEditorWidget : public TextEditor::TextEditorWidget
public:
QmlJSEditorWidget();
void finalizeInitialization();
void finalizeInitialization() override;
QmlJSEditorDocument *qmlJsEditorDocument() const;
QModelIndex outlineModelIndex();
TextEditor::AssistInterface *createAssistInterface(TextEditor::AssistKind assistKind,
TextEditor::AssistReason reason) const;
TextEditor::AssistReason reason) const override;
void inspectElementUnderCursor() const;
@@ -103,18 +103,18 @@ private slots:
void updateCodeWarnings(QmlJS::Document::Ptr doc);
protected:
void contextMenuEvent(QContextMenuEvent *e);
bool event(QEvent *e);
void wheelEvent(QWheelEvent *event);
void resizeEvent(QResizeEvent *event);
void scrollContentsBy(int dx, int dy);
void applyFontSettings();
void contextMenuEvent(QContextMenuEvent *e) override;
bool event(QEvent *e) override;
void wheelEvent(QWheelEvent *event) override;
void resizeEvent(QResizeEvent *event) override;
void scrollContentsBy(int dx, int dy) override;
void applyFontSettings() override;
void createToolBar();
TextEditor::TextEditorWidget::Link findLinkAt(const QTextCursor &cursor,
bool resolveTarget = true,
bool inNextSplit = false);
QString foldReplacementText(const QTextBlock &block) const;
void onRefactorMarkerClicked(const TextEditor::RefactorMarker &marker);
bool inNextSplit = false) override;
QString foldReplacementText(const QTextBlock &block) const override;
void onRefactorMarkerClicked(const TextEditor::RefactorMarker &marker) override;
private:
bool isClosingBrace(const QList<QmlJS::Token> &tokens) const;
@@ -151,7 +151,7 @@ class QmlJSEditor : public TextEditor::BaseTextEditor
public:
QmlJSEditor();
bool isDesignModePreferred() const;
bool isDesignModePreferred() const override;
};
class QmlJSEditorFactory : public TextEditor::TextEditorFactory