diff options
Diffstat (limited to 'src/widgets/widgets/qplaintextedit.h')
-rw-r--r-- | src/widgets/widgets/qplaintextedit.h | 67 |
1 files changed, 34 insertions, 33 deletions
diff --git a/src/widgets/widgets/qplaintextedit.h b/src/widgets/widgets/qplaintextedit.h index cd25b45d50..34ec96715e 100644 --- a/src/widgets/widgets/qplaintextedit.h +++ b/src/widgets/widgets/qplaintextedit.h @@ -91,8 +91,8 @@ public: }; Q_ENUM(LineWrapMode) - explicit QPlainTextEdit(QWidget *parent = Q_NULLPTR); - explicit QPlainTextEdit(const QString &text, QWidget *parent = Q_NULLPTR); + explicit QPlainTextEdit(QWidget *parent = nullptr); + explicit QPlainTextEdit(const QString &text, QWidget *parent = nullptr); virtual ~QPlainTextEdit(); void setDocument(QTextDocument *document); @@ -191,7 +191,7 @@ public: void print(QPagedPaintDevice *printer) const; int blockCount() const; - QVariant inputMethodQuery(Qt::InputMethodQuery property) const Q_DECL_OVERRIDE; + QVariant inputMethodQuery(Qt::InputMethodQuery property) const override; Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; public Q_SLOTS: @@ -233,43 +233,43 @@ Q_SIGNALS: void modificationChanged(bool); protected: - virtual bool event(QEvent *e) Q_DECL_OVERRIDE; - virtual void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; - virtual void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - virtual void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - virtual void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; - virtual void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - virtual void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - virtual void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - virtual void mouseDoubleClickEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - virtual bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; + virtual bool event(QEvent *e) override; + virtual void timerEvent(QTimerEvent *e) override; + virtual void keyPressEvent(QKeyEvent *e) override; + virtual void keyReleaseEvent(QKeyEvent *e) override; + virtual void resizeEvent(QResizeEvent *e) override; + virtual void paintEvent(QPaintEvent *e) override; + virtual void mousePressEvent(QMouseEvent *e) override; + virtual void mouseMoveEvent(QMouseEvent *e) override; + virtual void mouseReleaseEvent(QMouseEvent *e) override; + virtual void mouseDoubleClickEvent(QMouseEvent *e) override; + virtual bool focusNextPrevChild(bool next) override; #ifndef QT_NO_CONTEXTMENU - virtual void contextMenuEvent(QContextMenuEvent *e) Q_DECL_OVERRIDE; + virtual void contextMenuEvent(QContextMenuEvent *e) override; #endif #ifndef QT_NO_DRAGANDDROP - virtual void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE; - virtual void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE; - virtual void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE; - virtual void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE; + virtual void dragEnterEvent(QDragEnterEvent *e) override; + virtual void dragLeaveEvent(QDragLeaveEvent *e) override; + virtual void dragMoveEvent(QDragMoveEvent *e) override; + virtual void dropEvent(QDropEvent *e) override; #endif - virtual void focusInEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - virtual void focusOutEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - virtual void showEvent(QShowEvent *) Q_DECL_OVERRIDE; - virtual void changeEvent(QEvent *e) Q_DECL_OVERRIDE; + virtual void focusInEvent(QFocusEvent *e) override; + virtual void focusOutEvent(QFocusEvent *e) override; + virtual void showEvent(QShowEvent *) override; + virtual void changeEvent(QEvent *e) override; #if QT_CONFIG(wheelevent) - virtual void wheelEvent(QWheelEvent *e) Q_DECL_OVERRIDE; + virtual void wheelEvent(QWheelEvent *e) override; #endif virtual QMimeData *createMimeDataFromSelection() const; virtual bool canInsertFromMimeData(const QMimeData *source) const; virtual void insertFromMimeData(const QMimeData *source); - virtual void inputMethodEvent(QInputMethodEvent *) Q_DECL_OVERRIDE; + virtual void inputMethodEvent(QInputMethodEvent *) override; QPlainTextEdit(QPlainTextEditPrivate &dd, QWidget *parent); - virtual void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + virtual void scrollContentsBy(int dx, int dy) override; virtual void doSetTextCursor(const QTextCursor &cursor); QTextBlock firstVisibleBlock() const; @@ -283,6 +283,7 @@ protected: private: Q_DISABLE_COPY(QPlainTextEdit) Q_PRIVATE_SLOT(d_func(), void _q_repaintContents(const QRectF &r)) + Q_PRIVATE_SLOT(d_func(), void _q_textChanged()) Q_PRIVATE_SLOT(d_func(), void _q_adjustScrollbars()) Q_PRIVATE_SLOT(d_func(), void _q_verticalScrollbarActionTriggered(int)) Q_PRIVATE_SLOT(d_func(), void _q_cursorPositionChanged()) @@ -302,14 +303,14 @@ public: QPlainTextDocumentLayout(QTextDocument *document); ~QPlainTextDocumentLayout(); - void draw(QPainter *, const PaintContext &) Q_DECL_OVERRIDE; - int hitTest(const QPointF &, Qt::HitTestAccuracy ) const Q_DECL_OVERRIDE; + void draw(QPainter *, const PaintContext &) override; + int hitTest(const QPointF &, Qt::HitTestAccuracy ) const override; - int pageCount() const Q_DECL_OVERRIDE; - QSizeF documentSize() const Q_DECL_OVERRIDE; + int pageCount() const override; + QSizeF documentSize() const override; - QRectF frameBoundingRect(QTextFrame *) const Q_DECL_OVERRIDE; - QRectF blockBoundingRect(const QTextBlock &block) const Q_DECL_OVERRIDE; + QRectF frameBoundingRect(QTextFrame *) const override; + QRectF blockBoundingRect(const QTextBlock &block) const override; void ensureBlockLayout(const QTextBlock &block) const; @@ -319,7 +320,7 @@ public: void requestUpdate(); protected: - void documentChanged(int from, int /*charsRemoved*/, int charsAdded) Q_DECL_OVERRIDE; + void documentChanged(int from, int /*charsRemoved*/, int charsAdded) override; private: |