forked from qt-creator/qt-creator
Add override keyword to IEditor & TextEditorWidget implementations
Change-Id: I403101d788d9edfea5c5c9440ab4f39ad00e81f7 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
@@ -93,17 +93,17 @@ class DescriptionEditorWidget : public TextEditorWidget
|
||||
Q_OBJECT
|
||||
public:
|
||||
DescriptionEditorWidget(QWidget *parent = 0);
|
||||
virtual QSize sizeHint() const;
|
||||
virtual QSize sizeHint() const override;
|
||||
|
||||
signals:
|
||||
void requestBranchList();
|
||||
|
||||
protected:
|
||||
void mouseMoveEvent(QMouseEvent *e);
|
||||
void mouseReleaseEvent(QMouseEvent *e);
|
||||
void mouseMoveEvent(QMouseEvent *e) override;
|
||||
void mouseReleaseEvent(QMouseEvent *e) override;
|
||||
|
||||
void setDisplaySettings(const DisplaySettings &ds);
|
||||
void setMarginSettings(const MarginSettings &ms);
|
||||
void setDisplaySettings(const DisplaySettings &ds) override;
|
||||
void setMarginSettings(const MarginSettings &ms) override;
|
||||
|
||||
bool findContentsUnderCursor(const QTextCursor &cursor);
|
||||
void highlightCurrentContents();
|
||||
|
||||
@@ -60,16 +60,16 @@ class DiffEditor : public Core::IEditor
|
||||
|
||||
public:
|
||||
DiffEditor(DiffEditorDocument *doc);
|
||||
~DiffEditor();
|
||||
~DiffEditor() override;
|
||||
|
||||
Core::IEditor *duplicate();
|
||||
Core::IEditor *duplicate() override;
|
||||
|
||||
bool open(QString *errorString,
|
||||
const QString &fileName,
|
||||
const QString &realFileName);
|
||||
Core::IDocument *document();
|
||||
const QString &realFileName) override;
|
||||
Core::IDocument *document() override;
|
||||
|
||||
QWidget *toolBar();
|
||||
QWidget *toolBar() override;
|
||||
|
||||
private slots:
|
||||
void documentHasChanged();
|
||||
|
||||
@@ -53,7 +53,7 @@ class SelectableTextEditorWidget : public TextEditor::TextEditorWidget
|
||||
Q_OBJECT
|
||||
public:
|
||||
SelectableTextEditorWidget(Core::Id id, QWidget *parent = 0);
|
||||
~SelectableTextEditorWidget();
|
||||
~SelectableTextEditorWidget() override;
|
||||
void setSelections(const QMap<int, QList<DiffSelection> > &selections);
|
||||
|
||||
private:
|
||||
@@ -61,7 +61,7 @@ private:
|
||||
const QTextBlock &block,
|
||||
const QPointF &offset,
|
||||
const QVector<QTextLayout::FormatRange> &selections,
|
||||
const QRect &clipRect) const;
|
||||
const QRect &clipRect) const override;
|
||||
|
||||
// block number, list of ranges
|
||||
// DiffSelection.start - can be -1 (continues from the previous line)
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -74,13 +74,13 @@ signals:
|
||||
void currentDiffFileIndexChanged(int index);
|
||||
|
||||
public slots:
|
||||
void setDisplaySettings(const TextEditor::DisplaySettings &ds);
|
||||
void setDisplaySettings(const TextEditor::DisplaySettings &ds) override;
|
||||
|
||||
protected:
|
||||
void mouseDoubleClickEvent(QMouseEvent *e);
|
||||
void contextMenuEvent(QContextMenuEvent *e);
|
||||
QString lineNumber(int blockNumber) const;
|
||||
int lineNumberDigits() const;
|
||||
void mouseDoubleClickEvent(QMouseEvent *e) override;
|
||||
void contextMenuEvent(QContextMenuEvent *e) override;
|
||||
QString lineNumber(int blockNumber) const override;
|
||||
int lineNumberDigits() const override;
|
||||
|
||||
private slots:
|
||||
void setFontSettings(const TextEditor::FontSettings &fontSettings);
|
||||
|
||||
Reference in New Issue
Block a user