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

26
src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
View File

@@ -104,7 +104,7 @@ public:
void restoreState();
public slots:
void setDisplaySettings(const DisplaySettings &ds);
void setDisplaySettings(const DisplaySettings &ds) override;
signals:
void jumpToOriginalFileRequested(int diffFileIndex,
@@ -115,21 +115,21 @@ signals:
int chunkIndex);
protected:
virtual int extraAreaWidth(int *markWidthPtr = 0) const {
int extraAreaWidth(int *markWidthPtr = 0) const override {
return SelectableTextEditorWidget::extraAreaWidth(markWidthPtr);
}
void applyFontSettings();
void applyFontSettings() override;
virtual QString lineNumber(int blockNumber) const;
virtual int lineNumberDigits() const;
virtual bool selectionVisible(int blockNumber) const;
virtual bool replacementVisible(int blockNumber) const;
QColor replacementPenColor(int blockNumber) const;
virtual QString plainTextFromSelection(const QTextCursor &cursor) const;
void mouseDoubleClickEvent(QMouseEvent *e);
void contextMenuEvent(QContextMenuEvent *e);
virtual void paintEvent(QPaintEvent *e);
virtual void scrollContentsBy(int dx, int dy);
QString lineNumber(int blockNumber) const override;
int lineNumberDigits() const override;
bool selectionVisible(int blockNumber) const override;
bool replacementVisible(int blockNumber) const override;
QColor replacementPenColor(int blockNumber) const override;
QString plainTextFromSelection(const QTextCursor &cursor) const override;
void mouseDoubleClickEvent(QMouseEvent *e) override;
void contextMenuEvent(QContextMenuEvent *e) override;
void paintEvent(QPaintEvent *e) override;
void scrollContentsBy(int dx, int dy) override;
private:
void paintSeparator(QPainter &painter, QColor &color, const QString &text,