diff options
Diffstat (limited to 'src/widgets')
230 files changed, 2325 insertions, 2261 deletions
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index 0f88554415..6cdc06d702 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -93,16 +93,16 @@ public: : m_parent(parent), m_index(index) {} - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE { + void *interface_cast(QAccessible::InterfaceType t) override { if (t == QAccessible::ActionInterface) { return static_cast<QAccessibleActionInterface*>(this); } return 0; } - QObject *object() const Q_DECL_OVERRIDE { return 0; } - QAccessible::Role role() const Q_DECL_OVERRIDE { return QAccessible::PageTab; } - QAccessible::State state() const Q_DECL_OVERRIDE { + QObject *object() const override { return 0; } + QAccessible::Role role() const override { return QAccessible::PageTab; } + QAccessible::State state() const override { if (!isValid()) { QAccessible::State s; s.invalid = true; @@ -110,7 +110,7 @@ public: } return parent()->state(); } - QRect rect() const Q_DECL_OVERRIDE { + QRect rect() const override { if (!isValid()) return QRect(); @@ -120,13 +120,13 @@ public: return rec; } - bool isValid() const Q_DECL_OVERRIDE { return m_parent.data() && m_parent->count() > m_index; } + bool isValid() const override { return m_parent.data() && m_parent->count() > m_index; } - QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return 0; } - int childCount() const Q_DECL_OVERRIDE { return 0; } - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; } + QAccessibleInterface *childAt(int, int) const override { return 0; } + int childCount() const override { return 0; } + int indexOfChild(const QAccessibleInterface *) const override { return -1; } - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE + QString text(QAccessible::Text t) const override { if (!isValid()) return QString(); @@ -156,26 +156,26 @@ public: return str; } - void setText(QAccessible::Text, const QString &) Q_DECL_OVERRIDE {} + void setText(QAccessible::Text, const QString &) override {} - QAccessibleInterface *parent() const Q_DECL_OVERRIDE { + QAccessibleInterface *parent() const override { return QAccessible::queryAccessibleInterface(m_parent.data()); } - QAccessibleInterface *child(int) const Q_DECL_OVERRIDE { return 0; } + QAccessibleInterface *child(int) const override { return 0; } // action interface - QStringList actionNames() const Q_DECL_OVERRIDE + QStringList actionNames() const override { return QStringList(pressAction()); } - void doAction(const QString &actionName) Q_DECL_OVERRIDE + void doAction(const QString &actionName) override { if (isValid() && actionName == pressAction()) m_parent->setCurrentIndex(m_index); } - QStringList keyBindingsForAction(const QString &) const Q_DECL_OVERRIDE + QStringList keyBindingsForAction(const QString &) const override { return QStringList(); } diff --git a/src/widgets/accessible/complexwidgets_p.h b/src/widgets/accessible/complexwidgets_p.h index 1887f98dca..96db2dab70 100644 --- a/src/widgets/accessible/complexwidgets_p.h +++ b/src/widgets/accessible/complexwidgets_p.h @@ -85,11 +85,11 @@ public: Undefined }; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; + QAccessibleInterface *child(int index) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; + bool isValid() const override; + QAccessibleInterface *childAt(int x, int y) const override; //protected: QAbstractScrollArea *abstractScrollArea() const; @@ -114,11 +114,11 @@ public: explicit QAccessibleTabBar(QWidget *w); ~QAccessibleTabBar(); - int childCount() const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + int childCount() const override; + QString text(QAccessible::Text t) const override; - QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; + QAccessibleInterface* child(int index) const override; + int indexOfChild(const QAccessibleInterface *child) const override; protected: QTabBar *tabBar() const; @@ -132,18 +132,18 @@ class QAccessibleComboBox : public QAccessibleWidget public: explicit QAccessibleComboBox(QWidget *w); - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; + int childCount() const override; + QAccessibleInterface *childAt(int x, int y) const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QAccessibleInterface* child(int index) const override; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; // QAccessibleActionInterface - QStringList actionNames() const Q_DECL_OVERRIDE; - QString localizedActionDescription(const QString &actionName) const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; - QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE; + QStringList actionNames() const override; + QString localizedActionDescription(const QString &actionName) const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &actionName) const override; protected: QComboBox *comboBox() const; diff --git a/src/widgets/accessible/itemviews_p.h b/src/widgets/accessible/itemviews_p.h index 72841b8a0f..683ae9c948 100644 --- a/src/widgets/accessible/itemviews_p.h +++ b/src/widgets/accessible/itemviews_p.h @@ -71,48 +71,48 @@ class QAccessibleTable :public QAccessibleTableInterface, public QAccessibleObje { public: explicit QAccessibleTable(QWidget *w); - bool isValid() const Q_DECL_OVERRIDE; + bool isValid() const override; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; + QAccessible::Role role() const override; + QAccessible::State state() const override; + QString text(QAccessible::Text t) const override; + QRect rect() const override; - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE; + QAccessibleInterface *childAt(int x, int y) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *) const override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int index) const override; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // table interface - virtual QAccessibleInterface *cellAt(int row, int column) const Q_DECL_OVERRIDE; - virtual QAccessibleInterface *caption() const Q_DECL_OVERRIDE; - virtual QAccessibleInterface *summary() const Q_DECL_OVERRIDE; - virtual QString columnDescription(int column) const Q_DECL_OVERRIDE; - virtual QString rowDescription(int row) const Q_DECL_OVERRIDE; - virtual int columnCount() const Q_DECL_OVERRIDE; - virtual int rowCount() const Q_DECL_OVERRIDE; + virtual QAccessibleInterface *cellAt(int row, int column) const override; + virtual QAccessibleInterface *caption() const override; + virtual QAccessibleInterface *summary() const override; + virtual QString columnDescription(int column) const override; + virtual QString rowDescription(int row) const override; + virtual int columnCount() const override; + virtual int rowCount() const override; // selection - virtual int selectedCellCount() const Q_DECL_OVERRIDE; - virtual int selectedColumnCount() const Q_DECL_OVERRIDE; - virtual int selectedRowCount() const Q_DECL_OVERRIDE; - virtual QList<QAccessibleInterface*> selectedCells() const Q_DECL_OVERRIDE; - virtual QList<int> selectedColumns() const Q_DECL_OVERRIDE; - virtual QList<int> selectedRows() const Q_DECL_OVERRIDE; - virtual bool isColumnSelected(int column) const Q_DECL_OVERRIDE; - virtual bool isRowSelected(int row) const Q_DECL_OVERRIDE; - virtual bool selectRow(int row) Q_DECL_OVERRIDE; - virtual bool selectColumn(int column) Q_DECL_OVERRIDE; - virtual bool unselectRow(int row) Q_DECL_OVERRIDE; - virtual bool unselectColumn(int column) Q_DECL_OVERRIDE; + virtual int selectedCellCount() const override; + virtual int selectedColumnCount() const override; + virtual int selectedRowCount() const override; + virtual QList<QAccessibleInterface*> selectedCells() const override; + virtual QList<int> selectedColumns() const override; + virtual QList<int> selectedRows() const override; + virtual bool isColumnSelected(int column) const override; + virtual bool isRowSelected(int row) const override; + virtual bool selectRow(int row) override; + virtual bool selectColumn(int column) override; + virtual bool unselectRow(int row) override; + virtual bool unselectColumn(int column) override; QAbstractItemView *view() const; - void modelChange(QAccessibleTableModelChangeEvent *event) Q_DECL_OVERRIDE; + void modelChange(QAccessibleTableModelChangeEvent *event) override; protected: inline QAccessible::Role cellRole() const { @@ -153,19 +153,19 @@ public: {} - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *childAt(int x, int y) const override; + int childCount() const override; + QAccessibleInterface *child(int index) const override; - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE; + int indexOfChild(const QAccessibleInterface *) const override; - int rowCount() const Q_DECL_OVERRIDE; + int rowCount() const override; // table interface - QAccessibleInterface *cellAt(int row, int column) const Q_DECL_OVERRIDE; - QString rowDescription(int row) const Q_DECL_OVERRIDE; - bool isRowSelected(int row) const Q_DECL_OVERRIDE; - bool selectRow(int row) Q_DECL_OVERRIDE; + QAccessibleInterface *cellAt(int row, int column) const override; + QString rowDescription(int row) const override; + bool isRowSelected(int row) const override; + bool selectRow(int row) override; private: QModelIndex indexFromLogical(int row, int column = 0) const; @@ -179,37 +179,37 @@ class QAccessibleTableCell: public QAccessibleInterface, public QAccessibleTable public: QAccessibleTableCell(QAbstractItemView *view, const QModelIndex &m_index, QAccessible::Role role); - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; - QObject *object() const Q_DECL_OVERRIDE { return Q_NULLPTR; } - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; + QObject *object() const override { return nullptr; } + QAccessible::Role role() const override; + QAccessible::State state() const override; + QRect rect() const override; + bool isValid() const override; - QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return Q_NULLPTR; } - int childCount() const Q_DECL_OVERRIDE { return 0; } - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; } + QAccessibleInterface *childAt(int, int) const override { return nullptr; } + int childCount() const override { return 0; } + int indexOfChild(const QAccessibleInterface *) const override { return -1; } - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int) const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int) const override; // cell interface - virtual int columnExtent() const Q_DECL_OVERRIDE; - virtual QList<QAccessibleInterface*> columnHeaderCells() const Q_DECL_OVERRIDE; - virtual int columnIndex() const Q_DECL_OVERRIDE; - virtual int rowExtent() const Q_DECL_OVERRIDE; - virtual QList<QAccessibleInterface*> rowHeaderCells() const Q_DECL_OVERRIDE; - virtual int rowIndex() const Q_DECL_OVERRIDE; - virtual bool isSelected() const Q_DECL_OVERRIDE; - virtual QAccessibleInterface* table() const Q_DECL_OVERRIDE; + virtual int columnExtent() const override; + virtual QList<QAccessibleInterface*> columnHeaderCells() const override; + virtual int columnIndex() const override; + virtual int rowExtent() const override; + virtual QList<QAccessibleInterface*> rowHeaderCells() const override; + virtual int rowIndex() const override; + virtual bool isSelected() const override; + virtual QAccessibleInterface* table() const override; //action interface - virtual QStringList actionNames() const Q_DECL_OVERRIDE; - virtual void doAction(const QString &actionName) Q_DECL_OVERRIDE; - virtual QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE; + virtual QStringList actionNames() const override; + virtual void doAction(const QString &actionName) override; + virtual QStringList keyBindingsForAction(const QString &actionName) const override; private: QHeaderView *verticalHeader() const; @@ -234,21 +234,21 @@ public: // For header cells, pass the header view in addition QAccessibleTableHeaderCell(QAbstractItemView *view, int index, Qt::Orientation orientation); - QObject *object() const Q_DECL_OVERRIDE { return Q_NULLPTR; } - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; + QObject *object() const override { return nullptr; } + QAccessible::Role role() const override; + QAccessible::State state() const override; + QRect rect() const override; + bool isValid() const override; - QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return Q_NULLPTR; } - int childCount() const Q_DECL_OVERRIDE { return 0; } - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; } + QAccessibleInterface *childAt(int, int) const override { return nullptr; } + int childCount() const override { return 0; } + int indexOfChild(const QAccessibleInterface *) const override { return -1; } - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int index) const override; private: QHeaderView *headerView() const; @@ -273,24 +273,24 @@ public: :view(view_) {} - QObject *object() const Q_DECL_OVERRIDE { return Q_NULLPTR; } - QAccessible::Role role() const Q_DECL_OVERRIDE { return QAccessible::Pane; } - QAccessible::State state() const Q_DECL_OVERRIDE { return QAccessible::State(); } - QRect rect() const Q_DECL_OVERRIDE { return QRect(); } - bool isValid() const Q_DECL_OVERRIDE { return true; } + QObject *object() const override { return nullptr; } + QAccessible::Role role() const override { return QAccessible::Pane; } + QAccessible::State state() const override { return QAccessible::State(); } + QRect rect() const override { return QRect(); } + bool isValid() const override { return true; } - QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return Q_NULLPTR; } - int childCount() const Q_DECL_OVERRIDE { return 0; } - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; } + QAccessibleInterface *childAt(int, int) const override { return nullptr; } + int childCount() const override { return 0; } + int indexOfChild(const QAccessibleInterface *) const override { return -1; } - QString text(QAccessible::Text) const Q_DECL_OVERRIDE { return QString(); } - void setText(QAccessible::Text, const QString &) Q_DECL_OVERRIDE {} + QString text(QAccessible::Text) const override { return QString(); } + void setText(QAccessible::Text, const QString &) override {} - QAccessibleInterface *parent() const Q_DECL_OVERRIDE { + QAccessibleInterface *parent() const override { return QAccessible::queryAccessibleInterface(view); } - QAccessibleInterface *child(int) const Q_DECL_OVERRIDE { - return Q_NULLPTR; + QAccessibleInterface *child(int) const override { + return nullptr; } private: diff --git a/src/widgets/accessible/qaccessiblemenu.cpp b/src/widgets/accessible/qaccessiblemenu.cpp index d20c5bfc71..8b3353f625 100644 --- a/src/widgets/accessible/qaccessiblemenu.cpp +++ b/src/widgets/accessible/qaccessiblemenu.cpp @@ -242,7 +242,7 @@ QObject *QAccessibleMenuItem::object() const /*! \reimp */ QWindow *QAccessibleMenuItem::window() const { - QWindow *result = Q_NULLPTR; + QWindow *result = nullptr; if (!m_owner.isNull()) { result = m_owner->windowHandle(); if (!result) { diff --git a/src/widgets/accessible/qaccessiblemenu_p.h b/src/widgets/accessible/qaccessiblemenu_p.h index 8b37e23333..9acd2a42f9 100644 --- a/src/widgets/accessible/qaccessiblemenu_p.h +++ b/src/widgets/accessible/qaccessiblemenu_p.h @@ -69,14 +69,14 @@ class QAccessibleMenu : public QAccessibleWidget public: explicit QAccessibleMenu(QWidget *w); - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; + int childCount() const override; + QAccessibleInterface *childAt(int x, int y) const override; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - int indexOfChild( const QAccessibleInterface *child ) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + QAccessible::Role role() const override; + QAccessibleInterface *child(int index) const override; + QAccessibleInterface *parent() const override; + int indexOfChild( const QAccessibleInterface *child ) const override; protected: QMenu *menu() const; @@ -88,10 +88,10 @@ class QAccessibleMenuBar : public QAccessibleWidget public: explicit QAccessibleMenuBar(QWidget *w); - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; + QAccessibleInterface *child(int index) const override; + int childCount() const override; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; + int indexOfChild(const QAccessibleInterface *child) const override; protected: QMenuBar *menuBar() const; @@ -105,28 +105,28 @@ public: explicit QAccessibleMenuItem(QWidget *owner, QAction *w); ~QAccessibleMenuItem(); - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface * child) const Q_DECL_OVERRIDE; + int childCount() const override; + QAccessibleInterface *childAt(int x, int y) const override; + bool isValid() const override; + int indexOfChild(const QAccessibleInterface * child) const override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - QObject * object() const Q_DECL_OVERRIDE; - QWindow *window() const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int index) const override; + QObject * object() const override; + QWindow *window() const override; - QRect rect() const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString & text) Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QRect rect() const override; + QAccessible::Role role() const override; + void setText(QAccessible::Text t, const QString & text) override; + QAccessible::State state() const override; + QString text(QAccessible::Text t) const override; // QAccessibleActionInterface - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; - QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &actionName) const override; QWidget *owner() const; protected: diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h index e09c3ff489..63789a595f 100644 --- a/src/widgets/accessible/qaccessiblewidget.h +++ b/src/widgets/accessible/qaccessiblewidget.h @@ -54,32 +54,32 @@ class Q_WIDGETS_EXPORT QAccessibleWidget : public QAccessibleObject, public QAcc { public: explicit QAccessibleWidget(QWidget *o, QAccessible::Role r = QAccessible::Client, const QString& name = QString()); - bool isValid() const Q_DECL_OVERRIDE; + bool isValid() const override; - QWindow *window() const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > relations(QAccessible::Relation match = QAccessible::AllRelations) const Q_DECL_OVERRIDE; - QAccessibleInterface *focusChild() const Q_DECL_OVERRIDE; + QWindow *window() const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > relations(QAccessible::Relation match = QAccessible::AllRelations) const override; + QAccessibleInterface *focusChild() const override; - QRect rect() const Q_DECL_OVERRIDE; + QRect rect() const override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int index) const override; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + QAccessible::Role role() const override; + QAccessible::State state() const override; - QColor foregroundColor() const Q_DECL_OVERRIDE; - QColor backgroundColor() const Q_DECL_OVERRIDE; + QColor foregroundColor() const override; + QColor backgroundColor() const override; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleActionInterface - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; - QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &actionName) const override; protected: ~QAccessibleWidget(); QWidget *widget() const; diff --git a/src/widgets/accessible/qaccessiblewidgets_p.h b/src/widgets/accessible/qaccessiblewidgets_p.h index 75e1eff694..87f0b888a0 100644 --- a/src/widgets/accessible/qaccessiblewidgets_p.h +++ b/src/widgets/accessible/qaccessiblewidgets_p.h @@ -85,40 +85,40 @@ class QAccessibleTextWidget : public QAccessibleWidget, public: QAccessibleTextWidget(QWidget *o, QAccessible::Role r = QAccessible::EditableText, const QString &name = QString()); - QAccessible::State state() const Q_DECL_OVERRIDE; + QAccessible::State state() const override; // QAccessibleTextInterface // selection - void selection(int selectionIndex, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - int selectionCount() const Q_DECL_OVERRIDE; - void addSelection(int startOffset, int endOffset) Q_DECL_OVERRIDE; - void removeSelection(int selectionIndex) Q_DECL_OVERRIDE; - void setSelection(int selectionIndex, int startOffset, int endOffset) Q_DECL_OVERRIDE; + void selection(int selectionIndex, int *startOffset, int *endOffset) const override; + int selectionCount() const override; + void addSelection(int startOffset, int endOffset) override; + void removeSelection(int selectionIndex) override; + void setSelection(int selectionIndex, int startOffset, int endOffset) override; // cursor - int cursorPosition() const Q_DECL_OVERRIDE; - void setCursorPosition(int position) Q_DECL_OVERRIDE; + int cursorPosition() const override; + void setCursorPosition(int position) override; // text - QString text(int startOffset, int endOffset) const Q_DECL_OVERRIDE; + QString text(int startOffset, int endOffset) const override; QString textBeforeOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - int characterCount() const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; + int characterCount() const override; // character <-> geometry - QRect characterRect(int offset) const Q_DECL_OVERRIDE; - int offsetAtPoint(const QPoint &point) const Q_DECL_OVERRIDE; + QRect characterRect(int offset) const override; + int offsetAtPoint(const QPoint &point) const override; - QString attributes(int offset, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + QString attributes(int offset, int *startOffset, int *endOffset) const override; // QAccessibleEditableTextInterface - void deleteText(int startOffset, int endOffset) Q_DECL_OVERRIDE; - void insertText(int offset, const QString &text) Q_DECL_OVERRIDE; - void replaceText(int startOffset, int endOffset, const QString &text) Q_DECL_OVERRIDE; + void deleteText(int startOffset, int endOffset) override; + void insertText(int offset, const QString &text) override; + void replaceText(int startOffset, int endOffset, const QString &text) override; using QAccessibleWidget::text; @@ -138,25 +138,25 @@ class QAccessiblePlainTextEdit : public QAccessibleTextWidget public: explicit QAccessiblePlainTextEdit(QWidget *o); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; + QAccessible::State state() const override; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleTextInterface - void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE; + void scrollToSubstring(int startIndex, int endIndex) override; using QAccessibleTextWidget::text; protected: QPlainTextEdit *plainTextEdit() const; - QPoint scrollBarPosition() const Q_DECL_OVERRIDE; - QTextCursor textCursor() const Q_DECL_OVERRIDE; - void setTextCursor(const QTextCursor &textCursor) Q_DECL_OVERRIDE; - QTextDocument *textDocument() const Q_DECL_OVERRIDE; - QWidget *viewport() const Q_DECL_OVERRIDE; + QPoint scrollBarPosition() const override; + QTextCursor textCursor() const override; + void setTextCursor(const QTextCursor &textCursor) override; + QTextDocument *textDocument() const override; + QWidget *viewport() const override; }; class QAccessibleTextEdit : public QAccessibleTextWidget @@ -164,25 +164,25 @@ class QAccessibleTextEdit : public QAccessibleTextWidget public: explicit QAccessibleTextEdit(QWidget *o); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; + QAccessible::State state() const override; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleTextInterface - void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE; + void scrollToSubstring(int startIndex, int endIndex) override; using QAccessibleTextWidget::text; protected: QTextEdit *textEdit() const; - QPoint scrollBarPosition() const Q_DECL_OVERRIDE; - QTextCursor textCursor() const Q_DECL_OVERRIDE; - void setTextCursor(const QTextCursor &textCursor) Q_DECL_OVERRIDE; - QTextDocument *textDocument() const Q_DECL_OVERRIDE; - QWidget *viewport() const Q_DECL_OVERRIDE; + QPoint scrollBarPosition() const override; + QTextCursor textCursor() const override; + void setTextCursor(const QTextCursor &textCursor) override; + QTextDocument *textDocument() const override; + QWidget *viewport() const override; }; #endif // QT_CONFIG(textedit) #endif //QT_NO_CURSOR @@ -192,10 +192,10 @@ class QAccessibleStackedWidget : public QAccessibleWidget public: explicit QAccessibleStackedWidget(QWidget *widget); - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *childAt(int x, int y) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QAccessibleInterface *child(int index) const override; protected: QStackedWidget *stackedWidget() const; @@ -222,9 +222,9 @@ class QAccessibleMdiArea : public QAccessibleWidget public: explicit QAccessibleMdiArea(QWidget *widget); - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; + int childCount() const override; + QAccessibleInterface *child(int index) const override; + int indexOfChild(const QAccessibleInterface *child) const override; protected: QMdiArea *mdiArea() const; @@ -235,13 +235,13 @@ class QAccessibleMdiSubWindow : public QAccessibleWidget public: explicit QAccessibleMdiSubWindow(QWidget *widget); - QString text(QAccessible::Text textType) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text textType, const QString &text) Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text textType) const override; + void setText(QAccessible::Text textType, const QString &text) override; + QAccessible::State state() const override; + int childCount() const override; + QAccessibleInterface *child(int index) const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QRect rect() const override; protected: QMdiSubWindow *mdiSubWindow() const; @@ -262,7 +262,7 @@ class QAccessibleTextBrowser : public QAccessibleTextEdit public: explicit QAccessibleTextBrowser(QWidget *widget); - QAccessible::Role role() const Q_DECL_OVERRIDE; + QAccessible::Role role() const override; }; #endif // QT_CONFIG(textbrowser) && QT_NO_CURSOR @@ -272,10 +272,10 @@ class QAccessibleCalendarWidget : public QAccessibleWidget public: explicit QAccessibleCalendarWidget(QWidget *widget); - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *child(int index) const override; protected: QCalendarWidget *calendarWidget() const; @@ -291,11 +291,11 @@ class QAccessibleDockWidget: public QAccessibleWidget { public: explicit QAccessibleDockWidget(QWidget *widget); - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - QRect rect () const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QAccessibleInterface *child(int index) const override; + int indexOfChild(const QAccessibleInterface *child) const override; + int childCount() const override; + QRect rect () const override; + QString text(QAccessible::Text t) const override; QDockWidget *dockWidget() const; protected: @@ -310,10 +310,10 @@ class QAccessibleMainWindow : public QAccessibleWidget public: explicit QAccessibleMainWindow(QWidget *widget); - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *iface) const Q_DECL_OVERRIDE; - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; + QAccessibleInterface *child(int index) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *iface) const override; + QAccessibleInterface *childAt(int x, int y) const override; QMainWindow *mainWindow() const; }; diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp index 190f0aa02f..b5b8608418 100644 --- a/src/widgets/accessible/rangecontrols.cpp +++ b/src/widgets/accessible/rangecontrols.cpp @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE #if QT_CONFIG(spinbox) QAccessibleAbstractSpinBox::QAccessibleAbstractSpinBox(QWidget *w) -: QAccessibleWidget(w, QAccessible::SpinBox), lineEdit(Q_NULLPTR) +: QAccessibleWidget(w, QAccessible::SpinBox), lineEdit(nullptr) { Q_ASSERT(abstractSpinBox()); } diff --git a/src/widgets/accessible/rangecontrols_p.h b/src/widgets/accessible/rangecontrols_p.h index 8af86681a0..1eada8e456 100644 --- a/src/widgets/accessible/rangecontrols_p.h +++ b/src/widgets/accessible/rangecontrols_p.h @@ -78,41 +78,41 @@ public: explicit QAccessibleAbstractSpinBox(QWidget *w); virtual ~QAccessibleAbstractSpinBox(); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleValueInterface - QVariant currentValue() const Q_DECL_OVERRIDE; - void setCurrentValue(const QVariant &value) Q_DECL_OVERRIDE; - QVariant maximumValue() const Q_DECL_OVERRIDE; - QVariant minimumValue() const Q_DECL_OVERRIDE; - QVariant minimumStepSize() const Q_DECL_OVERRIDE; + QVariant currentValue() const override; + void setCurrentValue(const QVariant &value) override; + QVariant maximumValue() const override; + QVariant minimumValue() const override; + QVariant minimumStepSize() const override; // QAccessibleTextInterface - void addSelection(int startOffset, int endOffset) Q_DECL_OVERRIDE; - QString attributes(int offset, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - int cursorPosition() const Q_DECL_OVERRIDE; - QRect characterRect(int offset) const Q_DECL_OVERRIDE; - int selectionCount() const Q_DECL_OVERRIDE; - int offsetAtPoint(const QPoint &point) const Q_DECL_OVERRIDE; - void selection(int selectionIndex, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - QString text(int startOffset, int endOffset) const Q_DECL_OVERRIDE; + void addSelection(int startOffset, int endOffset) override; + QString attributes(int offset, int *startOffset, int *endOffset) const override; + int cursorPosition() const override; + QRect characterRect(int offset) const override; + int selectionCount() const override; + int offsetAtPoint(const QPoint &point) const override; + void selection(int selectionIndex, int *startOffset, int *endOffset) const override; + QString text(int startOffset, int endOffset) const override; QString textBeforeOffset (int offset, QAccessible::TextBoundaryType boundaryType, - int *endOffset, int *startOffset) const Q_DECL_OVERRIDE; + int *endOffset, int *startOffset) const override; QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - void removeSelection(int selectionIndex) Q_DECL_OVERRIDE; - void setCursorPosition(int position) Q_DECL_OVERRIDE; - void setSelection(int selectionIndex, int startOffset, int endOffset) Q_DECL_OVERRIDE; - int characterCount() const Q_DECL_OVERRIDE; - void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; + void removeSelection(int selectionIndex) override; + void setCursorPosition(int position) override; + void setSelection(int selectionIndex, int startOffset, int endOffset) override; + int characterCount() const override; + void scrollToSubstring(int startIndex, int endIndex) override; // QAccessibleEditableTextInterface - void deleteText(int startOffset, int endOffset) Q_DECL_OVERRIDE; - void insertText(int offset, const QString &text) Q_DECL_OVERRIDE; - void replaceText(int startOffset, int endOffset, const QString &text) Q_DECL_OVERRIDE; + void deleteText(int startOffset, int endOffset) override; + void insertText(int offset, const QString &text) override; + void replaceText(int startOffset, int endOffset, const QString &text) override; protected: QAbstractSpinBox *abstractSpinBox() const; @@ -135,7 +135,7 @@ class QAccessibleDoubleSpinBox : public QAccessibleAbstractSpinBox public: explicit QAccessibleDoubleSpinBox(QWidget *widget); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; using QAccessibleAbstractSpinBox::text; protected: @@ -148,14 +148,14 @@ class QAccessibleAbstractSlider: public QAccessibleWidget, public QAccessibleVal { public: explicit QAccessibleAbstractSlider(QWidget *w, QAccessible::Role r = QAccessible::Slider); - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleValueInterface - QVariant currentValue() const Q_DECL_OVERRIDE; - void setCurrentValue(const QVariant &value) Q_DECL_OVERRIDE; - QVariant maximumValue() const Q_DECL_OVERRIDE; - QVariant minimumValue() const Q_DECL_OVERRIDE; - QVariant minimumStepSize() const Q_DECL_OVERRIDE; + QVariant currentValue() const override; + void setCurrentValue(const QVariant &value) override; + QVariant maximumValue() const override; + QVariant minimumValue() const override; + QVariant minimumStepSize() const override; protected: QAbstractSlider *abstractSlider() const; @@ -167,7 +167,7 @@ class QAccessibleScrollBar : public QAccessibleAbstractSlider { public: explicit QAccessibleScrollBar(QWidget *w); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; protected: QScrollBar *scrollBar() const; @@ -179,7 +179,7 @@ class QAccessibleSlider : public QAccessibleAbstractSlider { public: explicit QAccessibleSlider(QWidget *w); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; protected: QSlider *slider() const; @@ -192,7 +192,7 @@ class QAccessibleDial : public QAccessibleAbstractSlider public: explicit QAccessibleDial(QWidget *w); - QString text(QAccessible::Text textType) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text textType) const override; protected: QDial *dial() const; diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h index 902b403d5b..fcd0e7df47 100644 --- a/src/widgets/accessible/simplewidgets_p.h +++ b/src/widgets/accessible/simplewidgets_p.h @@ -72,14 +72,14 @@ class QAccessibleButton : public QAccessibleWidget public: QAccessibleButton(QWidget *w); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + QAccessible::State state() const override; + QRect rect() const override; + QAccessible::Role role() const override; - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; - QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &actionName) const override; protected: QAbstractButton *button() const; @@ -92,15 +92,15 @@ class QAccessibleToolButton : public QAccessibleButton public: QAccessibleToolButton(QWidget *w); - QAccessible::State state() const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; + QAccessible::State state() const override; + QAccessible::Role role() const override; - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + int childCount() const override; + QAccessibleInterface *child(int index) const override; // QAccessibleActionInterface - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; protected: QToolButton *toolButton() const; @@ -114,16 +114,16 @@ class QAccessibleDisplay : public QAccessibleWidget, public QAccessibleImageInte public: explicit QAccessibleDisplay(QWidget *w, QAccessible::Role role = QAccessible::StaticText); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + QAccessible::Role role() const override; - QVector<QPair<QAccessibleInterface*, QAccessible::Relation> >relations(QAccessible::Relation match = QAccessible::AllRelations) const Q_DECL_OVERRIDE; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + QVector<QPair<QAccessibleInterface*, QAccessible::Relation> >relations(QAccessible::Relation match = QAccessible::AllRelations) const override; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleImageInterface - QString imageDescription() const Q_DECL_OVERRIDE; - QSize imageSize() const Q_DECL_OVERRIDE; - QPoint imagePosition() const Q_DECL_OVERRIDE; + QString imageDescription() const override; + QSize imageSize() const override; + QPoint imagePosition() const override; }; #if QT_CONFIG(groupbox) @@ -132,16 +132,16 @@ class QAccessibleGroupBox : public QAccessibleWidget public: explicit QAccessibleGroupBox(QWidget *w); - QAccessible::State state() const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QAccessible::State state() const override; + QAccessible::Role role() const override; + QString text(QAccessible::Text t) const override; - QVector<QPair<QAccessibleInterface*, QAccessible::Relation> >relations(QAccessible::Relation match = QAccessible::AllRelations) const Q_DECL_OVERRIDE; + QVector<QPair<QAccessibleInterface*, QAccessible::Relation> >relations(QAccessible::Relation match = QAccessible::AllRelations) const override; //QAccessibleActionInterface - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; - QStringList keyBindingsForAction(const QString &) const Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &) const override; private: QGroupBox *groupBox() const; @@ -154,36 +154,36 @@ class QAccessibleLineEdit : public QAccessibleWidget, public QAccessibleTextInte public: explicit QAccessibleLineEdit(QWidget *o, const QString &name = QString()); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; + QAccessible::State state() const override; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleTextInterface - void addSelection(int startOffset, int endOffset) Q_DECL_OVERRIDE; - QString attributes(int offset, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - int cursorPosition() const Q_DECL_OVERRIDE; - QRect characterRect(int offset) const Q_DECL_OVERRIDE; - int selectionCount() const Q_DECL_OVERRIDE; - int offsetAtPoint(const QPoint &point) const Q_DECL_OVERRIDE; - void selection(int selectionIndex, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - QString text(int startOffset, int endOffset) const Q_DECL_OVERRIDE; + void addSelection(int startOffset, int endOffset) override; + QString attributes(int offset, int *startOffset, int *endOffset) const override; + int cursorPosition() const override; + QRect characterRect(int offset) const override; + int selectionCount() const override; + int offsetAtPoint(const QPoint &point) const override; + void selection(int selectionIndex, int *startOffset, int *endOffset) const override; + QString text(int startOffset, int endOffset) const override; QString textBeforeOffset (int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - void removeSelection(int selectionIndex) Q_DECL_OVERRIDE; - void setCursorPosition(int position) Q_DECL_OVERRIDE; - void setSelection(int selectionIndex, int startOffset, int endOffset) Q_DECL_OVERRIDE; - int characterCount() const Q_DECL_OVERRIDE; - void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; + void removeSelection(int selectionIndex) override; + void setCursorPosition(int position) override; + void setSelection(int selectionIndex, int startOffset, int endOffset) override; + int characterCount() const override; + void scrollToSubstring(int startIndex, int endIndex) override; // QAccessibleEditableTextInterface - void deleteText(int startOffset, int endOffset) Q_DECL_OVERRIDE; - void insertText(int offset, const QString &text) Q_DECL_OVERRIDE; - void replaceText(int startOffset, int endOffset, const QString &text) Q_DECL_OVERRIDE; + void deleteText(int startOffset, int endOffset) override; + void insertText(int offset, const QString &text) override; + void replaceText(int startOffset, int endOffset, const QString &text) override; protected: QLineEdit *lineEdit() const; friend class QAccessibleAbstractSpinBox; @@ -195,14 +195,14 @@ class QAccessibleProgressBar : public QAccessibleDisplay, public QAccessibleValu { public: explicit QAccessibleProgressBar(QWidget *o); - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleValueInterface - QVariant currentValue() const Q_DECL_OVERRIDE; - QVariant maximumValue() const Q_DECL_OVERRIDE; - QVariant minimumValue() const Q_DECL_OVERRIDE; - QVariant minimumStepSize() const Q_DECL_OVERRIDE; - void setCurrentValue(const QVariant &) Q_DECL_OVERRIDE {} + QVariant currentValue() const override; + QVariant maximumValue() const override; + QVariant minimumValue() const override; + QVariant minimumStepSize() const override; + void setCurrentValue(const QVariant &) override {} protected: QProgressBar *progressBar() const; @@ -214,9 +214,9 @@ class QAccessibleWindowContainer : public QAccessibleWidget { public: QAccessibleWindowContainer(QWidget *w); - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int i) const Q_DECL_OVERRIDE; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QAccessibleInterface *child(int i) const override; private: QWindowContainer *container() const; diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index f3b198fdc2..03505e78c8 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -134,7 +134,7 @@ public: bool handleColorPickingMouseButtonRelease(QMouseEvent *e); bool handleColorPickingKeyPress(QKeyEvent *e); - bool canBeNativeDialog() const Q_DECL_OVERRIDE; + bool canBeNativeDialog() const override; QWellArray *custom; QWellArray *standard; @@ -167,8 +167,8 @@ public: #endif private: - virtual void initHelper(QPlatformDialogHelper *h) Q_DECL_OVERRIDE; - virtual void helperPrepareShow(QPlatformDialogHelper *h) Q_DECL_OVERRIDE; + virtual void initHelper(QPlatformDialogHelper *h) override; + virtual void helperPrepareShow(QPlatformDialogHelper *h) override; }; //////////// QWellArray BEGIN @@ -192,7 +192,7 @@ public: virtual void setCurrent(int row, int col); virtual void setSelected(int row, int col); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; inline int cellWidth() const { return cellw; } @@ -242,12 +242,12 @@ protected: virtual void paintCell(QPainter *, int row, int col, const QRect&); virtual void paintCellContents(QPainter *, int row, int col, const QRect&); - void mousePressEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent*) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent*) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void keyPressEvent(QKeyEvent*) override; + void focusInEvent(QFocusEvent*) override; + void focusOutEvent(QFocusEvent*) override; + void paintEvent(QPaintEvent *) override; private: Q_DISABLE_COPY(QWellArray) @@ -495,7 +495,7 @@ class QColorPickingEventFilter : public QObject { public: explicit QColorPickingEventFilter(QColorDialogPrivate *dp, QObject *parent = 0) : QObject(parent), m_dp(dp) {} - bool eventFilter(QObject *, QEvent *event) Q_DECL_OVERRIDE + bool eventFilter(QObject *, QEvent *event) override { switch (event->type()) { case QEvent::MouseMove: @@ -586,15 +586,15 @@ public: { setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum)); } protected: - void paintCellContents(QPainter *, int row, int col, const QRect&) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void paintCellContents(QPainter *, int row, int col, const QRect&) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE; - void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *e) override; + void dragLeaveEvent(QDragLeaveEvent *e) override; + void dragMoveEvent(QDragMoveEvent *e) override; + void dropEvent(QDropEvent *e) override; #endif private: @@ -708,11 +708,11 @@ signals: void newCol(int h, int s); protected: - QSize sizeHint() const Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; + QSize sizeHint() const override; + void paintEvent(QPaintEvent*) override; + void mouseMoveEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void resizeEvent(QResizeEvent *) override; private: int hue; @@ -745,9 +745,9 @@ signals: void newHsv(int h, int s, int v); protected: - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent*) override; + void mouseMoveEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; private: enum { foff = 3, coff = 4 }; //frame and contents offset @@ -1067,14 +1067,14 @@ signals: void colorDropped(QRgb); protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *e) override; + void dragLeaveEvent(QDragLeaveEvent *e) override; + void dropEvent(QDropEvent *e) override; #endif private: diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h index a27cfaf953..6451ff9bde 100644 --- a/src/widgets/dialogs/qcolordialog.h +++ b/src/widgets/dialogs/qcolordialog.h @@ -68,8 +68,8 @@ public: Q_DECLARE_FLAGS(ColorDialogOptions, ColorDialogOption) - explicit QColorDialog(QWidget *parent = Q_NULLPTR); - explicit QColorDialog(const QColor &initial, QWidget *parent = Q_NULLPTR); + explicit QColorDialog(QWidget *parent = nullptr); + explicit QColorDialog(const QColor &initial, QWidget *parent = nullptr); ~QColorDialog(); void setCurrentColor(const QColor &color); @@ -85,15 +85,15 @@ public: using QDialog::open; void open(QObject *receiver, const char *member); - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; static QColor getColor(const QColor &initial = Qt::white, - QWidget *parent = Q_NULLPTR, + QWidget *parent = nullptr, const QString &title = QString(), ColorDialogOptions options = ColorDialogOptions()); // obsolete - static QRgb getRgba(QRgb rgba = 0xffffffff, bool *ok = Q_NULLPTR, QWidget *parent = Q_NULLPTR); + static QRgb getRgba(QRgb rgba = 0xffffffff, bool *ok = nullptr, QWidget *parent = nullptr); static int customCount(); static QColor customColor(int index); @@ -106,8 +106,8 @@ Q_SIGNALS: void colorSelected(const QColor &color); protected: - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - void done(int result) Q_DECL_OVERRIDE; + void changeEvent(QEvent *event) override; + void done(int result) override; private: Q_DISABLE_COPY(QColorDialog) diff --git a/src/widgets/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h index 72250172d3..7f267dd939 100644 --- a/src/widgets/dialogs/qdialog.h +++ b/src/widgets/dialogs/qdialog.h @@ -60,7 +60,7 @@ class Q_WIDGETS_EXPORT QDialog : public QWidget Q_PROPERTY(bool modal READ isModal WRITE setModal) public: - explicit QDialog(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); + explicit QDialog(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); ~QDialog(); enum DialogCode { Rejected, Accepted }; diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h index 2ed414bd45..99fff08e65 100644 --- a/src/widgets/dialogs/qdialog_p.h +++ b/src/widgets/dialogs/qdialog_p.h @@ -143,7 +143,7 @@ public: T *operator->() const Q_DECL_NOTHROW { return get(); } T *get() const Q_DECL_NOTHROW { return o; } T &operator*() const { return *get(); } - operator RestrictedBool() const Q_DECL_NOTHROW { return o ? &internal::func : Q_NULLPTR; } + operator RestrictedBool() const Q_DECL_NOTHROW { return o ? &internal::func : nullptr; } bool operator!() const Q_DECL_NOTHROW { return !o; } private: Q_DISABLE_COPY(QAutoPointer); diff --git a/src/widgets/dialogs/qerrormessage.cpp b/src/widgets/dialogs/qerrormessage.cpp index 39035b743d..fd68f19680 100644 --- a/src/widgets/dialogs/qerrormessage.cpp +++ b/src/widgets/dialogs/qerrormessage.cpp @@ -95,8 +95,8 @@ public: QErrorMessageTextView(QWidget *parent) : QTextEdit(parent) { setReadOnly(true); } - virtual QSize minimumSizeHint() const Q_DECL_OVERRIDE; - virtual QSize sizeHint() const Q_DECL_OVERRIDE; + virtual QSize minimumSizeHint() const override; + virtual QSize sizeHint() const override; }; } // unnamed namespace diff --git a/src/widgets/dialogs/qerrormessage.h b/src/widgets/dialogs/qerrormessage.h index 4cb1fad845..220694e54e 100644 --- a/src/widgets/dialogs/qerrormessage.h +++ b/src/widgets/dialogs/qerrormessage.h @@ -55,7 +55,7 @@ class Q_WIDGETS_EXPORT QErrorMessage: public QDialog Q_OBJECT Q_DECLARE_PRIVATE(QErrorMessage) public: - explicit QErrorMessage(QWidget* parent = Q_NULLPTR); + explicit QErrorMessage(QWidget* parent = nullptr); ~QErrorMessage(); static QErrorMessage * qtHandler(); @@ -65,8 +65,8 @@ public Q_SLOTS: void showMessage(const QString &message, const QString &type); protected: - void done(int) Q_DECL_OVERRIDE; - void changeEvent(QEvent *e) Q_DECL_OVERRIDE; + void done(int) override; + void changeEvent(QEvent *e) override; private: Q_DISABLE_COPY(QErrorMessage) diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 8d37969be4..e375a957de 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -1994,7 +1994,7 @@ QFileIconProvider *QFileDialog::iconProvider() const { Q_D(const QFileDialog); if (!d->model) - return Q_NULLPTR; + return nullptr; return d->model->iconProvider(); } @@ -3621,7 +3621,7 @@ void QFileDialogPrivate::_q_enterDirectory(const QModelIndex &index) } } else { // Do not accept when shift-clicking to multi-select a file in environments with single-click-activation (KDE) - if (!q->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, Q_NULLPTR, qFileDialogUi->treeView) + if (!q->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, nullptr, qFileDialogUi->treeView) || q->fileMode() != QFileDialog::ExistingFiles || !(QGuiApplication::keyboardModifiers() & Qt::CTRL)) { q->accept(); } diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index b9092e036d..1cbd690f24 100644 --- a/src/widgets/dialogs/qfiledialog.h +++ b/src/widgets/dialogs/qfiledialog.h @@ -98,7 +98,7 @@ public: Q_FLAG(Options) QFileDialog(QWidget *parent, Qt::WindowFlags f); - explicit QFileDialog(QWidget *parent = Q_NULLPTR, + explicit QFileDialog(QWidget *parent = nullptr, const QString &caption = QString(), const QString &directory = QString(), const QString &filter = QString()); @@ -190,7 +190,7 @@ public: using QDialog::open; void open(QObject *receiver, const char *member); - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; Q_SIGNALS: void fileSelected(const QString &file); @@ -207,68 +207,68 @@ Q_SIGNALS: public: - static QString getOpenFileName(QWidget *parent = Q_NULLPTR, + static QString getOpenFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), - QString *selectedFilter = Q_NULLPTR, + QString *selectedFilter = nullptr, Options options = Options()); - static QUrl getOpenFileUrl(QWidget *parent = Q_NULLPTR, + static QUrl getOpenFileUrl(QWidget *parent = nullptr, const QString &caption = QString(), const QUrl &dir = QUrl(), const QString &filter = QString(), - QString *selectedFilter = Q_NULLPTR, + QString *selectedFilter = nullptr, Options options = Options(), const QStringList &supportedSchemes = QStringList()); - static QString getSaveFileName(QWidget *parent = Q_NULLPTR, + static QString getSaveFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), - QString *selectedFilter = Q_NULLPTR, + QString *selectedFilter = nullptr, Options options = Options()); - static QUrl getSaveFileUrl(QWidget *parent = Q_NULLPTR, + static QUrl getSaveFileUrl(QWidget *parent = nullptr, const QString &caption = QString(), const QUrl &dir = QUrl(), const QString &filter = QString(), - QString *selectedFilter = Q_NULLPTR, + QString *selectedFilter = nullptr, Options options = Options(), const QStringList &supportedSchemes = QStringList()); - static QString getExistingDirectory(QWidget *parent = Q_NULLPTR, + static QString getExistingDirectory(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), Options options = ShowDirsOnly); - static QUrl getExistingDirectoryUrl(QWidget *parent = Q_NULLPTR, + static QUrl getExistingDirectoryUrl(QWidget *parent = nullptr, const QString &caption = QString(), const QUrl &dir = QUrl(), Options options = ShowDirsOnly, const QStringList &supportedSchemes = QStringList()); - static QStringList getOpenFileNames(QWidget *parent = Q_NULLPTR, + static QStringList getOpenFileNames(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), - QString *selectedFilter = Q_NULLPTR, + QString *selectedFilter = nullptr, Options options = Options()); - static QList<QUrl> getOpenFileUrls(QWidget *parent = Q_NULLPTR, + static QList<QUrl> getOpenFileUrls(QWidget *parent = nullptr, const QString &caption = QString(), const QUrl &dir = QUrl(), const QString &filter = QString(), - QString *selectedFilter = Q_NULLPTR, + QString *selectedFilter = nullptr, Options options = Options(), const QStringList &supportedSchemes = QStringList()); protected: QFileDialog(const QFileDialogArgs &args); - void done(int result) Q_DECL_OVERRIDE; - void accept() Q_DECL_OVERRIDE; - void changeEvent(QEvent *e) Q_DECL_OVERRIDE; + void done(int result) override; + void accept() override; + void changeEvent(QEvent *e) override; private: Q_DECLARE_PRIVATE(QFileDialog) diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index 371826eccc..17290381d3 100644 --- a/src/widgets/dialogs/qfiledialog_p.h +++ b/src/widgets/dialogs/qfiledialog_p.h @@ -254,7 +254,7 @@ public: // setVisible_sys returns true if it ends up showing a native // dialog. Returning false means that a non-native dialog must be // used instead. - bool canBeNativeDialog() const Q_DECL_OVERRIDE; + bool canBeNativeDialog() const override; inline bool usingWidgets() const; inline void setDirectory_sys(const QUrl &directory); @@ -286,9 +286,9 @@ public: ~QFileDialogPrivate(); private: - virtual void initHelper(QPlatformDialogHelper *) Q_DECL_OVERRIDE; - virtual void helperPrepareShow(QPlatformDialogHelper *) Q_DECL_OVERRIDE; - virtual void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) Q_DECL_OVERRIDE; + virtual void initHelper(QPlatformDialogHelper *) override; + virtual void helperPrepareShow(QPlatformDialogHelper *) override; + virtual void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) override; Q_DISABLE_COPY(QFileDialogPrivate) }; @@ -298,7 +298,7 @@ class QFileDialogLineEdit : public QLineEdit public: QFileDialogLineEdit(QWidget *parent = 0) : QLineEdit(parent), d_ptr(0){} void setFileDialogPrivate(QFileDialogPrivate *d_pointer) {d_ptr = d_pointer; } - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *e) override; bool hideOnEsc; private: QFileDialogPrivate *d_ptr; @@ -309,10 +309,10 @@ class QFileDialogComboBox : public QComboBox public: QFileDialogComboBox(QWidget *parent = 0) : QComboBox(parent), urlModel(0) {} void setFileDialogPrivate(QFileDialogPrivate *d_pointer); - void showPopup() Q_DECL_OVERRIDE; + void showPopup() override; void setHistory(const QStringList &paths); QStringList history() const { return m_history; } - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; private: QUrlModel *urlModel; @@ -325,9 +325,9 @@ class QFileDialogListView : public QListView public: QFileDialogListView(QWidget *parent = 0); void setFileDialogPrivate(QFileDialogPrivate *d_pointer); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; protected: - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *e) override; private: QFileDialogPrivate *d_ptr; }; @@ -337,10 +337,10 @@ class QFileDialogTreeView : public QTreeView public: QFileDialogTreeView(QWidget *parent); void setFileDialogPrivate(QFileDialogPrivate *d_pointer); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; protected: - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *e) override; private: QFileDialogPrivate *d_ptr; }; diff --git a/src/widgets/dialogs/qfileinfogatherer_p.h b/src/widgets/dialogs/qfileinfogatherer_p.h index 52578126de..1e97cc3558 100644 --- a/src/widgets/dialogs/qfileinfogatherer_p.h +++ b/src/widgets/dialogs/qfileinfogatherer_p.h @@ -185,7 +185,7 @@ private Q_SLOTS: void driveRemoved(); private: - void run() Q_DECL_OVERRIDE; + void run() override; // called by run(): void getFileInfos(const QString &path, const QStringList &files); void fetch(const QFileInfo &info, QElapsedTimer &base, bool &firstTime, QVector<QPair<QString, QFileInfo> > &updatedFiles, const QString &path); diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h index a5f23c9220..c2c8b8818e 100644 --- a/src/widgets/dialogs/qfilesystemmodel.h +++ b/src/widgets/dialogs/qfilesystemmodel.h @@ -75,36 +75,36 @@ public: FilePermissions = Qt::UserRole + 3 }; - explicit QFileSystemModel(QObject *parent = Q_NULLPTR); + explicit QFileSystemModel(QObject *parent = nullptr); ~QFileSystemModel(); - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; QModelIndex index(const QString &path, int column = 0) const; - QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; + QModelIndex parent(const QModelIndex &child) const override; using QObject::parent; - QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; - bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - bool canFetchMore(const QModelIndex &parent) const Q_DECL_OVERRIDE; - void fetchMore(const QModelIndex &parent) Q_DECL_OVERRIDE; + QModelIndex sibling(int row, int column, const QModelIndex &idx) const override; + bool hasChildren(const QModelIndex &parent = QModelIndex()) const override; + bool canFetchMore(const QModelIndex &parent) const override; + void fetchMore(const QModelIndex &parent) override; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; QVariant myComputer(int role = Qt::DisplayRole) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const override; - void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_OVERRIDE; + void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; - QStringList mimeTypes() const Q_DECL_OVERRIDE; - QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; bool dropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; - Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + int row, int column, const QModelIndex &parent) override; + Qt::DropActions supportedDropActions() const override; // QFileSystemModel specific API QModelIndex setRootPath(const QString &path); @@ -144,9 +144,9 @@ public: bool remove(const QModelIndex &index); protected: - QFileSystemModel(QFileSystemModelPrivate &, QObject *parent = Q_NULLPTR); - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + QFileSystemModel(QFileSystemModelPrivate &, QObject *parent = nullptr); + void timerEvent(QTimerEvent *event) override; + bool event(QEvent *event) override; private: Q_DECLARE_PRIVATE(QFileSystemModel) diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp index 587e31d8c5..5f912c582f 100644 --- a/src/widgets/dialogs/qfontdialog.cpp +++ b/src/widgets/dialogs/qfontdialog.cpp @@ -84,7 +84,7 @@ public: int row = QListView::currentIndex().row(); return row < 0 ? QString() : model()->stringList().at(row); } - void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) Q_DECL_OVERRIDE { + void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override { QListView::currentChanged(current, previous); if (current.isValid()) emit highlighted(current.row()); diff --git a/src/widgets/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h index 3fb3997b85..ae1320e779 100644 --- a/src/widgets/dialogs/qfontdialog.h +++ b/src/widgets/dialogs/qfontdialog.h @@ -72,8 +72,8 @@ public: Q_DECLARE_FLAGS(FontDialogOptions, FontDialogOption) - explicit QFontDialog(QWidget *parent = Q_NULLPTR); - explicit QFontDialog(const QFont &initial, QWidget *parent = Q_NULLPTR); + explicit QFontDialog(QWidget *parent = nullptr); + explicit QFontDialog(const QFont &initial, QWidget *parent = nullptr); ~QFontDialog(); void setCurrentFont(const QFont &font); @@ -89,10 +89,10 @@ public: using QDialog::open; void open(QObject *receiver, const char *member); - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; - static QFont getFont(bool *ok, QWidget *parent = Q_NULLPTR); - static QFont getFont(bool *ok, const QFont &initial, QWidget *parent = Q_NULLPTR, const QString &title = QString(), + static QFont getFont(bool *ok, QWidget *parent = nullptr); + static QFont getFont(bool *ok, const QFont &initial, QWidget *parent = nullptr, const QString &title = QString(), FontDialogOptions options = FontDialogOptions()); Q_SIGNALS: @@ -100,9 +100,9 @@ Q_SIGNALS: void fontSelected(const QFont &font); protected: - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - void done(int result) Q_DECL_OVERRIDE; - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + void changeEvent(QEvent *event) override; + void done(int result) override; + bool eventFilter(QObject *object, QEvent *event) override; private: Q_DISABLE_COPY(QFontDialog) diff --git a/src/widgets/dialogs/qfontdialog_p.h b/src/widgets/dialogs/qfontdialog_p.h index ae923d94ed..202247a3b4 100644 --- a/src/widgets/dialogs/qfontdialog_p.h +++ b/src/widgets/dialogs/qfontdialog_p.h @@ -141,12 +141,12 @@ public: QPointer<QObject> receiverToDisconnectOnClose; QByteArray memberToDisconnectOnClose; - bool canBeNativeDialog() const Q_DECL_OVERRIDE; + bool canBeNativeDialog() const override; void _q_runNativeAppModalPanel(); private: - virtual void initHelper(QPlatformDialogHelper *) Q_DECL_OVERRIDE; - virtual void helperPrepareShow(QPlatformDialogHelper *) Q_DECL_OVERRIDE; + virtual void initHelper(QPlatformDialogHelper *) override; + virtual void helperPrepareShow(QPlatformDialogHelper *) override; }; QT_END_NAMESPACE diff --git a/src/widgets/dialogs/qfscompleter_p.h b/src/widgets/dialogs/qfscompleter_p.h index ce0612f293..3b829d4a52 100644 --- a/src/widgets/dialogs/qfscompleter_p.h +++ b/src/widgets/dialogs/qfscompleter_p.h @@ -71,8 +71,8 @@ public: setCaseSensitivity(Qt::CaseInsensitive); #endif } - QString pathFromIndex(const QModelIndex &index) const Q_DECL_OVERRIDE; - QStringList splitPath(const QString& path) const Q_DECL_OVERRIDE; + QString pathFromIndex(const QModelIndex &index) const override; + QStringList splitPath(const QString& path) const override; QAbstractProxyModel *proxyModel; QFileSystemModel *sourceModel; diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp index 4c0f22ae97..c03df08345 100644 --- a/src/widgets/dialogs/qinputdialog.cpp +++ b/src/widgets/dialogs/qinputdialog.cpp @@ -74,7 +74,7 @@ static const char *candidateSignal(int which) case NumCandidateSignals: ; // fall through }; Q_UNREACHABLE(); - return Q_NULLPTR; + return nullptr; } static const char *signalForMember(const char *member) @@ -115,7 +115,7 @@ private slots: void notifyTextChanged() { emit textChanged(hasAcceptableInput()); } private: - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE { + void keyPressEvent(QKeyEvent *event) override { if ((event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) && !hasAcceptableInput()) { #ifndef QT_NO_PROPERTIES setProperty("value", property("value")); @@ -126,7 +126,7 @@ private: notifyTextChanged(); } - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE { + void mousePressEvent(QMouseEvent *event) override { QSpinBox::mousePressEvent(event); notifyTextChanged(); } @@ -150,7 +150,7 @@ private slots: void notifyTextChanged() { emit textChanged(hasAcceptableInput()); } private: - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE { + void keyPressEvent(QKeyEvent *event) override { if ((event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) && !hasAcceptableInput()) { #ifndef QT_NO_PROPERTIES setProperty("value", property("value")); @@ -161,7 +161,7 @@ private: notifyTextChanged(); } - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE { + void mousePressEvent(QMouseEvent *event) override { QDoubleSpinBox::mousePressEvent(event); notifyTextChanged(); } @@ -239,7 +239,6 @@ void QInputDialogPrivate::ensureLayout() QObject::connect(buttonBox, SIGNAL(rejected()), q, SLOT(reject())); mainLayout = new QVBoxLayout(q); - //we want to let the input dialog grow to available size on Symbian. mainLayout->setSizeConstraint(QLayout::SetMinAndMaxSize); mainLayout->addWidget(label); mainLayout->addWidget(inputWidget); diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index e41d442498..c3a5e59d53 100644 --- a/src/widgets/dialogs/qinputdialog.h +++ b/src/widgets/dialogs/qinputdialog.h @@ -91,7 +91,7 @@ public: DoubleInput }; - QInputDialog(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()); + QInputDialog(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); ~QInputDialog(); void setInputMode(InputMode mode); @@ -154,31 +154,31 @@ public: using QDialog::open; void open(QObject *receiver, const char *member); - QSize minimumSizeHint() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const override; + QSize sizeHint() const override; - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; static QString getText(QWidget *parent, const QString &title, const QString &label, QLineEdit::EchoMode echo = QLineEdit::Normal, - const QString &text = QString(), bool *ok = Q_NULLPTR, + const QString &text = QString(), bool *ok = nullptr, Qt::WindowFlags flags = Qt::WindowFlags(), Qt::InputMethodHints inputMethodHints = Qt::ImhNone); static QString getMultiLineText(QWidget *parent, const QString &title, const QString &label, - const QString &text = QString(), bool *ok = Q_NULLPTR, + const QString &text = QString(), bool *ok = nullptr, Qt::WindowFlags flags = Qt::WindowFlags(), Qt::InputMethodHints inputMethodHints = Qt::ImhNone); static QString getItem(QWidget *parent, const QString &title, const QString &label, const QStringList &items, int current = 0, bool editable = true, - bool *ok = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags(), + bool *ok = nullptr, Qt::WindowFlags flags = Qt::WindowFlags(), Qt::InputMethodHints inputMethodHints = Qt::ImhNone); static int getInt(QWidget *parent, const QString &title, const QString &label, int value = 0, int minValue = -2147483647, int maxValue = 2147483647, - int step = 1, bool *ok = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()); + int step = 1, bool *ok = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); static double getDouble(QWidget *parent, const QString &title, const QString &label, double value = 0, double minValue = -2147483647, double maxValue = 2147483647, - int decimals = 1, bool *ok = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()); + int decimals = 1, bool *ok = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); // ### Qt 6: merge overloads static double getDouble(QWidget *parent, const QString &title, const QString &label, double value, double minValue, double maxValue, int decimals, bool *ok, Qt::WindowFlags flags, @@ -187,7 +187,7 @@ public: #if QT_DEPRECATED_SINCE(5, 0) QT_DEPRECATED static inline int getInteger(QWidget *parent, const QString &title, const QString &label, int value = 0, int minValue = -2147483647, int maxValue = 2147483647, - int step = 1, bool *ok = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()) + int step = 1, bool *ok = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()) { return getInt(parent, title, label, value, minValue, maxValue, step, ok, flags); } @@ -206,7 +206,7 @@ Q_SIGNALS: void doubleValueSelected(double value); public: - void done(int result) Q_DECL_OVERRIDE; + void done(int result) override; private: Q_DISABLE_COPY(QInputDialog) diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index fdfffb45cf..190ce93439 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -98,7 +98,7 @@ public: public: TextEdit(QWidget *parent=0) : QTextEdit(parent) { } #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent * e) Q_DECL_OVERRIDE + void contextMenuEvent(QContextMenuEvent * e) override { QMenu *menu = createStandardContextMenu(); menu->setAttribute(Qt::WA_DeleteOnClose); @@ -173,7 +173,7 @@ public: void setLabel(DetailButtonLabel lbl) { setText(label(lbl)); } - QSize sizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override { ensurePolished(); QStyleOptionButton opt; @@ -259,9 +259,9 @@ public: QByteArray signalToDisconnectOnClose; QSharedPointer<QMessageDialogOptions> options; private: - void initHelper(QPlatformDialogHelper *) Q_DECL_OVERRIDE; - void helperPrepareShow(QPlatformDialogHelper *) Q_DECL_OVERRIDE; - void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) Q_DECL_OVERRIDE; + void initHelper(QPlatformDialogHelper *) override; + void helperPrepareShow(QPlatformDialogHelper *) override; + void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) override; }; void QMessageBoxPrivate::init(const QString &title, const QString &text) @@ -2608,7 +2608,7 @@ QPixmap QMessageBoxPrivate::standardIcon(QMessageBox::Icon icon, QMessageBox *mb break; } if (!tmpIcon.isNull()) { - QWindow *window = Q_NULLPTR; + QWindow *window = nullptr; if (mb) { window = mb->windowHandle(); if (!window) { diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index fd7d7936b6..4b993a9e65 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -132,9 +132,9 @@ public: Q_DECLARE_FLAGS(StandardButtons, StandardButton) Q_FLAG(StandardButtons) - explicit QMessageBox(QWidget *parent = Q_NULLPTR); + explicit QMessageBox(QWidget *parent = nullptr); QMessageBox(Icon icon, const QString &title, const QString &text, - StandardButtons buttons = NoButton, QWidget *parent = Q_NULLPTR, + StandardButtons buttons = NoButton, QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint); ~QMessageBox(); @@ -201,7 +201,7 @@ public: QMessageBox(const QString &title, const QString &text, Icon icon, int button0, int button1, int button2, - QWidget *parent = Q_NULLPTR, + QWidget *parent = nullptr, Qt::WindowFlags f = Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint); static int information(QWidget *parent, const QString &title, @@ -290,12 +290,12 @@ public Q_SLOTS: #endif protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void resizeEvent(QResizeEvent *event) override; + void showEvent(QShowEvent *event) override; + void closeEvent(QCloseEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void changeEvent(QEvent *event) override; private: Q_PRIVATE_SLOT(d_func(), void _q_buttonClicked(QAbstractButton *)) diff --git a/src/widgets/dialogs/qprogressdialog.h b/src/widgets/dialogs/qprogressdialog.h index 902a4de5d2..74adb6bd84 100644 --- a/src/widgets/dialogs/qprogressdialog.h +++ b/src/widgets/dialogs/qprogressdialog.h @@ -68,9 +68,9 @@ class Q_WIDGETS_EXPORT QProgressDialog : public QDialog Q_PROPERTY(QString labelText READ labelText WRITE setLabelText) public: - explicit QProgressDialog(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()); + explicit QProgressDialog(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); QProgressDialog(const QString &labelText, const QString &cancelButtonText, - int minimum, int maximum, QWidget *parent = Q_NULLPTR, + int minimum, int maximum, QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); ~QProgressDialog(); @@ -85,7 +85,7 @@ public: int value() const; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; QString labelText() const; int minimumDuration() const; @@ -113,10 +113,10 @@ Q_SIGNALS: void canceled(); protected: - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *event) override; + void closeEvent(QCloseEvent *event) override; + void changeEvent(QEvent *event) override; + void showEvent(QShowEvent *event) override; protected Q_SLOTS: void forceShow(); diff --git a/src/widgets/dialogs/qsidebar_p.h b/src/widgets/dialogs/qsidebar_p.h index 1f27d477a8..07aaa5abd2 100644 --- a/src/widgets/dialogs/qsidebar_p.h +++ b/src/widgets/dialogs/qsidebar_p.h @@ -69,7 +69,7 @@ class QSideBarDelegate : public QStyledItemDelegate public: QSideBarDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) {} void initStyleOption(QStyleOptionViewItem *option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; }; class Q_AUTOTEST_EXPORT QUrlModel : public QStandardItemModel @@ -84,14 +84,14 @@ public: QUrlModel(QObject *parent = 0); - QStringList mimeTypes() const Q_DECL_OVERRIDE; - QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; #ifndef QT_NO_DRAGANDDROP bool canDrop(QDragEnterEvent *event); - bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; #endif - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &index, const QVariant &value, int role=Qt::EditRole) Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role=Qt::EditRole) override; void setUrls(const QList<QUrl> &list); void addUrls(const QList<QUrl> &urls, int row = -1, bool move = true); @@ -131,7 +131,7 @@ public: void setModelAndUrls(QFileSystemModel *model, const QList<QUrl> &newUrls); ~QSidebar(); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; void setUrls(const QList<QUrl> &list) { urlModel->setUrls(list); } void addUrls(const QList<QUrl> &list, int row) { urlModel->addUrls(list, row); } @@ -140,10 +140,10 @@ public: void selectUrl(const QUrl &url); protected: - bool event(QEvent * e) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent * e) override; + void focusInEvent(QFocusEvent *event) override; #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *event) override; #endif private Q_SLOTS: diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 22499b3c22..900a4c1899 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -298,7 +298,7 @@ public: Qt::TextFormat titleFormat, Qt::TextFormat subTitleFormat); protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; #if QT_CONFIG(style_windowsvista) private: bool vistaDisabled() const; @@ -454,7 +454,7 @@ public: m_layout->addWidget(m_sideWidget); } - QSize minimumSizeHint() const Q_DECL_OVERRIDE { + QSize minimumSizeHint() const override { if (pixmap() && !pixmap()->isNull()) return pixmap()->size(); return QFrame::minimumSizeHint(); @@ -579,7 +579,7 @@ public: , bottomRuler(0) #if QT_CONFIG(style_windowsvista) , vistaHelper(0) - , vistaInitPending(false) + , vistaInitPending(true) , vistaState(QVistaHelper::Dirty) , vistaStateChanged(false) , inHandleAeroStyleChange(false) @@ -590,12 +590,6 @@ public: , maximumHeight(QWIDGETSIZE_MAX) { std::fill(btns, btns + QWizard::NButtons, static_cast<QAbstractButton *>(0)); - -#if QT_CONFIG(style_windowsvista) - if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA - && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)) - vistaInitPending = true; -#endif } void init(); diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h index 4d03bf91d4..0dd837b197 100644 --- a/src/widgets/dialogs/qwizard.h +++ b/src/widgets/dialogs/qwizard.h @@ -120,7 +120,7 @@ public: Q_DECLARE_FLAGS(WizardOptions, WizardOption) Q_FLAG(WizardOptions) - explicit QWizard(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()); + explicit QWizard(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); ~QWizard(); int addPage(QWizardPage *page); @@ -168,8 +168,8 @@ public: void setDefaultProperty(const char *className, const char *property, const char *changedSignal); - void setVisible(bool visible) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + void setVisible(bool visible) override; + QSize sizeHint() const override; Q_SIGNALS: void currentIdChanged(int id); @@ -184,13 +184,13 @@ public Q_SLOTS: void restart(); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void paintEvent(QPaintEvent *event) override; #if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) - bool nativeEvent(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE; + bool nativeEvent(const QByteArray &eventType, void *message, long *result) override; #endif - void done(int result) Q_DECL_OVERRIDE; + void done(int result) override; virtual void initializePage(int id); virtual void cleanupPage(int id); @@ -215,7 +215,7 @@ class Q_WIDGETS_EXPORT QWizardPage : public QWidget Q_PROPERTY(QString subTitle READ subTitle WRITE setSubTitle) public: - explicit QWizardPage(QWidget *parent = Q_NULLPTR); + explicit QWizardPage(QWidget *parent = nullptr); ~QWizardPage(); void setTitle(const QString &title); @@ -243,8 +243,8 @@ Q_SIGNALS: protected: void setField(const QString &name, const QVariant &value); QVariant field(const QString &name) const; - void registerField(const QString &name, QWidget *widget, const char *property = Q_NULLPTR, - const char *changedSignal = Q_NULLPTR); + void registerField(const QString &name, QWidget *widget, const char *property = nullptr, + const char *changedSignal = nullptr); QWizard *wizard() const; private: diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp index 666b192e9c..6ca4541980 100644 --- a/src/widgets/dialogs/qwizard_win.cpp +++ b/src/widgets/dialogs/qwizard_win.cpp @@ -154,10 +154,7 @@ QVistaHelper::QVistaHelper(QWizard *wizard) backButton_ = new QVistaBackButton(wizard); backButton_->hide(); - // Handle diff between Windows 7 and Vista iconSpacing = QStyleHelper::dpiScaled(7); - textSpacing = QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS7 ? - iconSpacing : QStyleHelper::dpiScaled(20); } QVistaHelper::~QVistaHelper() @@ -695,7 +692,7 @@ int QVistaHelper::captionSizeDp() int QVistaHelper::titleOffset() { - int iconOffset = wizard ->windowIcon().isNull() ? 0 : iconSize() + textSpacing; + int iconOffset = wizard ->windowIcon().isNull() ? 0 : iconSize() + iconSpacing; return leftMargin() + iconOffset; } diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h index f9122865c2..7ca4899a1f 100644 --- a/src/widgets/dialogs/qwizard_win_p.h +++ b/src/widgets/dialogs/qwizard_win_p.h @@ -104,8 +104,7 @@ public: static int titleBarSize() { return QVistaHelper::titleBarSizeDp() / QVistaHelper::m_devicePixelRatio; } static int titleBarSizeDp() { return QVistaHelper::frameSizeDp() + QVistaHelper::captionSizeDp(); } static int topPadding() { // padding under text - return int(QStyleHelper::dpiScaled( - QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS7 ? 4 : 6)); + return int(QStyleHelper::dpiScaled(4)); } static int topOffset(); @@ -150,7 +149,6 @@ private: int titleBarOffset; // Extra spacing above the text int iconSpacing; // Space between button and icon - int textSpacing; // Space between icon and text static int m_devicePixelRatio; }; diff --git a/src/widgets/effects/qgraphicseffect.h b/src/widgets/effects/qgraphicseffect.h index 78d025ded5..f7c0769778 100644 --- a/src/widgets/effects/qgraphicseffect.h +++ b/src/widgets/effects/qgraphicseffect.h @@ -79,7 +79,7 @@ public: PadToEffectiveBoundingRect }; - QGraphicsEffect(QObject *parent = Q_NULLPTR); + QGraphicsEffect(QObject *parent = nullptr); virtual ~QGraphicsEffect(); virtual QRectF boundingRectFor(const QRectF &sourceRect) const; @@ -95,7 +95,7 @@ Q_SIGNALS: void enabledChanged(bool enabled); protected: - QGraphicsEffect(QGraphicsEffectPrivate &d, QObject *parent = Q_NULLPTR); + QGraphicsEffect(QGraphicsEffectPrivate &d, QObject *parent = nullptr); virtual void draw(QPainter *painter) = 0; virtual void sourceChanged(ChangeFlags flags); void updateBoundingRect(); @@ -104,7 +104,7 @@ protected: QRectF sourceBoundingRect(Qt::CoordinateSystem system = Qt::LogicalCoordinates) const; void drawSource(QPainter *painter); QPixmap sourcePixmap(Qt::CoordinateSystem system = Qt::LogicalCoordinates, - QPoint *offset = Q_NULLPTR, + QPoint *offset = nullptr, PixmapPadMode mode = PadToEffectiveBoundingRect) const; private: @@ -129,7 +129,7 @@ class Q_WIDGETS_EXPORT QGraphicsColorizeEffect: public QGraphicsEffect Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) Q_PROPERTY(qreal strength READ strength WRITE setStrength NOTIFY strengthChanged) public: - QGraphicsColorizeEffect(QObject *parent = Q_NULLPTR); + QGraphicsColorizeEffect(QObject *parent = nullptr); ~QGraphicsColorizeEffect(); QColor color() const; @@ -144,7 +144,7 @@ Q_SIGNALS: void strengthChanged(qreal strength); protected: - void draw(QPainter *painter) Q_DECL_OVERRIDE; + void draw(QPainter *painter) override; private: Q_DECLARE_PRIVATE(QGraphicsColorizeEffect) @@ -167,10 +167,10 @@ public: Q_DECLARE_FLAGS(BlurHints, BlurHint) Q_FLAG(BlurHints) - QGraphicsBlurEffect(QObject *parent = Q_NULLPTR); + QGraphicsBlurEffect(QObject *parent = nullptr); ~QGraphicsBlurEffect(); - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; qreal blurRadius() const; BlurHints blurHints() const; @@ -183,7 +183,7 @@ Q_SIGNALS: void blurHintsChanged(BlurHints hints); protected: - void draw(QPainter *painter) Q_DECL_OVERRIDE; + void draw(QPainter *painter) override; private: Q_DECLARE_PRIVATE(QGraphicsBlurEffect) @@ -202,10 +202,10 @@ class Q_WIDGETS_EXPORT QGraphicsDropShadowEffect: public QGraphicsEffect Q_PROPERTY(qreal blurRadius READ blurRadius WRITE setBlurRadius NOTIFY blurRadiusChanged) Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) public: - QGraphicsDropShadowEffect(QObject *parent = Q_NULLPTR); + QGraphicsDropShadowEffect(QObject *parent = nullptr); ~QGraphicsDropShadowEffect(); - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; QPointF offset() const; inline qreal xOffset() const @@ -241,7 +241,7 @@ Q_SIGNALS: void colorChanged(const QColor &color); protected: - void draw(QPainter *painter) Q_DECL_OVERRIDE; + void draw(QPainter *painter) override; private: Q_DECLARE_PRIVATE(QGraphicsDropShadowEffect) @@ -255,7 +255,7 @@ class Q_WIDGETS_EXPORT QGraphicsOpacityEffect: public QGraphicsEffect Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged) Q_PROPERTY(QBrush opacityMask READ opacityMask WRITE setOpacityMask NOTIFY opacityMaskChanged) public: - QGraphicsOpacityEffect(QObject *parent = Q_NULLPTR); + QGraphicsOpacityEffect(QObject *parent = nullptr); ~QGraphicsOpacityEffect(); qreal opacity() const; @@ -270,7 +270,7 @@ Q_SIGNALS: void opacityMaskChanged(const QBrush &mask); protected: - void draw(QPainter *painter) Q_DECL_OVERRIDE; + void draw(QPainter *painter) override; private: Q_DECLARE_PRIVATE(QGraphicsOpacityEffect) diff --git a/src/widgets/effects/qpixmapfilter_p.h b/src/widgets/effects/qpixmapfilter_p.h index 399a835142..0f582bde60 100644 --- a/src/widgets/effects/qpixmapfilter_p.h +++ b/src/widgets/effects/qpixmapfilter_p.h @@ -105,8 +105,8 @@ public: void setConvolutionKernel(const qreal *matrix, int rows, int columns); - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; - void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; + void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const override; private: friend class QGLPixmapConvolutionFilter; @@ -133,8 +133,8 @@ public: qreal radius() const; QGraphicsBlurEffect::BlurHints blurHints() const; - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; - void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; + void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const override; private: friend class QGLPixmapBlurFilter; @@ -157,7 +157,7 @@ public: void setStrength(qreal strength); qreal strength() const; - void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const Q_DECL_OVERRIDE; + void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const override; }; class QPixmapDropShadowFilterPrivate; @@ -171,8 +171,8 @@ public: QPixmapDropShadowFilter(QObject *parent = 0); ~QPixmapDropShadowFilter(); - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; - void draw(QPainter *p, const QPointF &pos, const QPixmap &px, const QRectF &src = QRectF()) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; + void draw(QPainter *p, const QPointF &pos, const QPixmap &px, const QRectF &src = QRectF()) const override; qreal blurRadius() const; void setBlurRadius(qreal radius); diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.h b/src/widgets/graphicsview/qgraphicsanchorlayout.h index 01dc30718a..e392be1568 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout.h @@ -76,7 +76,7 @@ private: class Q_WIDGETS_EXPORT QGraphicsAnchorLayout : public QGraphicsLayout { public: - QGraphicsAnchorLayout(QGraphicsLayoutItem *parent = Q_NULLPTR); + QGraphicsAnchorLayout(QGraphicsLayoutItem *parent = nullptr); virtual ~QGraphicsAnchorLayout(); QGraphicsAnchor *addAnchor(QGraphicsLayoutItem *firstItem, Qt::AnchorPoint firstEdge, @@ -97,14 +97,14 @@ public: qreal horizontalSpacing() const; qreal verticalSpacing() const; - void removeAt(int index) Q_DECL_OVERRIDE; - void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; - QGraphicsLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; + void removeAt(int index) override; + void setGeometry(const QRectF &rect) override; + int count() const override; + QGraphicsLayoutItem *itemAt(int index) const override; - void invalidate() Q_DECL_OVERRIDE; + void invalidate() override; protected: - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; private: Q_DISABLE_COPY(QGraphicsAnchorLayout) diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h index e785b486bb..6b2408b2eb 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h @@ -198,7 +198,7 @@ struct SequentialAnchorData : public AnchorData #endif } - virtual void updateChildrenSizes() Q_DECL_OVERRIDE; + virtual void updateChildrenSizes() override; void calculateSizeHints(); QVector<AnchorVertex*> m_children; // list of vertices in the sequence @@ -226,7 +226,7 @@ struct ParallelAnchorData : public AnchorData #endif } - virtual void updateChildrenSizes() Q_DECL_OVERRIDE; + virtual void updateChildrenSizes() override; bool calculateSizeHints(); bool secondForward() const { diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.h b/src/widgets/graphicsview/qgraphicsgridlayout.h index fb9bc2e32c..4c0a1b4527 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayout.h +++ b/src/widgets/graphicsview/qgraphicsgridlayout.h @@ -53,7 +53,7 @@ class QGraphicsGridLayoutPrivate; class Q_WIDGETS_EXPORT QGraphicsGridLayout : public QGraphicsLayout { public: - QGraphicsGridLayout(QGraphicsLayoutItem *parent = Q_NULLPTR); + QGraphicsGridLayout(QGraphicsLayoutItem *parent = nullptr); virtual ~QGraphicsGridLayout(); void addItem(QGraphicsLayoutItem *item, int row, int column, int rowSpan, int columnSpan, @@ -106,16 +106,16 @@ public: QGraphicsLayoutItem *itemAt(int row, int column) const; // inherited from QGraphicsLayout - int count() const Q_DECL_OVERRIDE; - QGraphicsLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; - void removeAt(int index) Q_DECL_OVERRIDE; + int count() const override; + QGraphicsLayoutItem *itemAt(int index) const override; + void removeAt(int index) override; void removeItem(QGraphicsLayoutItem *item); - void invalidate() Q_DECL_OVERRIDE; + void invalidate() override; // inherited from QGraphicsLayoutItem - void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; + void setGeometry(const QRectF &rect) override; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; // #### //QRect cellRect(int row, int column, int rowSpan = 1, int columnSpan = 1) const; diff --git a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h index d797f784b8..370df9eed7 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h +++ b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h @@ -71,35 +71,35 @@ public: Qt::Alignment alignment = 0) : QGridLayoutItem(row, columns, rowSpan, columnSpan, alignment), q_layoutItem(item) {} - virtual QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const Q_DECL_OVERRIDE + virtual QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const override { QSizePolicy sizePolicy(q_layoutItem->sizePolicy()); return (QLayoutPolicy::Policy)((orientation == Qt::Horizontal) ? sizePolicy.horizontalPolicy() : sizePolicy.verticalPolicy()); } - virtual QLayoutPolicy::ControlTypes controlTypes(LayoutSide) const Q_DECL_OVERRIDE + virtual QLayoutPolicy::ControlTypes controlTypes(LayoutSide) const override { const QSizePolicy::ControlType ct = q_layoutItem->sizePolicy().controlType(); return (QLayoutPolicy::ControlTypes)ct; } - virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const Q_DECL_OVERRIDE + virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override { return q_layoutItem->effectiveSizeHint(which, constraint); } bool isHidden() const; - virtual bool isIgnored() const Q_DECL_OVERRIDE; + virtual bool isIgnored() const override; - virtual void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE + virtual void setGeometry(const QRectF &rect) override { q_layoutItem->setGeometry(rect); } - virtual bool hasDynamicConstraint() const Q_DECL_OVERRIDE; - virtual Qt::Orientation dynamicConstraintOrientation() const Q_DECL_OVERRIDE; + virtual bool hasDynamicConstraint() const override; + virtual Qt::Orientation dynamicConstraintOrientation() const override; QGraphicsLayoutItem *layoutItem() const { return q_layoutItem; } diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index 11d872f6e6..47ef5ba80e 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -158,7 +158,7 @@ public: SceneModal }; - explicit QGraphicsItem(QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsItem(QGraphicsItem *parent = nullptr); virtual ~QGraphicsItem(); QGraphicsScene *scene() const; @@ -194,7 +194,7 @@ public: PanelModality panelModality() const; void setPanelModality(PanelModality panelModality); - bool isBlockedByModalPanel(QGraphicsItem **blockingPanel = Q_NULLPTR) const; + bool isBlockedByModalPanel(QGraphicsItem **blockingPanel = nullptr) const; #ifndef QT_NO_TOOLTIP QString toolTip() const; @@ -290,7 +290,7 @@ public: QTransform transform() const; QTransform sceneTransform() const; QTransform deviceTransform(const QTransform &viewportTransform) const; - QTransform itemTransform(const QGraphicsItem *other, bool *ok = Q_NULLPTR) const; + QTransform itemTransform(const QGraphicsItem *other, bool *ok = nullptr) const; void setTransform(const QTransform &matrix, bool combine = false); void resetTransform(); #if QT_DEPRECATED_SINCE(5, 0) @@ -341,7 +341,7 @@ public: void setBoundingRegionGranularity(qreal granularity); // Drawing - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) = 0; + virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) = 0; void update(const QRectF &rect = QRectF()); inline void update(qreal x, qreal y, qreal width, qreal height); void scroll(qreal dx, qreal dy, const QRectF &rect = QRectF()); @@ -558,7 +558,7 @@ class Q_WIDGETS_EXPORT QGraphicsObject : public QObject, public QGraphicsItem Q_CLASSINFO("DefaultProperty", "children") Q_INTERFACES(QGraphicsItem) public: - explicit QGraphicsObject(QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsObject(QGraphicsItem *parent = nullptr); ~QGraphicsObject(); using QObject::children; @@ -588,7 +588,7 @@ Q_SIGNALS: protected: QGraphicsObject(QGraphicsItemPrivate &dd, QGraphicsItem *parent); - bool event(QEvent *ev) Q_DECL_OVERRIDE; + bool event(QEvent *ev) override; private: friend class QGraphicsItem; @@ -600,7 +600,7 @@ class QAbstractGraphicsShapeItemPrivate; class Q_WIDGETS_EXPORT QAbstractGraphicsShapeItem : public QGraphicsItem { public: - explicit QAbstractGraphicsShapeItem(QGraphicsItem *parent = Q_NULLPTR); + explicit QAbstractGraphicsShapeItem(QGraphicsItem *parent = nullptr); ~QAbstractGraphicsShapeItem(); QPen pen() const; @@ -609,8 +609,8 @@ public: QBrush brush() const; void setBrush(const QBrush &brush); - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; protected: QAbstractGraphicsShapeItem(QAbstractGraphicsShapeItemPrivate &dd, @@ -625,29 +625,29 @@ class QGraphicsPathItemPrivate; class Q_WIDGETS_EXPORT QGraphicsPathItem : public QAbstractGraphicsShapeItem { public: - explicit QGraphicsPathItem(QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsPathItem(const QPainterPath &path, QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsPathItem(QGraphicsItem *parent = nullptr); + explicit QGraphicsPathItem(const QPainterPath &path, QGraphicsItem *parent = nullptr); ~QGraphicsPathItem(); QPainterPath path() const; void setPath(const QPainterPath &path); - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 2 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; protected: - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsPathItem) @@ -658,31 +658,31 @@ class QGraphicsRectItemPrivate; class Q_WIDGETS_EXPORT QGraphicsRectItem : public QAbstractGraphicsShapeItem { public: - explicit QGraphicsRectItem(QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsRectItem(const QRectF &rect, QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsRectItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsRectItem(QGraphicsItem *parent = nullptr); + explicit QGraphicsRectItem(const QRectF &rect, QGraphicsItem *parent = nullptr); + explicit QGraphicsRectItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = nullptr); ~QGraphicsRectItem(); QRectF rect() const; void setRect(const QRectF &rect); inline void setRect(qreal x, qreal y, qreal w, qreal h); - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 3 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; protected: - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsRectItem) @@ -696,9 +696,9 @@ class QGraphicsEllipseItemPrivate; class Q_WIDGETS_EXPORT QGraphicsEllipseItem : public QAbstractGraphicsShapeItem { public: - explicit QGraphicsEllipseItem(QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsEllipseItem(const QRectF &rect, QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsEllipseItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsEllipseItem(QGraphicsItem *parent = nullptr); + explicit QGraphicsEllipseItem(const QRectF &rect, QGraphicsItem *parent = nullptr); + explicit QGraphicsEllipseItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = nullptr); ~QGraphicsEllipseItem(); QRectF rect() const; @@ -711,22 +711,22 @@ public: int spanAngle() const; void setSpanAngle(int angle); - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 4 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; protected: - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsEllipseItem) @@ -740,9 +740,9 @@ class QGraphicsPolygonItemPrivate; class Q_WIDGETS_EXPORT QGraphicsPolygonItem : public QAbstractGraphicsShapeItem { public: - explicit QGraphicsPolygonItem(QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsPolygonItem(QGraphicsItem *parent = nullptr); explicit QGraphicsPolygonItem(const QPolygonF &polygon, - QGraphicsItem *parent = Q_NULLPTR); + QGraphicsItem *parent = nullptr); ~QGraphicsPolygonItem(); QPolygonF polygon() const; @@ -751,22 +751,22 @@ public: Qt::FillRule fillRule() const; void setFillRule(Qt::FillRule rule); - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 5 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; protected: - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsPolygonItem) @@ -777,9 +777,9 @@ class QGraphicsLineItemPrivate; class Q_WIDGETS_EXPORT QGraphicsLineItem : public QGraphicsItem { public: - explicit QGraphicsLineItem(QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsLineItem(const QLineF &line, QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsLineItem(qreal x1, qreal y1, qreal x2, qreal y2, QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsLineItem(QGraphicsItem *parent = nullptr); + explicit QGraphicsLineItem(const QLineF &line, QGraphicsItem *parent = nullptr); + explicit QGraphicsLineItem(qreal x1, qreal y1, qreal x2, qreal y2, QGraphicsItem *parent = nullptr); ~QGraphicsLineItem(); QPen pen() const; @@ -790,22 +790,22 @@ public: inline void setLine(qreal x1, qreal y1, qreal x2, qreal y2) { setLine(QLineF(x1, y1, x2, y2)); } - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 6 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; protected: - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsLineItem) @@ -822,8 +822,8 @@ public: HeuristicMaskShape }; - explicit QGraphicsPixmapItem(QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsPixmapItem(const QPixmap &pixmap, QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsPixmapItem(QGraphicsItem *parent = nullptr); + explicit QGraphicsPixmapItem(const QPixmap &pixmap, QGraphicsItem *parent = nullptr); ~QGraphicsPixmapItem(); QPixmap pixmap() const; @@ -836,25 +836,25 @@ public: void setOffset(const QPointF &offset); inline void setOffset(qreal x, qreal y); - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 7 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; ShapeMode shapeMode() const; void setShapeMode(ShapeMode mode); protected: - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsPixmapItem) @@ -874,8 +874,8 @@ class Q_WIDGETS_EXPORT QGraphicsTextItem : public QGraphicsObject QDOC_PROPERTY(QTextCursor textCursor READ textCursor WRITE setTextCursor) public: - explicit QGraphicsTextItem(QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsTextItem(const QString &text, QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsTextItem(QGraphicsItem *parent = nullptr); + explicit QGraphicsTextItem(const QString &text, QGraphicsItem *parent = nullptr); ~QGraphicsTextItem(); QString toHtml() const; @@ -890,17 +890,17 @@ public: void setDefaultTextColor(const QColor &c); QColor defaultTextColor() const; - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 8 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; void setTextWidth(qreal width); qreal textWidth() const; @@ -927,30 +927,30 @@ Q_SIGNALS: void linkHovered(const QString &); protected: - bool sceneEvent(QEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void dragEnterEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dragLeaveEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dragMoveEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dropEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE; - void hoverEnterEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - void hoverMoveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - - QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; - - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool sceneEvent(QEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; + void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void focusInEvent(QFocusEvent *event) override; + void focusOutEvent(QFocusEvent *event) override; + void dragEnterEvent(QGraphicsSceneDragDropEvent *event) override; + void dragLeaveEvent(QGraphicsSceneDragDropEvent *event) override; + void dragMoveEvent(QGraphicsSceneDragDropEvent *event) override; + void dropEvent(QGraphicsSceneDragDropEvent *event) override; + void inputMethodEvent(QInputMethodEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + + QVariant inputMethodQuery(Qt::InputMethodQuery query) const override; + + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsTextItem) @@ -965,8 +965,8 @@ class QGraphicsSimpleTextItemPrivate; class Q_WIDGETS_EXPORT QGraphicsSimpleTextItem : public QAbstractGraphicsShapeItem { public: - explicit QGraphicsSimpleTextItem(QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsSimpleTextItem(const QString &text, QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsSimpleTextItem(QGraphicsItem *parent = nullptr); + explicit QGraphicsSimpleTextItem(const QString &text, QGraphicsItem *parent = nullptr); ~QGraphicsSimpleTextItem(); void setText(const QString &text); @@ -975,22 +975,22 @@ public: void setFont(const QFont &font); QFont font() const; - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 9 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; protected: - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsSimpleTextItem) @@ -1001,20 +1001,20 @@ class QGraphicsItemGroupPrivate; class Q_WIDGETS_EXPORT QGraphicsItemGroup : public QGraphicsItem { public: - explicit QGraphicsItemGroup(QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsItemGroup(QGraphicsItem *parent = nullptr); ~QGraphicsItemGroup(); void addToGroup(QGraphicsItem *item); void removeFromGroup(QGraphicsItem *item); - QRectF boundingRect() const Q_DECL_OVERRIDE; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 10 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; private: Q_DISABLE_COPY(QGraphicsItemGroup) diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h index 86414263a7..bae38473f9 100644 --- a/src/widgets/graphicsview/qgraphicsitem_p.h +++ b/src/widgets/graphicsview/qgraphicsitem_p.h @@ -595,28 +595,28 @@ public: : QGraphicsEffectSourcePrivate(), item(i), info(0) {} - void detach() Q_DECL_OVERRIDE + void detach() override { item->d_ptr->graphicsEffect = 0; item->prepareGeometryChange(); } - const QGraphicsItem *graphicsItem() const Q_DECL_OVERRIDE + const QGraphicsItem *graphicsItem() const override { return item; } - const QWidget *widget() const Q_DECL_OVERRIDE + const QWidget *widget() const override { return 0; } - void update() Q_DECL_OVERRIDE { + void update() override { item->d_ptr->updateDueToGraphicsEffect = true; item->update(); item->d_ptr->updateDueToGraphicsEffect = false; } - void effectBoundingRectChanged() Q_DECL_OVERRIDE + void effectBoundingRectChanged() override { item->prepareGeometryChange(); } - bool isPixmap() const Q_DECL_OVERRIDE + bool isPixmap() const override { return item->type() == QGraphicsPixmapItem::Type && !(item->flags() & QGraphicsItem::ItemIsSelectable) @@ -624,10 +624,10 @@ public: //|| (item->d_ptr->isObject && qobject_cast<QDeclarativeImage *>(q_func())); } - const QStyleOption *styleOption() const Q_DECL_OVERRIDE + const QStyleOption *styleOption() const override { return info ? info->option : 0; } - QRect deviceRect() const Q_DECL_OVERRIDE + QRect deviceRect() const override { if (!info || !info->widget) { qWarning("QGraphicsEffectSource::deviceRect: Not yet implemented, lacking device context"); @@ -636,11 +636,11 @@ public: return info->widget->rect(); } - QRectF boundingRect(Qt::CoordinateSystem system) const Q_DECL_OVERRIDE; - void draw(QPainter *) Q_DECL_OVERRIDE; + QRectF boundingRect(Qt::CoordinateSystem system) const override; + void draw(QPainter *) override; QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset, - QGraphicsEffect::PixmapPadMode mode) const Q_DECL_OVERRIDE; + QGraphicsEffect::PixmapPadMode mode) const override; QRect paddedEffectRect(Qt::CoordinateSystem system, QGraphicsEffect::PixmapPadMode mode, const QRectF &sourceRect, bool *unpadded = 0) const; QGraphicsItem *item; diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.h b/src/widgets/graphicsview/qgraphicsitemanimation.h index a819acc880..7417d7729c 100644 --- a/src/widgets/graphicsview/qgraphicsitemanimation.h +++ b/src/widgets/graphicsview/qgraphicsitemanimation.h @@ -58,7 +58,7 @@ class Q_WIDGETS_EXPORT QGraphicsItemAnimation : public QObject { Q_OBJECT public: - QGraphicsItemAnimation(QObject *parent = Q_NULLPTR); + QGraphicsItemAnimation(QObject *parent = nullptr); virtual ~QGraphicsItemAnimation(); QGraphicsItem *item() const; diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h index bbe45bbdd6..28b335ceaa 100644 --- a/src/widgets/graphicsview/qgraphicslayout.h +++ b/src/widgets/graphicsview/qgraphicslayout.h @@ -54,16 +54,16 @@ class QGraphicsWidget; class Q_WIDGETS_EXPORT QGraphicsLayout : public QGraphicsLayoutItem { public: - QGraphicsLayout(QGraphicsLayoutItem *parent = Q_NULLPTR); + QGraphicsLayout(QGraphicsLayoutItem *parent = nullptr); ~QGraphicsLayout(); void setContentsMargins(qreal left, qreal top, qreal right, qreal bottom); - void getContentsMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const Q_DECL_OVERRIDE; + void getContentsMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const override; void activate(); bool isActivated() const; virtual void invalidate(); - virtual void updateGeometry() Q_DECL_OVERRIDE; + virtual void updateGeometry() override; virtual void widgetEvent(QEvent *e); diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h index 10c7870412..44f430034b 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem.h +++ b/src/widgets/graphicsview/qgraphicslayoutitem.h @@ -54,7 +54,7 @@ class QGraphicsItem; class Q_WIDGETS_EXPORT QGraphicsLayoutItem { public: - QGraphicsLayoutItem(QGraphicsLayoutItem *parent = Q_NULLPTR, bool isLayout = false); + QGraphicsLayoutItem(QGraphicsLayoutItem *parent = nullptr, bool isLayout = false); virtual ~QGraphicsLayoutItem(); void setSizePolicy(const QSizePolicy &policy); diff --git a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h index 3463ae71bf..7886de432c 100644 --- a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h +++ b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h @@ -70,17 +70,17 @@ public: virtual qreal combinedLayoutSpacing(QLayoutPolicy::ControlTypes controls1, QLayoutPolicy::ControlTypes controls2, - Qt::Orientation orientation) const Q_DECL_OVERRIDE; + Qt::Orientation orientation) const override; virtual qreal perItemSpacing(QLayoutPolicy::ControlType control1, QLayoutPolicy::ControlType control2, - Qt::Orientation orientation) const Q_DECL_OVERRIDE; + Qt::Orientation orientation) const override; - virtual qreal spacing(Qt::Orientation orientation) const Q_DECL_OVERRIDE; + virtual qreal spacing(Qt::Orientation orientation) const override; - virtual qreal windowMargin(Qt::Orientation orientation) const Q_DECL_OVERRIDE; + virtual qreal windowMargin(Qt::Orientation orientation) const override; - virtual void invalidate() Q_DECL_OVERRIDE + virtual void invalidate() override { m_style = 0; QAbstractLayoutStyleInfo::invalidate(); diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.h b/src/widgets/graphicsview/qgraphicslinearlayout.h index 8186eea987..d27191adb3 100644 --- a/src/widgets/graphicsview/qgraphicslinearlayout.h +++ b/src/widgets/graphicsview/qgraphicslinearlayout.h @@ -53,8 +53,8 @@ class QGraphicsLinearLayoutPrivate; class Q_WIDGETS_EXPORT QGraphicsLinearLayout : public QGraphicsLayout { public: - QGraphicsLinearLayout(QGraphicsLayoutItem *parent = Q_NULLPTR); - QGraphicsLinearLayout(Qt::Orientation orientation, QGraphicsLayoutItem *parent = Q_NULLPTR); + QGraphicsLinearLayout(QGraphicsLayoutItem *parent = nullptr); + QGraphicsLinearLayout(Qt::Orientation orientation, QGraphicsLayoutItem *parent = nullptr); virtual ~QGraphicsLinearLayout(); void setOrientation(Qt::Orientation orientation); @@ -67,7 +67,7 @@ public: void insertStretch(int index, int stretch = 1); void removeItem(QGraphicsLayoutItem *item); - void removeAt(int index) Q_DECL_OVERRIDE; + void removeAt(int index) override; void setSpacing(qreal spacing); qreal spacing() const; @@ -80,13 +80,13 @@ public: void setAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment); Qt::Alignment alignment(QGraphicsLayoutItem *item) const; - void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; + void setGeometry(const QRectF &rect) override; - int count() const Q_DECL_OVERRIDE; - QGraphicsLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; + int count() const override; + QGraphicsLayoutItem *itemAt(int index) const override; - void invalidate() Q_DECL_OVERRIDE; - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; + void invalidate() override; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; #if 0 // ### Q5SizePolicy::ControlTypes controlTypes(LayoutSide side) const; diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.h b/src/widgets/graphicsview/qgraphicsproxywidget.h index fd6369a1fd..76fdf8aeba 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.h +++ b/src/widgets/graphicsview/qgraphicsproxywidget.h @@ -53,7 +53,7 @@ class Q_WIDGETS_EXPORT QGraphicsProxyWidget : public QGraphicsWidget { Q_OBJECT public: - QGraphicsProxyWidget(QGraphicsItem *parent = Q_NULLPTR, Qt::WindowFlags wFlags = Qt::WindowFlags()); + QGraphicsProxyWidget(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = Qt::WindowFlags()); ~QGraphicsProxyWidget(); void setWidget(QWidget *widget); @@ -61,63 +61,63 @@ public: QRectF subWidgetRect(const QWidget *widget) const; - void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; + void setGeometry(const QRectF &rect) override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; enum { Type = 12 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; QGraphicsProxyWidget *createProxyForChildWidget(QWidget *child); protected: - QVariant itemChange(GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; - bool event(QEvent *event) Q_DECL_OVERRIDE; - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + bool eventFilter(QObject *object, QEvent *event) override; - void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *event) override; + void hideEvent(QHideEvent *event) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) Q_DECL_OVERRIDE; + void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override; #endif #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dragLeaveEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dragMoveEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dropEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void dragEnterEvent(QGraphicsSceneDragDropEvent *event) override; + void dragLeaveEvent(QGraphicsSceneDragDropEvent *event) override; + void dragMoveEvent(QGraphicsSceneDragDropEvent *event) override; + void dropEvent(QGraphicsSceneDragDropEvent *event) override; #endif - void hoverEnterEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - void hoverMoveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - void grabMouseEvent(QEvent *event) Q_DECL_OVERRIDE; - void ungrabMouseEvent(QEvent *event) Q_DECL_OVERRIDE; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; + void grabMouseEvent(QEvent *event) override; + void ungrabMouseEvent(QEvent *event) override; - void mouseMoveEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QGraphicsSceneWheelEvent *event) Q_DECL_OVERRIDE; + void wheelEvent(QGraphicsSceneWheelEvent *event) override; #endif - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) override; + void focusOutEvent(QFocusEvent *event) override; + bool focusNextPrevChild(bool next) override; - QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; - void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE; + QVariant inputMethodQuery(Qt::InputMethodQuery query) const override; + void inputMethodEvent(QInputMethodEvent *event) override; - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; - void resizeEvent(QGraphicsSceneResizeEvent *event) Q_DECL_OVERRIDE; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; + void resizeEvent(QGraphicsSceneResizeEvent *event) override; protected Q_SLOTS: QGraphicsProxyWidget *newProxyWidget(const QWidget *); diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h index d515585067..5ecd2baab8 100644 --- a/src/widgets/graphicsview/qgraphicsscene.h +++ b/src/widgets/graphicsview/qgraphicsscene.h @@ -121,9 +121,9 @@ public: }; Q_DECLARE_FLAGS(SceneLayers, SceneLayer) - QGraphicsScene(QObject *parent = Q_NULLPTR); - QGraphicsScene(const QRectF &sceneRect, QObject *parent = Q_NULLPTR); - QGraphicsScene(qreal x, qreal y, qreal width, qreal height, QObject *parent = Q_NULLPTR); + QGraphicsScene(QObject *parent = nullptr); + QGraphicsScene(const QRectF &sceneRect, QObject *parent = nullptr); + QGraphicsScene(qreal x, qreal y, qreal width, qreal height, QObject *parent = nullptr); virtual ~QGraphicsScene(); QRectF sceneRect() const; @@ -159,7 +159,7 @@ public: #if QT_DEPRECATED_SINCE(5, 0) QT_DEPRECATED inline QGraphicsItem *itemAt(const QPointF &position) const { QList<QGraphicsItem *> itemsAtPoint = items(position); - return itemsAtPoint.isEmpty() ? Q_NULLPTR : itemsAtPoint.first(); + return itemsAtPoint.isEmpty() ? nullptr : itemsAtPoint.first(); } #endif QGraphicsItem *itemAt(const QPointF &pos, const QTransform &deviceTransform) const; @@ -173,7 +173,7 @@ public: #if QT_DEPRECATED_SINCE(5, 0) QT_DEPRECATED inline QGraphicsItem *itemAt(qreal x, qreal y) const { QList<QGraphicsItem *> itemsAtPoint = items(QPointF(x, y)); - return itemsAtPoint.isEmpty() ? Q_NULLPTR : itemsAtPoint.first(); + return itemsAtPoint.isEmpty() ? nullptr : itemsAtPoint.first(); } #endif inline QGraphicsItem *itemAt(qreal x, qreal y, const QTransform &deviceTransform) const @@ -261,8 +261,8 @@ public Q_SLOTS: void clear(); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + bool eventFilter(QObject *watched, QEvent *event) override; virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); virtual void dragEnterEvent(QGraphicsSceneDragDropEvent *event); virtual void dragMoveEvent(QGraphicsSceneDragDropEvent *event); @@ -285,7 +285,7 @@ protected: virtual void drawItems(QPainter *painter, int numItems, QGraphicsItem *items[], const QStyleOptionGraphicsItem options[], - QWidget *widget = Q_NULLPTR); + QWidget *widget = nullptr); protected Q_SLOTS: // ### Qt 6: make unconditional diff --git a/src/widgets/graphicsview/qgraphicsscene_bsp.cpp b/src/widgets/graphicsview/qgraphicsscene_bsp.cpp index 81d2953d8f..75eb50a3ac 100644 --- a/src/widgets/graphicsview/qgraphicsscene_bsp.cpp +++ b/src/widgets/graphicsview/qgraphicsscene_bsp.cpp @@ -49,7 +49,7 @@ class QGraphicsSceneInsertItemBspTreeVisitor : public QGraphicsSceneBspTreeVisit public: QGraphicsItem *item; - void visit(QList<QGraphicsItem *> *items) Q_DECL_OVERRIDE + void visit(QList<QGraphicsItem *> *items) override { items->prepend(item); } }; @@ -58,7 +58,7 @@ class QGraphicsSceneRemoveItemBspTreeVisitor : public QGraphicsSceneBspTreeVisit public: QGraphicsItem *item; - void visit(QList<QGraphicsItem *> *items) Q_DECL_OVERRIDE + void visit(QList<QGraphicsItem *> *items) override { items->removeAll(item); } }; @@ -68,7 +68,7 @@ public: QList<QGraphicsItem *> *foundItems; bool onlyTopLevelItems; - void visit(QList<QGraphicsItem *> *items) Q_DECL_OVERRIDE + void visit(QList<QGraphicsItem *> *items) override { for (int i = 0; i < items->size(); ++i) { QGraphicsItem *item = items->at(i); diff --git a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h index 8e78407762..b6387a2c56 100644 --- a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h +++ b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h @@ -77,25 +77,25 @@ public: QGraphicsSceneBspTreeIndex(QGraphicsScene *scene = 0); ~QGraphicsSceneBspTreeIndex(); - QList<QGraphicsItem *> estimateItems(const QRectF &rect, Qt::SortOrder order) const Q_DECL_OVERRIDE; - QList<QGraphicsItem *> estimateTopLevelItems(const QRectF &rect, Qt::SortOrder order) const Q_DECL_OVERRIDE; - QList<QGraphicsItem *> items(Qt::SortOrder order = Qt::DescendingOrder) const Q_DECL_OVERRIDE; + QList<QGraphicsItem *> estimateItems(const QRectF &rect, Qt::SortOrder order) const override; + QList<QGraphicsItem *> estimateTopLevelItems(const QRectF &rect, Qt::SortOrder order) const override; + QList<QGraphicsItem *> items(Qt::SortOrder order = Qt::DescendingOrder) const override; int bspTreeDepth() const; void setBspTreeDepth(int depth); protected Q_SLOTS: - void updateSceneRect(const QRectF &rect) Q_DECL_OVERRIDE; + void updateSceneRect(const QRectF &rect) override; protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - void clear() Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + void clear() override; - void addItem(QGraphicsItem *item) Q_DECL_OVERRIDE; - void removeItem(QGraphicsItem *item) Q_DECL_OVERRIDE; - void prepareBoundingRectChange(const QGraphicsItem *item) Q_DECL_OVERRIDE; + void addItem(QGraphicsItem *item) override; + void removeItem(QGraphicsItem *item) override; + void prepareBoundingRectChange(const QGraphicsItem *item) override; - void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange change, const void *const value) Q_DECL_OVERRIDE; + void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange change, const void *const value) override; private : Q_DECLARE_PRIVATE(QGraphicsSceneBspTreeIndex) diff --git a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h index a59a8ac1b0..07d5d80ef1 100644 --- a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h +++ b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h @@ -70,10 +70,10 @@ public: QGraphicsSceneLinearIndex(QGraphicsScene *scene = 0) : QGraphicsSceneIndex(scene), m_numSortedElements(0) { } - QList<QGraphicsItem *> items(Qt::SortOrder order = Qt::DescendingOrder) const Q_DECL_OVERRIDE + QList<QGraphicsItem *> items(Qt::SortOrder order = Qt::DescendingOrder) const override { Q_UNUSED(order); return m_items; } - virtual QList<QGraphicsItem *> estimateItems(const QRectF &rect, Qt::SortOrder order) const Q_DECL_OVERRIDE + virtual QList<QGraphicsItem *> estimateItems(const QRectF &rect, Qt::SortOrder order) const override { Q_UNUSED(rect); Q_UNUSED(order); @@ -81,16 +81,16 @@ public: } protected : - virtual void clear() Q_DECL_OVERRIDE + virtual void clear() override { m_items.clear(); m_numSortedElements = 0; } - virtual void addItem(QGraphicsItem *item) Q_DECL_OVERRIDE + virtual void addItem(QGraphicsItem *item) override { m_items << item; } - virtual void removeItem(QGraphicsItem *item) Q_DECL_OVERRIDE + virtual void removeItem(QGraphicsItem *item) override { // Sort m_items if needed if (m_numSortedElements < m_items.size()) diff --git a/src/widgets/graphicsview/qgraphicstransform.h b/src/widgets/graphicsview/qgraphicstransform.h index ceeb314c86..b8455781c5 100644 --- a/src/widgets/graphicsview/qgraphicstransform.h +++ b/src/widgets/graphicsview/qgraphicstransform.h @@ -57,7 +57,7 @@ class Q_WIDGETS_EXPORT QGraphicsTransform : public QObject { Q_OBJECT public: - QGraphicsTransform(QObject *parent = Q_NULLPTR); + QGraphicsTransform(QObject *parent = nullptr); ~QGraphicsTransform(); virtual void applyTo(QMatrix4x4 *matrix) const = 0; @@ -85,7 +85,7 @@ class Q_WIDGETS_EXPORT QGraphicsScale : public QGraphicsTransform Q_PROPERTY(qreal yScale READ yScale WRITE setYScale NOTIFY yScaleChanged) Q_PROPERTY(qreal zScale READ zScale WRITE setZScale NOTIFY zScaleChanged) public: - QGraphicsScale(QObject *parent = Q_NULLPTR); + QGraphicsScale(QObject *parent = nullptr); ~QGraphicsScale(); QVector3D origin() const; @@ -100,7 +100,7 @@ public: qreal zScale() const; void setZScale(qreal); - void applyTo(QMatrix4x4 *matrix) const Q_DECL_OVERRIDE; + void applyTo(QMatrix4x4 *matrix) const override; Q_SIGNALS: void originChanged(); @@ -123,7 +123,7 @@ class Q_WIDGETS_EXPORT QGraphicsRotation : public QGraphicsTransform Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged) Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged) public: - QGraphicsRotation(QObject *parent = Q_NULLPTR); + QGraphicsRotation(QObject *parent = nullptr); ~QGraphicsRotation(); QVector3D origin() const; @@ -136,7 +136,7 @@ public: void setAxis(const QVector3D &axis); void setAxis(Qt::Axis axis); - void applyTo(QMatrix4x4 *matrix) const Q_DECL_OVERRIDE; + void applyTo(QMatrix4x4 *matrix) const override; Q_SIGNALS: void originChanged(); diff --git a/src/widgets/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h index a9e4efefaf..e02fba69c9 100644 --- a/src/widgets/graphicsview/qgraphicsview.h +++ b/src/widgets/graphicsview/qgraphicsview.h @@ -114,11 +114,11 @@ public: }; Q_DECLARE_FLAGS(OptimizationFlags, OptimizationFlag) - QGraphicsView(QWidget *parent = Q_NULLPTR); - QGraphicsView(QGraphicsScene *scene, QWidget *parent = Q_NULLPTR); + QGraphicsView(QWidget *parent = nullptr); + QGraphicsView(QGraphicsScene *scene, QWidget *parent = nullptr); ~QGraphicsView(); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; QPainter::RenderHints renderHints() const; void setRenderHint(QPainter::RenderHint hint, bool enabled = true); @@ -214,7 +214,7 @@ public: inline QPoint mapFromScene(qreal x, qreal y) const; inline QPolygon mapFromScene(qreal x, qreal y, qreal w, qreal h) const; - QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; + QVariant inputMethodQuery(Qt::InputMethodQuery query) const override; QBrush backgroundBrush() const; void setBackgroundBrush(const QBrush &brush); @@ -233,39 +233,39 @@ Q_SIGNALS: #endif protected Q_SLOTS: - void setupViewport(QWidget *widget) Q_DECL_OVERRIDE; + void setupViewport(QWidget *widget) override; protected: - QGraphicsView(QGraphicsViewPrivate &, QWidget *parent = Q_NULLPTR); - bool event(QEvent *event) Q_DECL_OVERRIDE; - bool viewportEvent(QEvent *event) Q_DECL_OVERRIDE; + QGraphicsView(QGraphicsViewPrivate &, QWidget *parent = nullptr); + bool event(QEvent *event) override; + bool viewportEvent(QEvent *event) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *event) override; #endif #if QT_CONFIG(draganddrop) - void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *event) Q_DECL_OVERRIDE; - void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dropEvent(QDropEvent *event) override; #endif - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) override; + bool focusNextPrevChild(bool next) override; + void focusOutEvent(QFocusEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *event) override; #endif - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void scrollContentsBy(int dx, int dy) override; + void showEvent(QShowEvent *event) override; + void inputMethodEvent(QInputMethodEvent *event) override; virtual void drawBackground(QPainter *painter, const QRectF &rect); virtual void drawForeground(QPainter *painter, const QRectF &rect); diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp index c658e40a9e..4108dd803a 100644 --- a/src/widgets/graphicsview/qgraphicswidget.cpp +++ b/src/widgets/graphicsview/qgraphicswidget.cpp @@ -276,7 +276,7 @@ QGraphicsWidget::~QGraphicsWidget() // Unset the parent here, when we're still a QGraphicsWidget. // It is otherwise done in ~QGraphicsItem() where we'd be // calling QGraphicsWidget members on an ex-QGraphicsWidget object - setParentItem(Q_NULLPTR); + setParentItem(nullptr); } /*! diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h index 831511d14a..481fb55db3 100644 --- a/src/widgets/graphicsview/qgraphicswidget.h +++ b/src/widgets/graphicsview/qgraphicswidget.h @@ -80,7 +80,7 @@ class Q_WIDGETS_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphic Q_PROPERTY(bool autoFillBackground READ autoFillBackground WRITE setAutoFillBackground) Q_PROPERTY(QGraphicsLayout* layout READ layout WRITE setLayout NOTIFY layoutChanged) public: - QGraphicsWidget(QGraphicsItem *parent = Q_NULLPTR, Qt::WindowFlags wFlags = Qt::WindowFlags()); + QGraphicsWidget(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = Qt::WindowFlags()); ~QGraphicsWidget(); QGraphicsLayout *layout() const; void setLayout(QGraphicsLayout *layout); @@ -106,12 +106,12 @@ public: inline void resize(qreal w, qreal h) { resize(QSizeF(w, h)); } QSizeF size() const; - void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; + void setGeometry(const QRectF &rect) override; inline void setGeometry(qreal x, qreal y, qreal w, qreal h); inline QRectF rect() const { return QRectF(QPointF(), size()); } void setContentsMargins(qreal left, qreal top, qreal right, qreal bottom); - void getContentsMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const Q_DECL_OVERRIDE; + void getContentsMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const override; void setWindowFrameMargins(qreal left, qreal top, qreal right, qreal bottom); void getWindowFrameMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const; @@ -161,12 +161,12 @@ public: enum { Type = 11 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE; - virtual void paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR); - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; + virtual void paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr); + QRectF boundingRect() const override; + QPainterPath shape() const override; #if 0 void dumpFocusChain(); @@ -184,28 +184,28 @@ public Q_SLOTS: protected: virtual void initStyleOption(QStyleOption *option) const; - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; - void updateGeometry() Q_DECL_OVERRIDE; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; + void updateGeometry() override; // Notification - QVariant itemChange(GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; virtual QVariant propertyChange(const QString &propertyName, const QVariant &value); // Scene events - bool sceneEvent(QEvent *event) Q_DECL_OVERRIDE; + bool sceneEvent(QEvent *event) override; virtual bool windowFrameEvent(QEvent *e); virtual Qt::WindowFrameSection windowFrameSectionAt(const QPointF& pos) const; // Base event handlers - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; //virtual void actionEvent(QActionEvent *event); virtual void changeEvent(QEvent *event); virtual void closeEvent(QCloseEvent *event); //void create(WId window = 0, bool initializeWindow = true, bool destroyOldWindow = true); //void destroy(bool destroyWindow = true, bool destroySubWindows = true); - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) override; virtual bool focusNextPrevChild(bool next); - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent *event) override; virtual void hideEvent(QHideEvent *event); //virtual int metric(PaintDeviceMetric m ) const; virtual void moveEvent(QGraphicsSceneMoveEvent *event); @@ -214,8 +214,8 @@ protected: virtual void resizeEvent(QGraphicsSceneResizeEvent *event); virtual void showEvent(QShowEvent *event); //virtual void tabletEvent(QTabletEvent *event); - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; + virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; + virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; virtual void grabMouseEvent(QEvent *event); virtual void ungrabMouseEvent(QEvent *event); virtual void grabKeyboardEvent(QEvent *event); diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h index 0fb9fbba07..505a2a24c0 100644 --- a/src/widgets/graphicsview/qgraphicswidget_p.h +++ b/src/widgets/graphicsview/qgraphicswidget_p.h @@ -94,13 +94,13 @@ public: QPalette palette; uint inheritedPaletteResolveMask; void setPalette_helper(const QPalette &palette); - void resolvePalette(uint inheritedMask) Q_DECL_OVERRIDE; + void resolvePalette(uint inheritedMask) override; void updatePalette(const QPalette &palette); QPalette naturalWidgetPalette() const; QFont font; uint inheritedFontResolveMask; void setFont_helper(const QFont &font); - void resolveFont(uint inheritedMask) Q_DECL_OVERRIDE; + void resolveFont(uint inheritedMask) override; void updateFont(const QFont &font); QFont naturalWidgetFont() const; @@ -115,13 +115,13 @@ public: bool hasDecoration() const; // Private Properties - qreal width() const Q_DECL_OVERRIDE; - void setWidth(qreal) Q_DECL_OVERRIDE; - void resetWidth() Q_DECL_OVERRIDE; + qreal width() const override; + void setWidth(qreal) override; + void resetWidth() override; - qreal height() const Q_DECL_OVERRIDE; - void setHeight(qreal) Q_DECL_OVERRIDE; - void resetHeight() Q_DECL_OVERRIDE; + qreal height() const override; + void setHeight(qreal) override; + void resetHeight() override; void setGeometryFromSetPos(); // State diff --git a/src/widgets/itemviews/qabstractitemdelegate.h b/src/widgets/itemviews/qabstractitemdelegate.h index 9b6bde1c87..575728e806 100644 --- a/src/widgets/itemviews/qabstractitemdelegate.h +++ b/src/widgets/itemviews/qabstractitemdelegate.h @@ -69,7 +69,7 @@ public: RevertModelCache }; - explicit QAbstractItemDelegate(QObject *parent = Q_NULLPTR); + explicit QAbstractItemDelegate(QObject *parent = nullptr); virtual ~QAbstractItemDelegate(); // painting @@ -119,7 +119,7 @@ Q_SIGNALS: void sizeHintChanged(const QModelIndex &); protected: - QAbstractItemDelegate(QObjectPrivate &, QObject *parent = Q_NULLPTR); + QAbstractItemDelegate(QObjectPrivate &, QObject *parent = nullptr); private: Q_DECLARE_PRIVATE(QAbstractItemDelegate) Q_DISABLE_COPY(QAbstractItemDelegate) diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index 6a007da348..96745a84ea 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -124,7 +124,7 @@ public: }; Q_ENUM(ScrollMode) - explicit QAbstractItemView(QWidget *parent = Q_NULLPTR); + explicit QAbstractItemView(QWidget *parent = nullptr); ~QAbstractItemView(); virtual void setModel(QAbstractItemModel *model); @@ -225,7 +225,7 @@ public: QAbstractItemDelegate *itemDelegate(const QModelIndex &index) const; - virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; + virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const override; using QAbstractScrollArea::update; @@ -270,7 +270,7 @@ Q_SIGNALS: void iconSizeChanged(const QSize &size); protected: - QAbstractItemView(QAbstractItemViewPrivate &, QWidget *parent = Q_NULLPTR); + QAbstractItemView(QAbstractItemViewPrivate &, QWidget *parent = nullptr); void setHorizontalStepsPerItem(int steps); int horizontalStepsPerItem() const; @@ -295,7 +295,7 @@ protected: virtual bool edit(const QModelIndex &index, EditTrigger trigger, QEvent *event); virtual QItemSelectionModel::SelectionFlags selectionCommand(const QModelIndex &index, - const QEvent *event = Q_NULLPTR) const; + const QEvent *event = nullptr) const; #ifndef QT_NO_DRAGANDDROP virtual void startDrag(Qt::DropActions supportedActions); @@ -327,32 +327,32 @@ protected: void stopAutoScroll(); void doAutoScroll(); - bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; - bool viewportEvent(QEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + bool focusNextPrevChild(bool next) override; + bool event(QEvent *event) override; + bool viewportEvent(QEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; - void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *event) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; + void dropEvent(QDropEvent *event) override; #endif - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; - void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) override; + void focusOutEvent(QFocusEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void timerEvent(QTimerEvent *event) override; + void inputMethodEvent(QInputMethodEvent *event) override; #ifndef QT_NO_DRAGANDDROP enum DropIndicatorPosition { OnItem, AboveItem, BelowItem, OnViewport }; DropIndicatorPosition dropIndicatorPosition() const; #endif - QSize viewportSizeHint() const Q_DECL_OVERRIDE; + QSize viewportSizeHint() const override; private: Q_DECLARE_PRIVATE(QAbstractItemView) diff --git a/src/widgets/itemviews/qcolumnview.h b/src/widgets/itemviews/qcolumnview.h index 42eac7426a..5c62f9c9af 100644 --- a/src/widgets/itemviews/qcolumnview.h +++ b/src/widgets/itemviews/qcolumnview.h @@ -58,18 +58,18 @@ Q_SIGNALS: void updatePreviewWidget(const QModelIndex &index); public: - explicit QColumnView(QWidget *parent = Q_NULLPTR); + explicit QColumnView(QWidget *parent = nullptr); ~QColumnView(); // QAbstractItemView overloads - QModelIndex indexAt(const QPoint &point) const Q_DECL_OVERRIDE; - void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; - QRect visualRect(const QModelIndex &index) const Q_DECL_OVERRIDE; - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; - void setSelectionModel(QItemSelectionModel * selectionModel) Q_DECL_OVERRIDE; - void setRootIndex(const QModelIndex &index) Q_DECL_OVERRIDE; - void selectAll() Q_DECL_OVERRIDE; + QModelIndex indexAt(const QPoint &point) const override; + void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override; + QSize sizeHint() const override; + QRect visualRect(const QModelIndex &index) const override; + void setModel(QAbstractItemModel *model) override; + void setSelectionModel(QItemSelectionModel * selectionModel) override; + void setRootIndex(const QModelIndex &index) override; + void selectAll() override; // QColumnView functions void setResizeGripsVisible(bool visible); @@ -82,21 +82,21 @@ public: QList<int> columnWidths() const; protected: - QColumnView(QColumnViewPrivate &dd, QWidget *parent = Q_NULLPTR); + QColumnView(QColumnViewPrivate &dd, QWidget *parent = nullptr); // QAbstractItemView overloads - bool isIndexHidden(const QModelIndex &index) const Q_DECL_OVERRIDE; - QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void setSelection(const QRect & rect, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE; - QRegion visualRegionForSelection(const QItemSelection &selection) const Q_DECL_OVERRIDE; - int horizontalOffset() const Q_DECL_OVERRIDE; - int verticalOffset() const Q_DECL_OVERRIDE; - void rowsInserted(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; - void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) Q_DECL_OVERRIDE; + bool isIndexHidden(const QModelIndex &index) const override; + QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override; + void resizeEvent(QResizeEvent *event) override; + void setSelection(const QRect & rect, QItemSelectionModel::SelectionFlags command) override; + QRegion visualRegionForSelection(const QItemSelection &selection) const override; + int horizontalOffset() const override; + int verticalOffset() const override; + void rowsInserted(const QModelIndex &parent, int start, int end) override; + void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override; // QColumnView functions - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + void scrollContentsBy(int dx, int dy) override; virtual QAbstractItemView* createColumn(const QModelIndex &rootIndex); void initializeColumn(QAbstractItemView *column) const; diff --git a/src/widgets/itemviews/qcolumnview_p.h b/src/widgets/itemviews/qcolumnview_p.h index fa276075fe..850ab02747 100644 --- a/src/widgets/itemviews/qcolumnview_p.h +++ b/src/widgets/itemviews/qcolumnview_p.h @@ -80,7 +80,7 @@ public: setMinimumWidth(previewWidget->minimumWidth()); } - void resizeEvent(QResizeEvent * event) Q_DECL_OVERRIDE{ + void resizeEvent(QResizeEvent * event) override{ if (!previewWidget) return; previewWidget->resize( @@ -96,7 +96,7 @@ public: QAbstractScrollArea::resizeEvent(event); } - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE + void scrollContentsBy(int dx, int dy) override { if (!previewWidget) return; @@ -106,36 +106,36 @@ public: QAbstractItemView::scrollContentsBy(dx, dy); } - QRect visualRect(const QModelIndex &) const Q_DECL_OVERRIDE + QRect visualRect(const QModelIndex &) const override { return QRect(); } - void scrollTo(const QModelIndex &, ScrollHint) Q_DECL_OVERRIDE + void scrollTo(const QModelIndex &, ScrollHint) override { } - QModelIndex indexAt(const QPoint &) const Q_DECL_OVERRIDE + QModelIndex indexAt(const QPoint &) const override { return QModelIndex(); } - QModelIndex moveCursor(CursorAction, Qt::KeyboardModifiers) Q_DECL_OVERRIDE + QModelIndex moveCursor(CursorAction, Qt::KeyboardModifiers) override { return QModelIndex(); } - int horizontalOffset () const Q_DECL_OVERRIDE { + int horizontalOffset () const override { return 0; } - int verticalOffset () const Q_DECL_OVERRIDE { + int verticalOffset () const override { return 0; } - QRegion visualRegionForSelection(const QItemSelection &) const Q_DECL_OVERRIDE + QRegion visualRegionForSelection(const QItemSelection &) const override { return QRegion(); } - bool isIndexHidden(const QModelIndex &) const Q_DECL_OVERRIDE + bool isIndexHidden(const QModelIndex &) const override { return false; } - void setSelection(const QRect &, QItemSelectionModel::SelectionFlags) Q_DECL_OVERRIDE + void setSelection(const QRect &, QItemSelectionModel::SelectionFlags) override { } private: @@ -163,7 +163,7 @@ public: void _q_gripMoved(int offset); void _q_changeCurrentColumn(); void _q_clicked(const QModelIndex &index); - void _q_columnsInserted(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; + void _q_columnsInserted(const QModelIndex &parent, int start, int end) override; QList<QAbstractItemView*> columns; QVector<int> columnSizes; // used during init and corner moving @@ -188,7 +188,7 @@ public: void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; }; QT_END_NAMESPACE diff --git a/src/widgets/itemviews/qcolumnviewgrip_p.h b/src/widgets/itemviews/qcolumnviewgrip_p.h index 16c0aefada..7e2793074b 100644 --- a/src/widgets/itemviews/qcolumnviewgrip_p.h +++ b/src/widgets/itemviews/qcolumnviewgrip_p.h @@ -74,11 +74,11 @@ public: protected: QColumnViewGrip(QColumnViewGripPrivate &, QWidget *parent = 0, Qt::WindowFlags f = 0); - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; private: Q_DECLARE_PRIVATE(QColumnViewGrip) diff --git a/src/widgets/itemviews/qdatawidgetmapper.h b/src/widgets/itemviews/qdatawidgetmapper.h index 7d4d61378a..2d75b63a5e 100644 --- a/src/widgets/itemviews/qdatawidgetmapper.h +++ b/src/widgets/itemviews/qdatawidgetmapper.h @@ -61,7 +61,7 @@ class Q_WIDGETS_EXPORT QDataWidgetMapper: public QObject Q_PROPERTY(SubmitPolicy submitPolicy READ submitPolicy WRITE setSubmitPolicy) public: - explicit QDataWidgetMapper(QObject *parent = Q_NULLPTR); + explicit QDataWidgetMapper(QObject *parent = nullptr); ~QDataWidgetMapper(); void setModel(QAbstractItemModel *model); diff --git a/src/widgets/itemviews/qdirmodel.h b/src/widgets/itemviews/qdirmodel.h index 30810cf4f6..ab91bbd763 100644 --- a/src/widgets/itemviews/qdirmodel.h +++ b/src/widgets/itemviews/qdirmodel.h @@ -66,31 +66,31 @@ public: }; QDirModel(const QStringList &nameFilters, QDir::Filters filters, - QDir::SortFlags sort, QObject *parent = Q_NULLPTR); - explicit QDirModel(QObject *parent = Q_NULLPTR); + QDir::SortFlags sort, QObject *parent = nullptr); + explicit QDirModel(QObject *parent = nullptr); ~QDirModel(); - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - bool hasChildren(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + bool hasChildren(const QModelIndex &index = QModelIndex()) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; - void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_OVERRIDE; + void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; - QStringList mimeTypes() const Q_DECL_OVERRIDE; - QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; bool dropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; - Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + int row, int column, const QModelIndex &parent) override; + Qt::DropActions supportedDropActions() const override; // QDirModel specific API @@ -133,7 +133,7 @@ public Q_SLOTS: void refresh(const QModelIndex &parent = QModelIndex()); protected: - QDirModel(QDirModelPrivate &, QObject *parent = Q_NULLPTR); + QDirModel(QDirModelPrivate &, QObject *parent = nullptr); friend class QFileDialogPrivate; private: diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h index ec4500d81e..b6554c0730 100644 --- a/src/widgets/itemviews/qheaderview.h +++ b/src/widgets/itemviews/qheaderview.h @@ -74,16 +74,16 @@ public: }; Q_ENUM(ResizeMode) - explicit QHeaderView(Qt::Orientation orientation, QWidget *parent = Q_NULLPTR); + explicit QHeaderView(Qt::Orientation orientation, QWidget *parent = nullptr); virtual ~QHeaderView(); - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; + void setModel(QAbstractItemModel *model) override; Qt::Orientation orientation() const; int offset() const; int length() const; - QSize sizeHint() const Q_DECL_OVERRIDE; - void setVisible(bool v) Q_DECL_OVERRIDE; + QSize sizeHint() const override; + void setVisible(bool v) override; int sectionSizeHint(int logicalIndex) const; int visualIndexAt(int position) const; @@ -172,7 +172,7 @@ public: Qt::Alignment defaultAlignment() const; void setDefaultAlignment(Qt::Alignment alignment); - void doItemsLayout() Q_DECL_OVERRIDE; + void doItemsLayout() override; bool sectionsMoved() const; bool sectionsHidden() const; @@ -181,7 +181,7 @@ public: bool restoreState(const QByteArray &state); #endif - void reset() Q_DECL_OVERRIDE; + void reset() override; public Q_SLOTS: void setOffset(int offset); @@ -208,41 +208,41 @@ protected Q_SLOTS: void sectionsAboutToBeRemoved(const QModelIndex &parent, int logicalFirst, int logicalLast); protected: - QHeaderView(QHeaderViewPrivate &dd, Qt::Orientation orientation, QWidget *parent = Q_NULLPTR); + QHeaderView(QHeaderViewPrivate &dd, Qt::Orientation orientation, QWidget *parent = nullptr); void initialize(); void initializeSections(); void initializeSections(int start, int end); - void currentChanged(const QModelIndex ¤t, const QModelIndex &old) Q_DECL_OVERRIDE; + void currentChanged(const QModelIndex ¤t, const QModelIndex &old) override; - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - bool viewportEvent(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void mouseDoubleClickEvent(QMouseEvent *e) override; + bool viewportEvent(QEvent *e) override; virtual void paintSection(QPainter *painter, const QRect &rect, int logicalIndex) const; virtual QSize sectionSizeFromContents(int logicalIndex) const; - int horizontalOffset() const Q_DECL_OVERRIDE; - int verticalOffset() const Q_DECL_OVERRIDE; - void updateGeometries() Q_DECL_OVERRIDE; - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + int horizontalOffset() const override; + int verticalOffset() const override; + void updateGeometries() override; + void scrollContentsBy(int dx, int dy) override; - void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>()) Q_DECL_OVERRIDE; - void rowsInserted(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>()) override; + void rowsInserted(const QModelIndex &parent, int start, int end) override; - QRect visualRect(const QModelIndex &index) const Q_DECL_OVERRIDE; - void scrollTo(const QModelIndex &index, ScrollHint hint) Q_DECL_OVERRIDE; + QRect visualRect(const QModelIndex &index) const override; + void scrollTo(const QModelIndex &index, ScrollHint hint) override; - QModelIndex indexAt(const QPoint &p) const Q_DECL_OVERRIDE; - bool isIndexHidden(const QModelIndex &index) const Q_DECL_OVERRIDE; + QModelIndex indexAt(const QPoint &p) const override; + bool isIndexHidden(const QModelIndex &index) const override; - QModelIndex moveCursor(CursorAction, Qt::KeyboardModifiers) Q_DECL_OVERRIDE; - void setSelection(const QRect& rect, QItemSelectionModel::SelectionFlags flags) Q_DECL_OVERRIDE; - QRegion visualRegionForSelection(const QItemSelection &selection) const Q_DECL_OVERRIDE; + QModelIndex moveCursor(CursorAction, Qt::KeyboardModifiers) override; + void setSelection(const QRect& rect, QItemSelectionModel::SelectionFlags flags) override; + QRegion visualRegionForSelection(const QItemSelection &selection) const override; void initStyleOption(QStyleOptionHeader *option) const; friend class QTableView; diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index d9caebec8a..df5f9afb0e 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -94,10 +94,7 @@ public: inline static QString replaceNewLine(QString text) { - const QChar nl = QLatin1Char('\n'); - for (int i = 0; i < text.count(); ++i) - if (text.at(i) == nl) - text[i] = QChar::LineSeparator; + text.replace(QLatin1Char('\n'), QChar::LineSeparator); return text; } diff --git a/src/widgets/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h index 21594327ef..539dec4374 100644 --- a/src/widgets/itemviews/qitemdelegate.h +++ b/src/widgets/itemviews/qitemdelegate.h @@ -59,7 +59,7 @@ class Q_WIDGETS_EXPORT QItemDelegate : public QAbstractItemDelegate Q_PROPERTY(bool clipping READ hasClipping WRITE setClipping) public: - explicit QItemDelegate(QObject *parent = Q_NULLPTR); + explicit QItemDelegate(QObject *parent = nullptr); ~QItemDelegate(); bool hasClipping() const; @@ -68,21 +68,21 @@ public: // painting void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; // editing QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; - void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE; - void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const Q_DECL_OVERRIDE; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; + void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; // editor factory QItemEditorFactory *itemEditorFactory() const; @@ -105,9 +105,9 @@ protected: QRect rect(const QStyleOptionViewItem &option, const QModelIndex &index, int role) const; - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; bool editorEvent(QEvent *event, QAbstractItemModel *model, - const QStyleOptionViewItem &option, const QModelIndex &index) Q_DECL_OVERRIDE; + const QStyleOptionViewItem &option, const QModelIndex &index) override; QStyleOptionViewItem setOptions(const QModelIndex &index, const QStyleOptionViewItem &option) const; diff --git a/src/widgets/itemviews/qitemeditorfactory.cpp b/src/widgets/itemviews/qitemeditorfactory.cpp index b580f0e840..1d8e03569d 100644 --- a/src/widgets/itemviews/qitemeditorfactory.cpp +++ b/src/widgets/itemviews/qitemeditorfactory.cpp @@ -233,8 +233,8 @@ class QDefaultItemEditorFactory : public QItemEditorFactory { public: inline QDefaultItemEditorFactory() {} - QWidget *createEditor(int userType, QWidget *parent) const Q_DECL_OVERRIDE; - QByteArray valuePropertyName(int) const Q_DECL_OVERRIDE; + QWidget *createEditor(int userType, QWidget *parent) const override; + QByteArray valuePropertyName(int) const override; }; QWidget *QDefaultItemEditorFactory::createEditor(int userType, QWidget *parent) const diff --git a/src/widgets/itemviews/qitemeditorfactory_p.h b/src/widgets/itemviews/qitemeditorfactory_p.h index 46a8da1d8f..e78f42b729 100644 --- a/src/widgets/itemviews/qitemeditorfactory_p.h +++ b/src/widgets/itemviews/qitemeditorfactory_p.h @@ -74,7 +74,7 @@ public: } protected: - void changeEvent(QEvent *e) Q_DECL_OVERRIDE; + void changeEvent(QEvent *e) override; public Q_SLOTS: void resizeToContents(); diff --git a/src/widgets/itemviews/qlistview.h b/src/widgets/itemviews/qlistview.h index 66ec9b18b1..2da510facf 100644 --- a/src/widgets/itemviews/qlistview.h +++ b/src/widgets/itemviews/qlistview.h @@ -78,7 +78,7 @@ public: enum ViewMode { ListMode, IconMode }; Q_ENUM(ViewMode) - explicit QListView(QWidget *parent = Q_NULLPTR); + explicit QListView(QWidget *parent = nullptr); ~QListView(); void setMovement(Movement movement); @@ -125,67 +125,67 @@ public: void setSelectionRectVisible(bool show); bool isSelectionRectVisible() const; - QRect visualRect(const QModelIndex &index) const Q_DECL_OVERRIDE; - void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) Q_DECL_OVERRIDE; - QModelIndex indexAt(const QPoint &p) const Q_DECL_OVERRIDE; + QRect visualRect(const QModelIndex &index) const override; + void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override; + QModelIndex indexAt(const QPoint &p) const override; - void doItemsLayout() Q_DECL_OVERRIDE; - void reset() Q_DECL_OVERRIDE; - void setRootIndex(const QModelIndex &index) Q_DECL_OVERRIDE; + void doItemsLayout() override; + void reset() override; + void setRootIndex(const QModelIndex &index) override; Q_SIGNALS: void indexesMoved(const QModelIndexList &indexes); protected: - QListView(QListViewPrivate &, QWidget *parent = Q_NULLPTR); + QListView(QListViewPrivate &, QWidget *parent = nullptr); - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + void scrollContentsBy(int dx, int dy) override; void resizeContents(int width, int height); QSize contentsSize() const; - void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>()) Q_DECL_OVERRIDE; - void rowsInserted(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; - void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>()) override; + void rowsInserted(const QModelIndex &parent, int start, int end) override; + void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *e) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *e) override; #endif - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *e) override; + void resizeEvent(QResizeEvent *e) override; #ifndef QT_NO_DRAGANDDROP - void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE; - void startDrag(Qt::DropActions supportedActions) Q_DECL_OVERRIDE; + void dragMoveEvent(QDragMoveEvent *e) override; + void dragLeaveEvent(QDragLeaveEvent *e) override; + void dropEvent(QDropEvent *e) override; + void startDrag(Qt::DropActions supportedActions) override; #endif // QT_NO_DRAGANDDROP - QStyleOptionViewItem viewOptions() const Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + QStyleOptionViewItem viewOptions() const override; + void paintEvent(QPaintEvent *e) override; - int horizontalOffset() const Q_DECL_OVERRIDE; - int verticalOffset() const Q_DECL_OVERRIDE; - QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; + int horizontalOffset() const override; + int verticalOffset() const override; + QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override; QRect rectForIndex(const QModelIndex &index) const; void setPositionForIndex(const QPoint &position, const QModelIndex &index); - void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE; - QRegion visualRegionForSelection(const QItemSelection &selection) const Q_DECL_OVERRIDE; - QModelIndexList selectedIndexes() const Q_DECL_OVERRIDE; + void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) override; + QRegion visualRegionForSelection(const QItemSelection &selection) const override; + QModelIndexList selectedIndexes() const override; - void updateGeometries() Q_DECL_OVERRIDE; + void updateGeometries() override; - bool isIndexHidden(const QModelIndex &index) const Q_DECL_OVERRIDE; + bool isIndexHidden(const QModelIndex &index) const override; - void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) Q_DECL_OVERRIDE; - void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) Q_DECL_OVERRIDE; + void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) override; + void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override; - QSize viewportSizeHint() const Q_DECL_OVERRIDE; + QSize viewportSizeHint() const override; private: int visualIndex(const QModelIndex &index) const; diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp index 95ad3f82d0..c14dcec744 100644 --- a/src/widgets/itemviews/qlistwidget.cpp +++ b/src/widgets/itemviews/qlistwidget.cpp @@ -189,8 +189,9 @@ int QListModel::rowCount(const QModelIndex &parent) const return parent.isValid() ? 0 : items.count(); } -QModelIndex QListModel::index(QListWidgetItem *item) const +QModelIndex QListModel::index(const QListWidgetItem *item_) const { + QListWidgetItem *item = const_cast<QListWidgetItem *>(item_); if (!item || !item->view || static_cast<const QListModel *>(item->view->model()) != this || items.isEmpty()) return QModelIndex(); @@ -1942,14 +1943,28 @@ QList<QListWidgetItem*> QListWidget::items(const QMimeData *data) const /*! Returns the QModelIndex associated with the given \a item. + + \note In Qt versions prior to 5.10, this function took a non-\c{const} \a item. */ -QModelIndex QListWidget::indexFromItem(QListWidgetItem *item) const +QModelIndex QListWidget::indexFromItem(const QListWidgetItem *item) const { Q_D(const QListWidget); return d->listModel()->index(item); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +/*! + \internal + \obsolete + \overload +*/ +QModelIndex QListWidget::indexFromItem(QListWidgetItem *item) const +{ + return indexFromItem(const_cast<const QListWidgetItem *>(item)); +} +#endif + /*! Returns a pointer to the QListWidgetItem associated with the given \a index. */ diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index 50f4e2ac84..3caa5ce6f2 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -61,10 +61,10 @@ class Q_WIDGETS_EXPORT QListWidgetItem friend class QListWidget; public: enum ItemType { Type = 0, UserType = 1000 }; - explicit QListWidgetItem(QListWidget *view = Q_NULLPTR, int type = Type); - explicit QListWidgetItem(const QString &text, QListWidget *view = Q_NULLPTR, int type = Type); + explicit QListWidgetItem(QListWidget *view = nullptr, int type = Type); + explicit QListWidgetItem(const QString &text, QListWidget *view = nullptr, int type = Type); explicit QListWidgetItem(const QIcon &icon, const QString &text, - QListWidget *view = Q_NULLPTR, int type = Type); + QListWidget *view = nullptr, int type = Type); QListWidgetItem(const QListWidgetItem &other); virtual ~QListWidgetItem(); @@ -204,10 +204,10 @@ class Q_WIDGETS_EXPORT QListWidget : public QListView friend class QListWidgetItem; friend class QListModel; public: - explicit QListWidget(QWidget *parent = Q_NULLPTR); + explicit QListWidget(QWidget *parent = nullptr); ~QListWidget(); - void setSelectionModel(QItemSelectionModel *selectionModel) Q_DECL_OVERRIDE; + void setSelectionModel(QItemSelectionModel *selectionModel) override; QListWidgetItem *item(int row) const; int row(const QListWidgetItem *item) const; @@ -257,7 +257,7 @@ public: protected: #endif #if QT_CONFIG(draganddrop) - void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; + void dropEvent(QDropEvent *event) override; #endif public Q_SLOTS: void scrollToItem(const QListWidgetItem *item, QAbstractItemView::ScrollHint hint = EnsureVisible); @@ -278,7 +278,7 @@ Q_SIGNALS: void itemSelectionChanged(); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; virtual QStringList mimeTypes() const; #if QT_VERSION >= QT_VERSION_CHECK(6,0,0) virtual QMimeData *mimeData(const QList<QListWidgetItem *> &items) const; @@ -297,11 +297,14 @@ protected: #endif QList<QListWidgetItem*> items(const QMimeData *data) const; - QModelIndex indexFromItem(QListWidgetItem *item) const; + QModelIndex indexFromItem(const QListWidgetItem *item) const; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QModelIndex indexFromItem(QListWidgetItem *item) const; // ### Qt 6: remove +#endif QListWidgetItem *itemFromIndex(const QModelIndex &index) const; private: - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; + void setModel(QAbstractItemModel *model) override; Qt::SortOrder sortOrder() const; Q_DECLARE_PRIVATE(QListWidget) @@ -319,7 +322,7 @@ private: }; inline void QListWidget::removeItemWidget(QListWidgetItem *aItem) -{ setItemWidget(aItem, Q_NULLPTR); } +{ setItemWidget(aItem, nullptr); } inline void QListWidget::addItem(QListWidgetItem *aitem) { insertItem(count(), aitem); } diff --git a/src/widgets/itemviews/qlistwidget_p.h b/src/widgets/itemviews/qlistwidget_p.h index e8f5540f9c..492b05ff07 100644 --- a/src/widgets/itemviews/qlistwidget_p.h +++ b/src/widgets/itemviews/qlistwidget_p.h @@ -95,7 +95,7 @@ public: int rowCount(const QModelIndex &parent = QModelIndex()) const override; - QModelIndex index(QListWidgetItem *item) const; + QModelIndex index(const QListWidgetItem *item) const; QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; diff --git a/src/widgets/itemviews/qstyleditemdelegate.h b/src/widgets/itemviews/qstyleditemdelegate.h index f3b7c4d1f4..2df2450f07 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.h +++ b/src/widgets/itemviews/qstyleditemdelegate.h @@ -58,28 +58,28 @@ class Q_WIDGETS_EXPORT QStyledItemDelegate : public QAbstractItemDelegate Q_OBJECT public: - explicit QStyledItemDelegate(QObject *parent = Q_NULLPTR); + explicit QStyledItemDelegate(QObject *parent = nullptr); ~QStyledItemDelegate(); // painting void paint(QPainter *painter, - const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; + const QStyleOptionViewItem &option, const QModelIndex &index) const override; QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; // editing QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; - void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; void setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; // editor factory QItemEditorFactory *itemEditorFactory() const; @@ -91,9 +91,9 @@ protected: virtual void initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const; - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; bool editorEvent(QEvent *event, QAbstractItemModel *model, - const QStyleOptionViewItem &option, const QModelIndex &index) Q_DECL_OVERRIDE; + const QStyleOptionViewItem &option, const QModelIndex &index) override; private: Q_DECLARE_PRIVATE(QStyledItemDelegate) diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp index 2d5813198c..d42ed0ad19 100644 --- a/src/widgets/itemviews/qtableview.cpp +++ b/src/widgets/itemviews/qtableview.cpp @@ -585,7 +585,7 @@ class QTableCornerButton : public QAbstractButton Q_OBJECT public: QTableCornerButton(QWidget *parent) : QAbstractButton(parent) {} - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE { + void paintEvent(QPaintEvent*) override { QStyleOptionHeader opt; opt.init(this); QStyle::State state = QStyle::State_None; diff --git a/src/widgets/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h index 75f2e7b44c..60c2f34103 100644 --- a/src/widgets/itemviews/qtableview.h +++ b/src/widgets/itemviews/qtableview.h @@ -62,13 +62,13 @@ class Q_WIDGETS_EXPORT QTableView : public QAbstractItemView #endif public: - explicit QTableView(QWidget *parent = Q_NULLPTR); + explicit QTableView(QWidget *parent = nullptr); ~QTableView(); - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; - void setRootIndex(const QModelIndex &index) Q_DECL_OVERRIDE; - void setSelectionModel(QItemSelectionModel *selectionModel) Q_DECL_OVERRIDE; - void doItemsLayout() Q_DECL_OVERRIDE; + void setModel(QAbstractItemModel *model) override; + void setRootIndex(const QModelIndex &index) override; + void setSelectionModel(QItemSelectionModel *selectionModel) override; + void doItemsLayout() override; QHeaderView *horizontalHeader() const; QHeaderView *verticalHeader() const; @@ -109,9 +109,9 @@ public: bool isCornerButtonEnabled() const; #endif - QRect visualRect(const QModelIndex &index) const Q_DECL_OVERRIDE; - void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) Q_DECL_OVERRIDE; - QModelIndex indexAt(const QPoint &p) const Q_DECL_OVERRIDE; + QRect visualRect(const QModelIndex &index) const override; + void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override; + QModelIndex indexAt(const QPoint &p) const override; void setSpan(int row, int column, int rowSpan, int columnSpan); int rowSpan(int row, int column) const; @@ -144,37 +144,37 @@ protected Q_SLOTS: protected: QTableView(QTableViewPrivate &, QWidget *parent); - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + void scrollContentsBy(int dx, int dy) override; - QStyleOptionViewItem viewOptions() const Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + QStyleOptionViewItem viewOptions() const override; + void paintEvent(QPaintEvent *e) override; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; - int horizontalOffset() const Q_DECL_OVERRIDE; - int verticalOffset() const Q_DECL_OVERRIDE; - QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; + int horizontalOffset() const override; + int verticalOffset() const override; + QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override; - void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE; - QRegion visualRegionForSelection(const QItemSelection &selection) const Q_DECL_OVERRIDE; - QModelIndexList selectedIndexes() const Q_DECL_OVERRIDE; + void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) override; + QRegion visualRegionForSelection(const QItemSelection &selection) const override; + QModelIndexList selectedIndexes() const override; - void updateGeometries() Q_DECL_OVERRIDE; + void updateGeometries() override; - QSize viewportSizeHint() const Q_DECL_OVERRIDE; + QSize viewportSizeHint() const override; - int sizeHintForRow(int row) const Q_DECL_OVERRIDE; - int sizeHintForColumn(int column) const Q_DECL_OVERRIDE; + int sizeHintForRow(int row) const override; + int sizeHintForColumn(int column) const override; - void verticalScrollbarAction(int action) Q_DECL_OVERRIDE; - void horizontalScrollbarAction(int action) Q_DECL_OVERRIDE; + void verticalScrollbarAction(int action) override; + void horizontalScrollbarAction(int action) override; - bool isIndexHidden(const QModelIndex &index) const Q_DECL_OVERRIDE; + bool isIndexHidden(const QModelIndex &index) const override; void selectionChanged(const QItemSelection &selected, - const QItemSelection &deselected) Q_DECL_OVERRIDE; + const QItemSelection &deselected) override; void currentChanged(const QModelIndex ¤t, - const QModelIndex &previous) Q_DECL_OVERRIDE; + const QModelIndex &previous) override; private: friend class QAccessibleItemView; diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp index bb1970e3ac..a0c01e2f25 100644 --- a/src/widgets/itemviews/qtablewidget.cpp +++ b/src/widgets/itemviews/qtablewidget.cpp @@ -2652,14 +2652,28 @@ QList<QTableWidgetItem*> QTableWidget::items(const QMimeData *data) const /*! Returns the QModelIndex associated with the given \a item. + + \note In Qt versions prior to 5.10, this function took a non-\c{const} \a item. */ -QModelIndex QTableWidget::indexFromItem(QTableWidgetItem *item) const +QModelIndex QTableWidget::indexFromItem(const QTableWidgetItem *item) const { Q_D(const QTableWidget); return d->tableModel()->index(item); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +/*! + \internal + \obsolete + \overload +*/ +QModelIndex QTableWidget::indexFromItem(QTableWidgetItem *item) const +{ + return indexFromItem(const_cast<const QTableWidgetItem *>(item)); +} +#endif + /*! Returns a pointer to the QTableWidgetItem associated with the given \a index. */ diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index 9c231d5127..7322e3aed7 100644 --- a/src/widgets/itemviews/qtablewidget.h +++ b/src/widgets/itemviews/qtablewidget.h @@ -219,8 +219,8 @@ class Q_WIDGETS_EXPORT QTableWidget : public QTableView friend class QTableModel; public: - explicit QTableWidget(QWidget *parent = Q_NULLPTR); - QTableWidget(int rows, int columns, QWidget *parent = Q_NULLPTR); + explicit QTableWidget(QWidget *parent = nullptr); + QTableWidget(int rows, int columns, QWidget *parent = nullptr); ~QTableWidget(); void setRowCount(int rows); @@ -318,7 +318,7 @@ Q_SIGNALS: void currentCellChanged(int currentRow, int currentColumn, int previousRow, int previousColumn); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; virtual QStringList mimeTypes() const; #if QT_VERSION >= QT_VERSION_CHECK(6,0,0) virtual QMimeData *mimeData(const QList<QTableWidgetItem *> &items) const; @@ -335,15 +335,18 @@ protected: #endif QList<QTableWidgetItem*> items(const QMimeData *data) const; - QModelIndex indexFromItem(QTableWidgetItem *item) const; + QModelIndex indexFromItem(const QTableWidgetItem *item) const; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QModelIndex indexFromItem(QTableWidgetItem *item) const; // ### Qt 6: remove +#endif QTableWidgetItem *itemFromIndex(const QModelIndex &index) const; protected: #if QT_CONFIG(draganddrop) - void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; + void dropEvent(QDropEvent *event) override; #endif private: - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; + void setModel(QAbstractItemModel *model) override; Q_DECLARE_PRIVATE(QTableWidget) Q_DISABLE_COPY(QTableWidget) @@ -360,7 +363,7 @@ private: }; inline void QTableWidget::removeCellWidget(int arow, int acolumn) -{ setCellWidget(arow, acolumn, Q_NULLPTR); } +{ setCellWidget(arow, acolumn, nullptr); } inline QTableWidgetItem *QTableWidget::itemAt(int ax, int ay) const { return itemAt(QPoint(ax, ay)); } diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index 61721143ef..d504263bd1 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -3992,6 +3992,27 @@ int QTreeView::visualIndex(const QModelIndex &index) const return d->viewIndex(index); } +/*! + \reimp +*/ + +void QTreeView::verticalScrollbarValueChanged(int value) +{ + Q_D(QTreeView); + if (!d->viewItems.isEmpty() && value == verticalScrollBar()->maximum()) { + QModelIndex ret = d->viewItems.last().index; + // Root index will be handled by base class implementation + while (ret.isValid()) { + if (isExpanded(ret) && d->model->canFetchMore(ret)) { + d->model->fetchMore(ret); + break; + } + ret = ret.parent(); + } + } + QAbstractItemView::verticalScrollbarValueChanged(value); +} + QT_END_NAMESPACE #include "moc_qtreeview.cpp" diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h index c32c127cd1..e7ee55aa2a 100644 --- a/src/widgets/itemviews/qtreeview.h +++ b/src/widgets/itemviews/qtreeview.h @@ -68,12 +68,12 @@ class Q_WIDGETS_EXPORT QTreeView : public QAbstractItemView Q_PROPERTY(bool expandsOnDoubleClick READ expandsOnDoubleClick WRITE setExpandsOnDoubleClick) public: - explicit QTreeView(QWidget *parent = Q_NULLPTR); + explicit QTreeView(QWidget *parent = nullptr); ~QTreeView(); - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; - void setRootIndex(const QModelIndex &index) Q_DECL_OVERRIDE; - void setSelectionModel(QItemSelectionModel *selectionModel) Q_DECL_OVERRIDE; + void setModel(QAbstractItemModel *model) override; + void setRootIndex(const QModelIndex &index) override; + void setSelectionModel(QItemSelectionModel *selectionModel) override; QHeaderView *header() const; void setHeader(QHeaderView *header); @@ -132,21 +132,21 @@ public: void setTreePosition(int logicalIndex); int treePosition() const; - void keyboardSearch(const QString &search) Q_DECL_OVERRIDE; + void keyboardSearch(const QString &search) override; - QRect visualRect(const QModelIndex &index) const Q_DECL_OVERRIDE; - void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) Q_DECL_OVERRIDE; - QModelIndex indexAt(const QPoint &p) const Q_DECL_OVERRIDE; + QRect visualRect(const QModelIndex &index) const override; + void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override; + QModelIndex indexAt(const QPoint &p) const override; QModelIndex indexAbove(const QModelIndex &index) const; QModelIndex indexBelow(const QModelIndex &index) const; - void doItemsLayout() Q_DECL_OVERRIDE; - void reset() Q_DECL_OVERRIDE; + void doItemsLayout() override; + void reset() override; void sortByColumn(int column, Qt::SortOrder order); - void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>()) Q_DECL_OVERRIDE; - void selectAll() Q_DECL_OVERRIDE; + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>()) override; + void selectAll() override; Q_SIGNALS: void expanded(const QModelIndex &index); @@ -169,23 +169,24 @@ protected Q_SLOTS: void columnMoved(); void reexpand(); void rowsRemoved(const QModelIndex &parent, int first, int last); + void verticalScrollbarValueChanged(int value) override; protected: - QTreeView(QTreeViewPrivate &dd, QWidget *parent = Q_NULLPTR); - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; - void rowsInserted(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; - void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; + QTreeView(QTreeViewPrivate &dd, QWidget *parent = nullptr); + void scrollContentsBy(int dx, int dy) override; + void rowsInserted(const QModelIndex &parent, int start, int end) override; + void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override; - QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; - int horizontalOffset() const Q_DECL_OVERRIDE; - int verticalOffset() const Q_DECL_OVERRIDE; + QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override; + int horizontalOffset() const override; + int verticalOffset() const override; - void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE; - QRegion visualRegionForSelection(const QItemSelection &selection) const Q_DECL_OVERRIDE; - QModelIndexList selectedIndexes() const Q_DECL_OVERRIDE; + void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) override; + QRegion visualRegionForSelection(const QItemSelection &selection) const override; + QModelIndexList selectedIndexes() const override; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; + void paintEvent(QPaintEvent *event) override; void drawTree(QPainter *painter, const QRegion ®ion) const; virtual void drawRow(QPainter *painter, @@ -195,30 +196,30 @@ protected: const QRect &rect, const QModelIndex &index) const; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; #ifndef QT_NO_DRAGANDDROP - void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE; + void dragMoveEvent(QDragMoveEvent *event) override; #endif - bool viewportEvent(QEvent *event) Q_DECL_OVERRIDE; + bool viewportEvent(QEvent *event) override; - void updateGeometries() Q_DECL_OVERRIDE; + void updateGeometries() override; - QSize viewportSizeHint() const Q_DECL_OVERRIDE; + QSize viewportSizeHint() const override; - int sizeHintForColumn(int column) const Q_DECL_OVERRIDE; + int sizeHintForColumn(int column) const override; int indexRowSizeHint(const QModelIndex &index) const; int rowHeight(const QModelIndex &index) const; - void horizontalScrollbarAction(int action) Q_DECL_OVERRIDE; + void horizontalScrollbarAction(int action) override; - bool isIndexHidden(const QModelIndex &index) const Q_DECL_OVERRIDE; + bool isIndexHidden(const QModelIndex &index) const override; void selectionChanged(const QItemSelection &selected, - const QItemSelection &deselected) Q_DECL_OVERRIDE; - void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) Q_DECL_OVERRIDE; + const QItemSelection &deselected) override; + void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override; private: friend class ::tst_QTreeView; diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp index d7b46a0835..601ed44b55 100644 --- a/src/widgets/itemviews/qtreewidget.cpp +++ b/src/widgets/itemviews/qtreewidget.cpp @@ -145,7 +145,7 @@ QTreeModel::QTreeModel(QTreeModelPrivate &dd, QTreeWidget *parent) QTreeModel::~QTreeModel() { clear(); - headerItem->view = Q_NULLPTR; + headerItem->view = nullptr; delete headerItem; rootItem->view = 0; delete rootItem; @@ -3366,6 +3366,7 @@ QModelIndex QTreeWidget::indexFromItem(const QTreeWidgetItem *item, int column) return d->index(item, column); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! \overload \internal @@ -3374,6 +3375,7 @@ QModelIndex QTreeWidget::indexFromItem(QTreeWidgetItem *item, int column) const { return indexFromItem(const_cast<const QTreeWidgetItem *>(item), column); } +#endif /*! Returns a pointer to the QTreeWidgetItem associated with the given \a index. diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index 783627cde9..a31af0428a 100644 --- a/src/widgets/itemviews/qtreewidget.h +++ b/src/widgets/itemviews/qtreewidget.h @@ -178,7 +178,7 @@ public: inline QTreeWidgetItem *parent() const { return par; } inline QTreeWidgetItem *child(int index) const { if (index < 0 || index >= children.size()) - return Q_NULLPTR; + return nullptr; executePendingSort(); return children.at(index); } @@ -261,7 +261,7 @@ class Q_WIDGETS_EXPORT QTreeWidget : public QTreeView friend class QTreeModel; friend class QTreeWidgetItem; public: - explicit QTreeWidget(QWidget *parent = Q_NULLPTR); + explicit QTreeWidget(QWidget *parent = nullptr); ~QTreeWidget(); int columnCount() const; @@ -324,7 +324,7 @@ public: QTreeWidgetItem *itemAbove(const QTreeWidgetItem *item) const; QTreeWidgetItem *itemBelow(const QTreeWidgetItem *item) const; - void setSelectionModel(QItemSelectionModel *selectionModel) Q_DECL_OVERRIDE; + void setSelectionModel(QItemSelectionModel *selectionModel) override; public Q_SLOTS: void scrollToItem(const QTreeWidgetItem *item, @@ -346,7 +346,7 @@ Q_SIGNALS: void itemSelectionChanged(); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; virtual QStringList mimeTypes() const; #if QT_VERSION >= QT_VERSION_CHECK(6,0,0) virtual QMimeData *mimeData(const QList<QTreeWidgetItem *> &items) const; @@ -365,15 +365,17 @@ protected: QList<QTreeWidgetItem*> items(const QMimeData *data) const; QModelIndex indexFromItem(const QTreeWidgetItem *item, int column = 0) const; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QModelIndex indexFromItem(QTreeWidgetItem *item, int column = 0) const; // ### Qt 6: remove +#endif QTreeWidgetItem *itemFromIndex(const QModelIndex &index) const; protected: #if QT_CONFIG(draganddrop) - void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; + void dropEvent(QDropEvent *event) override; #endif private: - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; + void setModel(QAbstractItemModel *model) override; Q_DECLARE_PRIVATE(QTreeWidget) Q_DISABLE_COPY(QTreeWidget) @@ -393,7 +395,7 @@ private: }; inline void QTreeWidget::removeItemWidget(QTreeWidgetItem *item, int column) -{ setItemWidget(item, column, Q_NULLPTR); } +{ setItemWidget(item, column, nullptr); } inline QTreeWidgetItem *QTreeWidget::itemAt(int ax, int ay) const { return itemAt(QPoint(ax, ay)); } diff --git a/src/widgets/itemviews/qtreewidget_p.h b/src/widgets/itemviews/qtreewidget_p.h index 7aa4daefc0..f4625842ef 100644 --- a/src/widgets/itemviews/qtreewidget_p.h +++ b/src/widgets/itemviews/qtreewidget_p.h @@ -91,24 +91,24 @@ public: void itemChanged(QTreeWidgetItem *item); QModelIndex index(const QTreeWidgetItem *item, int column) const; - QModelIndex index(int row, int column, const QModelIndex &parent) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - bool hasChildren(const QModelIndex &parent) const Q_DECL_OVERRIDE; + QModelIndex index(int row, int column, const QModelIndex &parent) const override; + QModelIndex parent(const QModelIndex &child) const override; + int rowCount(const QModelIndex &parent) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + bool hasChildren(const QModelIndex &parent) const override; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &index, const QVariant &value, int role) Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role) override; - QMap<int, QVariant> itemData(const QModelIndex &index) const Q_DECL_OVERRIDE; + QMap<int, QVariant> itemData(const QModelIndex &index) const override; - QVariant headerData(int section, Qt::Orientation orientation, int role) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, int role) const override; bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, - int role) Q_DECL_OVERRIDE; + int role) override; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const override; - void sort(int column, Qt::SortOrder order) Q_DECL_OVERRIDE; + void sort(int column, Qt::SortOrder order) override; void ensureSorted(int column, Qt::SortOrder order, int start, int end, const QModelIndex &parent); static bool itemLessThan(const QPair<QTreeWidgetItem*,int> &left, @@ -120,17 +120,17 @@ public: const QList<QTreeWidgetItem*>::iterator &end, Qt::SortOrder order, QTreeWidgetItem *item); - bool insertRows(int row, int count, const QModelIndex &) Q_DECL_OVERRIDE; - bool insertColumns(int column, int count, const QModelIndex &) Q_DECL_OVERRIDE; + bool insertRows(int row, int count, const QModelIndex &) override; + bool insertColumns(int column, int count, const QModelIndex &) override; - bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; + bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; // dnd - QStringList mimeTypes() const Q_DECL_OVERRIDE; - QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; bool dropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; - Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + int row, int column, const QModelIndex &parent) override; + Qt::DropActions supportedDropActions() const override; QMimeData *internalMimeData() const; @@ -145,7 +145,7 @@ protected: void beginRemoveItems(QTreeWidgetItem *parent, int row, int count); void endRemoveItems(); void sortItems(QList<QTreeWidgetItem*> *items, int column, Qt::SortOrder order); - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; private: QTreeWidgetItem *rootItem; diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index e1d431100e..84bf92d2ac 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -161,7 +161,7 @@ public: enum ActionEvent { Trigger, Hover }; void activate(ActionEvent event); - bool showStatusText(QWidget *widget = Q_NULLPTR); + bool showStatusText(QWidget *widget = nullptr); void setMenuRole(MenuRole menuRole); MenuRole menuRole() const; @@ -180,7 +180,7 @@ public: #endif protected: - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; QAction(QActionPrivate &dd, QObject *parent); public Q_SLOTS: diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 943aeaa2d9..93e2db4b1a 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -2804,7 +2804,7 @@ void QApplicationPrivate::sendSyntheticEnterLeave(QWidget *widget) */ QDesktopWidget *QApplication::desktop() { - CHECK_QAPP_INSTANCE(Q_NULLPTR) + CHECK_QAPP_INSTANCE(nullptr) if (!qt_desktopWidget || // not created yet !(qt_desktopWidget->windowType() == Qt::Desktop)) { // reparented away qt_desktopWidget = new QDesktopWidget(); @@ -3284,7 +3284,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) // sequence, so we reset wheel_widget in case no one accepts the event // or if we didn't get (or missed) a ScrollEnd previously. if (spontaneous && phase == Qt::ScrollBegin) - QApplicationPrivate::wheel_widget = Q_NULLPTR; + QApplicationPrivate::wheel_widget = nullptr; const QPoint &relpos = wheel->pos(); @@ -3334,7 +3334,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) d->notify_helper(QApplicationPrivate::wheel_widget, &we); wheel->setAccepted(we.isAccepted()); if (phase == Qt::ScrollEnd) - QApplicationPrivate::wheel_widget = Q_NULLPTR; + QApplicationPrivate::wheel_widget = nullptr; } } break; diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 396d0c9474..7a5d7ba1a9 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -110,11 +110,11 @@ public: using QGuiApplication::palette; static QPalette palette(const QWidget *); static QPalette palette(const char *className); - static void setPalette(const QPalette &, const char* className = Q_NULLPTR); + static void setPalette(const QPalette &, const char* className = nullptr); static QFont font(); static QFont font(const QWidget*); static QFont font(const char *className); - static void setFont(const QFont &, const char* className = Q_NULLPTR); + static void setFont(const QFont &, const char* className = nullptr); static QFontMetrics fontMetrics(); #if QT_VERSION < 0x060000 // remove these forwarders in Qt 6 @@ -177,7 +177,7 @@ public: #endif static int exec(); - bool notify(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool notify(QObject *, QEvent *) override; #ifdef QT_KEYPAD_NAVIGATION static Q_DECL_DEPRECATED void setKeypadNavigationEnabled(bool); @@ -201,8 +201,8 @@ public Q_SLOTS: static void aboutQt(); protected: - bool event(QEvent *) Q_DECL_OVERRIDE; - bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) override; private: Q_DISABLE_COPY(QApplication) diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 5dca2e85f1..e83d6e5820 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -106,11 +106,11 @@ public: QApplicationPrivate(int &argc, char **argv, int flags); ~QApplicationPrivate(); - virtual void notifyLayoutDirectionChange() Q_DECL_OVERRIDE; - virtual void notifyActiveWindowChange(QWindow *) Q_DECL_OVERRIDE; + virtual void notifyLayoutDirectionChange() override; + virtual void notifyActiveWindowChange(QWindow *) override; - virtual bool shouldQuit() Q_DECL_OVERRIDE; - bool tryCloseAllWindows() Q_DECL_OVERRIDE; + virtual bool shouldQuit() override; + bool tryCloseAllWindows() override; #if 0 // Used to be included in Qt4 for Q_WS_X11 #ifndef QT_NO_SETTINGS @@ -122,13 +122,13 @@ public: static QString desktopStyleKey(); - void createEventDispatcher() Q_DECL_OVERRIDE; + void createEventDispatcher() override; static void dispatchEnterLeave(QWidget *enter, QWidget *leave, const QPointF &globalPosF); - void notifyWindowIconChanged() Q_DECL_OVERRIDE; + void notifyWindowIconChanged() override; //modality - bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const Q_DECL_OVERRIDE; + bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const override; static bool isBlockedByModal(QWidget *widget); static bool modalState(); static bool tryModalHelper(QWidget *widget, QWidget **rettop = 0); @@ -158,7 +158,7 @@ public: #endif static bool inPopupMode(); - bool popupActive() Q_DECL_OVERRIDE { return inPopupMode(); } + bool popupActive() override { return inPopupMode(); } void closePopup(QWidget *popup); void openPopup(QWidget *popup); static void setFocusWidget(QWidget *focus, Qt::FocusReason reason); @@ -183,9 +183,9 @@ public: static QPalette *set_pal; protected: - void notifyThemeChanged() Q_DECL_OVERRIDE; + void notifyThemeChanged() override; #ifndef QT_NO_DRAGANDDROP - void notifyDragStarted(const QDrag *) Q_DECL_OVERRIDE; + void notifyDragStarted(const QDrag *) override; #endif // QT_NO_DRAGANDDROP public: @@ -284,7 +284,7 @@ public: ulong timestamp); static void translateTouchCancel(QTouchDevice *device, ulong timestamp); - QPixmap applyQIconStyleHelper(QIcon::Mode mode, const QPixmap& base) const Q_DECL_OVERRIDE; + QPixmap applyQIconStyleHelper(QIcon::Mode mode, const QPixmap& base) const override; private: static QApplicationPrivate *self; static bool tryCloseAllWidgetWindows(QWindowList *processedWindows); diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp index 588cec2b95..a368f379ad 100644 --- a/src/widgets/kernel/qboxlayout.cpp +++ b/src/widgets/kernel/qboxlayout.cpp @@ -124,7 +124,7 @@ public: void calcHfw(int); void effectiveMargins(int *left, int *top, int *right, int *bottom) const; - QLayoutItem* replaceAt(int index, QLayoutItem*) Q_DECL_OVERRIDE; + QLayoutItem* replaceAt(int index, QLayoutItem*) override; }; QBoxLayoutPrivate::~QBoxLayoutPrivate() diff --git a/src/widgets/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h index 9c7d0e593f..6bb8f8aafa 100644 --- a/src/widgets/kernel/qboxlayout.h +++ b/src/widgets/kernel/qboxlayout.h @@ -61,7 +61,7 @@ public: enum Direction { LeftToRight, RightToLeft, TopToBottom, BottomToTop, Down = TopToBottom, Up = BottomToTop }; - explicit QBoxLayout(Direction, QWidget *parent = Q_NULLPTR); + explicit QBoxLayout(Direction, QWidget *parent = nullptr); ~QBoxLayout(); @@ -74,7 +74,7 @@ public: void addWidget(QWidget *, int stretch = 0, Qt::Alignment alignment = Qt::Alignment()); void addLayout(QLayout *layout, int stretch = 0); void addStrut(int); - void addItem(QLayoutItem *) Q_DECL_OVERRIDE; + void addItem(QLayoutItem *) override; void insertSpacing(int index, int size); void insertStretch(int index, int stretch = 0); @@ -91,20 +91,20 @@ public: void setStretch(int index, int stretch); int stretch(int index) const; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSize() const override; + QSize maximumSize() const override; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int) const Q_DECL_OVERRIDE; - int minimumHeightForWidth(int) const Q_DECL_OVERRIDE; + bool hasHeightForWidth() const override; + int heightForWidth(int) const override; + int minimumHeightForWidth(int) const override; - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; - void setGeometry(const QRect&) Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; + void invalidate() override; + QLayoutItem *itemAt(int) const override; + QLayoutItem *takeAt(int) override; + int count() const override; + void setGeometry(const QRect&) override; private: Q_DISABLE_COPY(QBoxLayout) diff --git a/src/widgets/kernel/qdesktopwidget.cpp b/src/widgets/kernel/qdesktopwidget.cpp index 1b9cf88efe..09e39c7cff 100644 --- a/src/widgets/kernel/qdesktopwidget.cpp +++ b/src/widgets/kernel/qdesktopwidget.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE QDesktopScreenWidget::QDesktopScreenWidget(QScreen *screen, const QRect &geometry) - : QWidget(Q_NULLPTR, Qt::Desktop), m_screen(screen) + : QWidget(nullptr, Qt::Desktop), m_screen(screen) { setVisible(false); if (QWindow *winHandle = windowHandle()) @@ -114,7 +114,7 @@ QDesktopScreenWidget *QDesktopWidgetPrivate::widgetForScreen(QScreen *qScreen) c if (widget->screen() == qScreen) return widget; } - return Q_NULLPTR; + return nullptr; } void QDesktopWidgetPrivate::_q_updateScreens() @@ -330,7 +330,7 @@ int QDesktopWidgetPrivate::screenNumber(const QWidget *w) if (!w->isWindow()) frame.moveTopLeft(w->mapToGlobal(QPoint(0, 0))); - QScreen *widgetScreen = Q_NULLPTR; + QScreen *widgetScreen = nullptr; int largestArea = 0; foreach (QScreen *screen, screens) { const QRect deviceIndependentScreenGeometry = diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h index 64e1c568eb..97eef70263 100644 --- a/src/widgets/kernel/qdesktopwidget.h +++ b/src/widgets/kernel/qdesktopwidget.h @@ -65,7 +65,7 @@ public: int screenCount() const; int primaryScreen() const; - int screenNumber(const QWidget *widget = Q_NULLPTR) const; + int screenNumber(const QWidget *widget = nullptr) const; int screenNumber(const QPoint &) const; QWidget *screen(int screen = -1); @@ -87,7 +87,7 @@ Q_SIGNALS: void primaryScreenChanged(); protected: - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *e) override; private: Q_DISABLE_COPY(QDesktopWidget) diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp index 868ac17b6f..8a5b863bb5 100644 --- a/src/widgets/kernel/qformlayout.cpp +++ b/src/widgets/kernel/qformlayout.cpp @@ -224,7 +224,7 @@ public: int hSpacing; int vSpacing; - QLayoutItem* replaceAt(int index, QLayoutItem*) Q_DECL_OVERRIDE; + QLayoutItem* replaceAt(int index, QLayoutItem*) override; }; QFormLayoutPrivate::QFormLayoutPrivate() diff --git a/src/widgets/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h index 5ec27433d3..40424f2a49 100644 --- a/src/widgets/kernel/qformlayout.h +++ b/src/widgets/kernel/qformlayout.h @@ -88,7 +88,7 @@ public: QLayoutItem *fieldItem; }; - explicit QFormLayout(QWidget *parent = Q_NULLPTR); + explicit QFormLayout(QWidget *parent = nullptr); ~QFormLayout(); void setFieldGrowthPolicy(FieldGrowthPolicy policy); @@ -142,19 +142,19 @@ public: QWidget *labelForField(QLayout *field) const; // reimplemented from QLayout - void addItem(QLayoutItem *item) Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; - - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; - - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int width) const Q_DECL_OVERRIDE; - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; + void addItem(QLayoutItem *item) override; + QLayoutItem *itemAt(int index) const override; + QLayoutItem *takeAt(int index) override; + + void setGeometry(const QRect &rect) override; + QSize minimumSize() const override; + QSize sizeHint() const override; + void invalidate() override; + + bool hasHeightForWidth() const override; + int heightForWidth(int width) const override; + Qt::Orientations expandingDirections() const override; + int count() const override; int rowCount() const; diff --git a/src/widgets/kernel/qgesture.h b/src/widgets/kernel/qgesture.h index 1eda611d64..c5b2cee83d 100644 --- a/src/widgets/kernel/qgesture.h +++ b/src/widgets/kernel/qgesture.h @@ -70,7 +70,7 @@ class Q_WIDGETS_EXPORT QGesture : public QObject Q_PROPERTY(bool hasHotSpot READ hasHotSpot) public: - explicit QGesture(QObject *parent = Q_NULLPTR); + explicit QGesture(QObject *parent = nullptr); ~QGesture(); Qt::GestureType gestureType() const; @@ -114,7 +114,7 @@ class Q_WIDGETS_EXPORT QPanGesture : public QGesture Q_PRIVATE_PROPERTY(QPanGesture::d_func(), qreal verticalVelocity READ verticalVelocity WRITE setVerticalVelocity) public: - explicit QPanGesture(QObject *parent = Q_NULLPTR); + explicit QPanGesture(QObject *parent = nullptr); ~QPanGesture(); QPointF lastOffset() const; @@ -162,7 +162,7 @@ public: Q_PROPERTY(QPointF centerPoint READ centerPoint WRITE setCenterPoint) public: - explicit QPinchGesture(QObject *parent = Q_NULLPTR); + explicit QPinchGesture(QObject *parent = nullptr); ~QPinchGesture(); ChangeFlags totalChangeFlags() const; @@ -218,7 +218,7 @@ public: enum SwipeDirection { NoDirection, Left, Right, Up, Down }; Q_ENUM(SwipeDirection) - explicit QSwipeGesture(QObject *parent = Q_NULLPTR); + explicit QSwipeGesture(QObject *parent = nullptr); ~QSwipeGesture(); SwipeDirection horizontalDirection() const; @@ -239,7 +239,7 @@ class Q_WIDGETS_EXPORT QTapGesture : public QGesture Q_PROPERTY(QPointF position READ position WRITE setPosition) public: - explicit QTapGesture(QObject *parent = Q_NULLPTR); + explicit QTapGesture(QObject *parent = nullptr); ~QTapGesture(); QPointF position() const; @@ -257,7 +257,7 @@ class Q_WIDGETS_EXPORT QTapAndHoldGesture : public QGesture Q_PROPERTY(QPointF position READ position WRITE setPosition) public: - explicit QTapAndHoldGesture(QObject *parent = Q_NULLPTR); + explicit QTapAndHoldGesture(QObject *parent = nullptr); ~QTapAndHoldGesture(); QPointF position() const; diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp index 29df38f19c..db8ef89477 100644 --- a/src/widgets/kernel/qgridlayout.cpp +++ b/src/widgets/kernel/qgridlayout.cpp @@ -170,7 +170,7 @@ public: } return 0; } - QLayoutItem* replaceAt(int index, QLayoutItem *newitem) Q_DECL_OVERRIDE + QLayoutItem* replaceAt(int index, QLayoutItem *newitem) override { if (!newitem) return 0; diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h index 51dd65d181..0283ec2028 100644 --- a/src/widgets/kernel/qgridlayout.h +++ b/src/widgets/kernel/qgridlayout.h @@ -66,9 +66,9 @@ public: ~QGridLayout(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSize() const override; + QSize maximumSize() const override; void setHorizontalSpacing(int spacing); int horizontalSpacing() const; @@ -92,12 +92,12 @@ public: QRect cellRect(int row, int column) const; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int) const Q_DECL_OVERRIDE; - int minimumHeightForWidth(int) const Q_DECL_OVERRIDE; + bool hasHeightForWidth() const override; + int heightForWidth(int) const override; + int minimumHeightForWidth(int) const override; - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; + void invalidate() override; inline void addWidget(QWidget *w) { QLayout::addWidget(w); } void addWidget(QWidget *, int row, int column, Qt::Alignment = Qt::Alignment()); @@ -108,11 +108,11 @@ public: void setOriginCorner(Qt::Corner); Qt::Corner originCorner() const; - QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; + QLayoutItem *itemAt(int index) const override; QLayoutItem *itemAtPosition(int row, int column) const; - QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; - void setGeometry(const QRect&) Q_DECL_OVERRIDE; + QLayoutItem *takeAt(int index) override; + int count() const override; + void setGeometry(const QRect&) override; void addItem(QLayoutItem *item, int row, int column, int rowSpan = 1, int columnSpan = 1, Qt::Alignment = Qt::Alignment()); @@ -120,7 +120,7 @@ public: void getItemPosition(int idx, int *row, int *column, int *rowSpan, int *columnSpan) const; protected: - void addItem(QLayoutItem *) Q_DECL_OVERRIDE; + void addItem(QLayoutItem *) override; private: Q_DISABLE_COPY(QGridLayout) diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index 2de12b4f99..abadf2e69d 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -104,8 +104,8 @@ public: QWidget *parentWidget() const; - void invalidate() Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; + void invalidate() override; + QRect geometry() const override; bool activate(); void update(); @@ -115,16 +115,16 @@ public: void removeWidget(QWidget *w); void removeItem(QLayoutItem *); - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; - virtual void setGeometry(const QRect&) Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; + QSize minimumSize() const override; + QSize maximumSize() const override; + virtual void setGeometry(const QRect&) override; virtual QLayoutItem *itemAt(int index) const = 0; virtual QLayoutItem *takeAt(int index) = 0; virtual int indexOf(QWidget *) const; virtual int count() const = 0; - bool isEmpty() const Q_DECL_OVERRIDE; - QSizePolicy::ControlTypes controlTypes() const Q_DECL_OVERRIDE; + bool isEmpty() const override; + QSizePolicy::ControlTypes controlTypes() const override; // ### Qt 6 make this function virtual QLayoutItem *replaceWidget(QWidget *from, QWidget *to, Qt::FindChildOptions options = Qt::FindChildrenRecursively); @@ -133,7 +133,7 @@ public: QSize totalMinimumSize() const; QSize totalMaximumSize() const; QSize totalSizeHint() const; - QLayout *layout() Q_DECL_OVERRIDE; + QLayout *layout() override; void setEnabled(bool); bool isEnabled() const; @@ -143,7 +143,7 @@ public: protected: void widgetEvent(QEvent *); - void childEvent(QChildEvent *e) Q_DECL_OVERRIDE; + void childEvent(QChildEvent *e) override; void addChildLayout(QLayout *l); void addChildWidget(QWidget *w); bool adoptLayout(QLayout *layout); diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp index 5bc408a8cd..07588d2ee2 100644 --- a/src/widgets/kernel/qopenglwidget.cpp +++ b/src/widgets/kernel/qopenglwidget.cpp @@ -536,8 +536,8 @@ public: : QOpenGLPaintDevicePrivate(QSize()), w(widget) { } - void beginPaint() Q_DECL_OVERRIDE; - void endPaint() Q_DECL_OVERRIDE; + void beginPaint() override; + void endPaint() override; QOpenGLWidget *w; }; @@ -547,7 +547,7 @@ class QOpenGLWidgetPaintDevice : public QOpenGLPaintDevice public: QOpenGLWidgetPaintDevice(QOpenGLWidget *widget) : QOpenGLPaintDevice(*new QOpenGLWidgetPaintDevicePrivate(widget)) { } - void ensureActiveTarget() Q_DECL_OVERRIDE; + void ensureActiveTarget() override; }; class QOpenGLWidgetPrivate : public QWidgetPrivate @@ -576,8 +576,8 @@ public: void reset(); void recreateFbo(); - GLuint textureId() const Q_DECL_OVERRIDE; - QPlatformTextureList::Flags textureListFlags() Q_DECL_OVERRIDE; + GLuint textureId() const override; + QPlatformTextureList::Flags textureListFlags() override; void initialize(); void invokeUserPaint(); @@ -585,14 +585,14 @@ public: void invalidateFbo(); - QImage grabFramebuffer() Q_DECL_OVERRIDE; - void beginBackingStorePainting() Q_DECL_OVERRIDE { inBackingStorePaint = true; } - void endBackingStorePainting() Q_DECL_OVERRIDE { inBackingStorePaint = false; } - void beginCompose() Q_DECL_OVERRIDE; - void endCompose() Q_DECL_OVERRIDE; - void initializeViewportFramebuffer() Q_DECL_OVERRIDE; - void resizeViewportFramebuffer() Q_DECL_OVERRIDE; - void resolveSamples() Q_DECL_OVERRIDE; + QImage grabFramebuffer() override; + void beginBackingStorePainting() override { inBackingStorePaint = true; } + void endBackingStorePainting() override { inBackingStorePaint = false; } + void beginCompose() override; + void endCompose() override; + void initializeViewportFramebuffer() override; + void resizeViewportFramebuffer() override; + void resolveSamples() override; QOpenGLContext *context; QOpenGLFramebufferObject *fbo; diff --git a/src/widgets/kernel/qopenglwidget.h b/src/widgets/kernel/qopenglwidget.h index c0a6e41522..9eb4a9ba5a 100644 --- a/src/widgets/kernel/qopenglwidget.h +++ b/src/widgets/kernel/qopenglwidget.h @@ -63,7 +63,7 @@ public: PartialUpdate }; - explicit QOpenGLWidget(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); + explicit QOpenGLWidget(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); ~QOpenGLWidget(); void setUpdateBehavior(UpdateBehavior updateBehavior); @@ -96,13 +96,13 @@ protected: virtual void resizeGL(int w, int h); virtual void paintGL(); - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; - bool event(QEvent *e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + bool event(QEvent *e) override; - int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE; - QPaintDevice *redirected(QPoint *p) const Q_DECL_OVERRIDE; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + int metric(QPaintDevice::PaintDeviceMetric metric) const override; + QPaintDevice *redirected(QPoint *p) const override; + QPaintEngine *paintEngine() const override; private: Q_DISABLE_COPY(QOpenGLWidget) diff --git a/src/widgets/kernel/qshortcut.h b/src/widgets/kernel/qshortcut.h index 22c667c9c1..6dcf4971b2 100644 --- a/src/widgets/kernel/qshortcut.h +++ b/src/widgets/kernel/qshortcut.h @@ -62,7 +62,7 @@ class Q_WIDGETS_EXPORT QShortcut : public QObject public: explicit QShortcut(QWidget *parent); QShortcut(const QKeySequence& key, QWidget *parent, - const char *member = Q_NULLPTR, const char *ambiguousMember = Q_NULLPTR, + const char *member = nullptr, const char *ambiguousMember = nullptr, Qt::ShortcutContext context = Qt::WindowShortcut); ~QShortcut(); @@ -91,7 +91,7 @@ Q_SIGNALS: void activatedAmbiguously(); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; }; #endif // QT_NO_SHORTCUT diff --git a/src/widgets/kernel/qstackedlayout.cpp b/src/widgets/kernel/qstackedlayout.cpp index b8b6f4302d..7430d833db 100644 --- a/src/widgets/kernel/qstackedlayout.cpp +++ b/src/widgets/kernel/qstackedlayout.cpp @@ -51,7 +51,7 @@ class QStackedLayoutPrivate : public QLayoutPrivate Q_DECLARE_PUBLIC(QStackedLayout) public: QStackedLayoutPrivate() : index(-1), stackingMode(QStackedLayout::StackOne) {} - QLayoutItem* replaceAt(int index, QLayoutItem *newitem) Q_DECL_OVERRIDE; + QLayoutItem* replaceAt(int index, QLayoutItem *newitem) override; QList<QLayoutItem *> list; int index; QStackedLayout::StackingMode stackingMode; diff --git a/src/widgets/kernel/qstackedlayout.h b/src/widgets/kernel/qstackedlayout.h index 6f5eded1f0..966ee2aae4 100644 --- a/src/widgets/kernel/qstackedlayout.h +++ b/src/widgets/kernel/qstackedlayout.h @@ -75,20 +75,20 @@ public: int currentIndex() const; using QLayout::widget; QWidget *widget(int) const; - int count() const Q_DECL_OVERRIDE; + int count() const override; StackingMode stackingMode() const; void setStackingMode(StackingMode stackingMode); // abstract virtual functions: - void addItem(QLayoutItem *item) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int) Q_DECL_OVERRIDE; - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int width) const Q_DECL_OVERRIDE; + void addItem(QLayoutItem *item) override; + QSize sizeHint() const override; + QSize minimumSize() const override; + QLayoutItem *itemAt(int) const override; + QLayoutItem *takeAt(int) override; + void setGeometry(const QRect &rect) override; + bool hasHeightForWidth() const override; + int heightForWidth(int width) const override; Q_SIGNALS: void widgetRemoved(int index); diff --git a/src/widgets/kernel/qstandardgestures_p.h b/src/widgets/kernel/qstandardgestures_p.h index 9b2cffaa9a..6de09361fe 100644 --- a/src/widgets/kernel/qstandardgestures_p.h +++ b/src/widgets/kernel/qstandardgestures_p.h @@ -64,9 +64,9 @@ class QPanGestureRecognizer : public QGestureRecognizer public: explicit QPanGestureRecognizer(int pointCount = 2) : m_pointCount(pointCount) {} - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; private: const int m_pointCount; @@ -77,9 +77,9 @@ class QPinchGestureRecognizer : public QGestureRecognizer public: QPinchGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; class QSwipeGestureRecognizer : public QGestureRecognizer @@ -87,9 +87,9 @@ class QSwipeGestureRecognizer : public QGestureRecognizer public: QSwipeGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; class QTapGestureRecognizer : public QGestureRecognizer @@ -97,9 +97,9 @@ class QTapGestureRecognizer : public QGestureRecognizer public: QTapGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; class QTapAndHoldGestureRecognizer : public QGestureRecognizer @@ -107,9 +107,9 @@ class QTapAndHoldGestureRecognizer : public QGestureRecognizer public: QTapAndHoldGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; QT_END_NAMESPACE diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp index 80dc65e2d2..f30a83611d 100644 --- a/src/widgets/kernel/qtooltip.cpp +++ b/src/widgets/kernel/qtooltip.cpp @@ -127,7 +127,7 @@ public: ~QTipLabel(); static QTipLabel *instance; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; QBasicTimer hideTimer, expireTimer; @@ -143,10 +143,10 @@ public: static int getTipScreen(const QPoint &pos, QWidget *w); protected: - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *e) override; + void paintEvent(QPaintEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void resizeEvent(QResizeEvent *e) override; #ifndef QT_NO_STYLE_STYLESHEET public slots: diff --git a/src/widgets/kernel/qtooltip.h b/src/widgets/kernel/qtooltip.h index 5e68eef0a7..edf1de0c1d 100644 --- a/src/widgets/kernel/qtooltip.h +++ b/src/widgets/kernel/qtooltip.h @@ -53,7 +53,7 @@ class Q_WIDGETS_EXPORT QToolTip QToolTip() Q_DECL_EQ_DELETE; public: // ### Qt 6 - merge the three showText functions below - static void showText(const QPoint &pos, const QString &text, QWidget *w = Q_NULLPTR); + static void showText(const QPoint &pos, const QString &text, QWidget *w = nullptr); static void showText(const QPoint &pos, const QString &text, QWidget *w, const QRect &rect); static void showText(const QPoint &pos, const QString &text, QWidget *w, const QRect &rect, int msecShowTime); static inline void hideText() { showText(QPoint(), QString()); } diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index 91d2b503e0..96d0cf61c4 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -145,12 +145,12 @@ public: static QWhatsThat *instance; protected: - void showEvent(QShowEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *e) override; + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void keyPressEvent(QKeyEvent*) override; + void paintEvent(QPaintEvent*) override; private: QPointer<QWidget>widget; @@ -365,7 +365,7 @@ class QWhatsThisPrivate : public QObject QWhatsThisPrivate(); ~QWhatsThisPrivate(); static QWhatsThisPrivate *instance; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; QPointer<QAction> action; static void say(QWidget *, const QString &, int x = 0, int y = 0); static void notifyToplevels(QEvent *e); diff --git a/src/widgets/kernel/qwhatsthis.h b/src/widgets/kernel/qwhatsthis.h index 3211796d3e..1f0f82b2a2 100644 --- a/src/widgets/kernel/qwhatsthis.h +++ b/src/widgets/kernel/qwhatsthis.h @@ -59,10 +59,10 @@ public: static bool inWhatsThisMode(); static void leaveWhatsThisMode(); - static void showText(const QPoint &pos, const QString &text, QWidget *w = Q_NULLPTR); + static void showText(const QPoint &pos, const QString &text, QWidget *w = nullptr); static void hideText(); - static QAction *createAction(QObject *parent = Q_NULLPTR); + static QAction *createAction(QObject *parent = nullptr); }; diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 3369548f18..6a633fb575 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -1169,7 +1169,7 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f) if (targetScreen >= 0) { topData()->initialScreenIndex = targetScreen; if (QWindow *window = q->windowHandle()) - window->setScreen(QGuiApplication::screens().value(targetScreen, Q_NULLPTR)); + window->setScreen(QGuiApplication::screens().value(targetScreen, nullptr)); } data.fstrut_dirty = true; @@ -1461,7 +1461,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO screenNumber = q->windowType() != Qt::Desktop ? QDesktopWidgetPrivate::screenNumber(q) : 0; } - win->setScreen(QGuiApplication::screens().value(screenNumber, Q_NULLPTR)); + win->setScreen(QGuiApplication::screens().value(screenNumber, nullptr)); } QSurfaceFormat format = win->requestedFormat(); @@ -1502,7 +1502,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO QBackingStore *store = q->backingStore(); if (!store) { - if (win && q->windowType() != Qt::Desktop) { + if (q->windowType() != Qt::Desktop) { if (q->isTopLevel()) q->setBackingStore(new QBackingStore(win)); } else { @@ -7903,7 +7903,7 @@ void QWidgetPrivate::show_helper() const bool isWindow = q->isWindow(); #if QT_CONFIG(graphicsview) - bool isEmbedded = isWindow && q->graphicsProxyWidget() != Q_NULLPTR; + bool isEmbedded = isWindow && q->graphicsProxyWidget() != nullptr; #else bool isEmbedded = false; #endif @@ -12458,7 +12458,7 @@ static inline bool canMapPosition(QWindow *window) #if QT_CONFIG(graphicsview) static inline QGraphicsProxyWidget *graphicsProxyWidget(const QWidget *w) { - QGraphicsProxyWidget *result = Q_NULLPTR; + QGraphicsProxyWidget *result = nullptr; const QWidgetPrivate *d = qt_widget_private(const_cast<QWidget *>(w)); if (d->extra) result = d->extra->proxyWidget; @@ -12474,7 +12474,7 @@ struct MapToGlobalTransformResult { static MapToGlobalTransformResult mapToGlobalTransform(const QWidget *w) { MapToGlobalTransformResult result; - result.window = Q_NULLPTR; + result.window = nullptr; for ( ; w ; w = w->parentWidget()) { #if QT_CONFIG(graphicsview) if (QGraphicsProxyWidget *qgpw = graphicsProxyWidget(w)) { diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index 732af4de09..5087d330ee 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -211,10 +211,10 @@ public: }; Q_DECLARE_FLAGS(RenderFlags, RenderFlag) - explicit QWidget(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); + explicit QWidget(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); ~QWidget(); - int devType() const Q_DECL_OVERRIDE; + int devType() const override; WId winId() const; void createWinId(); // internal, going away @@ -578,7 +578,7 @@ public: void setAttribute(Qt::WidgetAttribute, bool on = true); inline bool testAttribute(Qt::WidgetAttribute) const; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; void ensurePolished() const; @@ -596,7 +596,7 @@ public: QWindow *windowHandle() const; - static QWidget *createWindowContainer(QWindow *window, QWidget *parent=Q_NULLPTR, Qt::WindowFlags flags=Qt::WindowFlags()); + static QWidget *createWindowContainer(QWindow *window, QWidget *parent=nullptr, Qt::WindowFlags flags=Qt::WindowFlags()); friend class QDesktopScreenWidget; @@ -608,7 +608,7 @@ Q_SIGNALS: protected: // Event handlers - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; virtual void mousePressEvent(QMouseEvent *event); virtual void mouseReleaseEvent(QMouseEvent *event); virtual void mouseDoubleClickEvent(QMouseEvent *event); @@ -650,10 +650,10 @@ protected: // Misc. protected functions virtual void changeEvent(QEvent *); - int metric(PaintDeviceMetric) const Q_DECL_OVERRIDE; - void initPainter(QPainter *painter) const Q_DECL_OVERRIDE; - QPaintDevice *redirected(QPoint *offset) const Q_DECL_OVERRIDE; - QPainter *sharedPainter() const Q_DECL_OVERRIDE; + int metric(PaintDeviceMetric) const override; + void initPainter(QPainter *painter) const override; + QPaintDevice *redirected(QPoint *offset) const override; + QPainter *sharedPainter() const override; virtual void inputMethodEvent(QInputMethodEvent *); public: @@ -738,12 +738,12 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QWidget::RenderFlags) #ifndef Q_QDOC template <> inline QWidget *qobject_cast<QWidget*>(QObject *o) { - if (!o || !o->isWidgetType()) return Q_NULLPTR; + if (!o || !o->isWidgetType()) return nullptr; return static_cast<QWidget*>(o); } template <> inline const QWidget *qobject_cast<const QWidget*>(const QObject *o) { - if (!o || !o->isWidgetType()) return Q_NULLPTR; + if (!o || !o->isWidgetType()) return nullptr; return static_cast<const QWidget*>(o); } #endif // !Q_QDOC diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 4a86f87c71..26f8b53392 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -903,26 +903,26 @@ public: : QGraphicsEffectSourcePrivate(), m_widget(widget), context(0), updateDueToGraphicsEffect(false) {} - void detach() Q_DECL_OVERRIDE + void detach() override { m_widget->d_func()->graphicsEffect = 0; } - const QGraphicsItem *graphicsItem() const Q_DECL_OVERRIDE + const QGraphicsItem *graphicsItem() const override { return 0; } - const QWidget *widget() const Q_DECL_OVERRIDE + const QWidget *widget() const override { return m_widget; } - void update() Q_DECL_OVERRIDE + void update() override { updateDueToGraphicsEffect = true; m_widget->update(); updateDueToGraphicsEffect = false; } - bool isPixmap() const Q_DECL_OVERRIDE + bool isPixmap() const override { return false; } - void effectBoundingRectChanged() Q_DECL_OVERRIDE + void effectBoundingRectChanged() override { // ### This function should take a rect parameter; then we can avoid // updating too much on the parent widget. @@ -932,16 +932,16 @@ public: update(); } - const QStyleOption *styleOption() const Q_DECL_OVERRIDE + const QStyleOption *styleOption() const override { return 0; } - QRect deviceRect() const Q_DECL_OVERRIDE + QRect deviceRect() const override { return m_widget->window()->rect(); } - QRectF boundingRect(Qt::CoordinateSystem system) const Q_DECL_OVERRIDE; - void draw(QPainter *p) Q_DECL_OVERRIDE; + QRectF boundingRect(Qt::CoordinateSystem system) const override; + void draw(QPainter *p) override; QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset, - QGraphicsEffect::PixmapPadMode mode) const Q_DECL_OVERRIDE; + QGraphicsEffect::PixmapPadMode mode) const override; QWidget *m_widget; QWidgetPaintContext *context; diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h index 3da691a430..4769332a23 100644 --- a/src/widgets/kernel/qwidgetaction.h +++ b/src/widgets/kernel/qwidgetaction.h @@ -66,8 +66,8 @@ public: void releaseWidget(QWidget *widget); protected: - virtual bool event(QEvent *) Q_DECL_OVERRIDE; - virtual bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + virtual bool event(QEvent *) override; + virtual bool eventFilter(QObject *, QEvent *) override; virtual QWidget *createWidget(QWidget *parent); virtual void deleteWidget(QWidget *widget); QList<QWidget *> createdWidgets() const; diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp index 52080fe05f..3b093283cd 100644 --- a/src/widgets/kernel/qwidgetbackingstore.cpp +++ b/src/widgets/kernel/qwidgetbackingstore.cpp @@ -1058,7 +1058,7 @@ static QPlatformTextureList *widgetTexturesFor(QWidget *tlw, QWidget *widget) { Q_UNUSED(tlw); Q_UNUSED(widget); - return Q_NULLPTR; + return nullptr; } #endif // QT_NO_OPENGL diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index d8d6eab7b1..ac32c32e12 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -78,7 +78,7 @@ public: QWindowPrivate::setVisible(visible); } - QWindow *eventReceiver() Q_DECL_OVERRIDE { + QWindow *eventReceiver() override { Q_Q(QWidgetWindow); QWindow *w = q; while (w->parent() && qobject_cast<QWidgetWindow *>(w) && qobject_cast<QWidgetWindow *>(w->parent())) { @@ -87,7 +87,7 @@ public: return w; } - void clearFocusObject() Q_DECL_OVERRIDE + void clearFocusObject() override { Q_Q(QWidgetWindow); QWidget *widget = q->widget(); @@ -95,7 +95,7 @@ public: widget->focusWidget()->clearFocus(); } - QRectF closestAcceptableGeometry(const QRectF &rect) const Q_DECL_OVERRIDE; + QRectF closestAcceptableGeometry(const QRectF &rect) const override; #if QT_CONFIG(opengl) QOpenGLContext *shareContext() const override; #endif @@ -171,7 +171,7 @@ QObject *QWidgetWindow::focusObject() const { QWidget *windowWidget = m_widget; if (!windowWidget) - return Q_NULLPTR; + return nullptr; // A window can't have a focus object if it's being destroyed. if (QWidgetPrivate::get(windowWidget)->data.in_destructor) @@ -422,7 +422,7 @@ void QWidgetWindow::handleEnterLeaveEvent(QEvent *event) const QEnterEvent *ee = static_cast<QEnterEvent *>(event); QWidget *child = m_widget->childAt(ee->pos()); QWidget *receiver = child ? child : m_widget.data(); - QWidget *leave = Q_NULLPTR; + QWidget *leave = nullptr; if (QApplicationPrivate::inPopupMode() && receiver == m_widget && qt_last_mouse_receiver != m_widget) { // This allows to deliver the leave event to the native widget @@ -529,11 +529,11 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event) // Prevent negative mouse position on enter event - this event // should be properly handled in "handleEnterLeaveEvent()". if (receiverMapped.x() >= 0 && receiverMapped.y() >= 0) { - QApplicationPrivate::dispatchEnterLeave(receiver, Q_NULLPTR, event->screenPos()); + QApplicationPrivate::dispatchEnterLeave(receiver, nullptr, event->screenPos()); qt_last_mouse_receiver = receiver; } } else { - QApplicationPrivate::dispatchEnterLeave(Q_NULLPTR, qt_last_mouse_receiver, event->screenPos()); + QApplicationPrivate::dispatchEnterLeave(nullptr, qt_last_mouse_receiver, event->screenPos()); qt_last_mouse_receiver = receiver; receiver = activePopupWidget; } @@ -637,12 +637,9 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event) QWidget *receiver = QApplicationPrivate::pickMouseReceiver(m_widget, event->windowPos().toPoint(), &mapped, event->type(), event->buttons(), qt_button_down, widget); - - if (!receiver) { - if (event->type() == QEvent::MouseButtonRelease) - QApplicationPrivate::mouse_buttons &= ~event->button(); + if (!receiver) return; - } + if ((event->type() != QEvent::MouseButtonPress) || !(event->flags().testFlag(Qt::MouseEventCreatedDoubleClick))) { diff --git a/src/widgets/kernel/qwidgetwindow_p.h b/src/widgets/kernel/qwidgetwindow_p.h index be3f808a22..d0f1d55c2a 100644 --- a/src/widgets/kernel/qwidgetwindow_p.h +++ b/src/widgets/kernel/qwidgetwindow_p.h @@ -75,13 +75,13 @@ public: QWidget *widget() const { return m_widget; } #ifndef QT_NO_ACCESSIBILITY - QAccessibleInterface *accessibleRoot() const Q_DECL_OVERRIDE; + QAccessibleInterface *accessibleRoot() const override; #endif - QObject *focusObject() const Q_DECL_OVERRIDE; + QObject *focusObject() const override; void setNativeWindowVisibility(bool visible); protected: - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; void handleCloseEvent(QCloseEvent *); void handleEnterLeaveEvent(QEvent *); @@ -102,7 +102,7 @@ protected: #endif void handleExposeEvent(QExposeEvent *); void handleWindowStateChangedEvent(QWindowStateChangeEvent *event); - bool nativeEvent(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE; + bool nativeEvent(const QByteArray &eventType, void *message, long *result) override; #if QT_CONFIG(tabletevent) void handleTabletEvent(QTabletEvent *); #endif diff --git a/src/widgets/kernel/qwindowcontainer_p.h b/src/widgets/kernel/qwindowcontainer_p.h index 1d838c8dd6..a8754232a8 100644 --- a/src/widgets/kernel/qwindowcontainer_p.h +++ b/src/widgets/kernel/qwindowcontainer_p.h @@ -75,7 +75,7 @@ public: static void parentWasLowered(QWidget *parent); protected: - bool event(QEvent *ev) Q_DECL_OVERRIDE; + bool event(QEvent *ev) override; private slots: void focusWindowChanged(QWindow *focusWindow); diff --git a/src/widgets/statemachine/qbasickeyeventtransition_p.h b/src/widgets/statemachine/qbasickeyeventtransition_p.h index d3b90f6104..5007b79739 100644 --- a/src/widgets/statemachine/qbasickeyeventtransition_p.h +++ b/src/widgets/statemachine/qbasickeyeventtransition_p.h @@ -80,8 +80,8 @@ public: void setModifierMask(Qt::KeyboardModifiers modifiers); protected: - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; - void onTransition(QEvent *) Q_DECL_OVERRIDE; + bool eventTest(QEvent *event) override; + void onTransition(QEvent *) override; private: Q_DISABLE_COPY(QBasicKeyEventTransition) diff --git a/src/widgets/statemachine/qbasicmouseeventtransition_p.h b/src/widgets/statemachine/qbasicmouseeventtransition_p.h index d6d37eb03e..93d2a5ec61 100644 --- a/src/widgets/statemachine/qbasicmouseeventtransition_p.h +++ b/src/widgets/statemachine/qbasicmouseeventtransition_p.h @@ -83,8 +83,8 @@ public: void setHitTestPath(const QPainterPath &path); protected: - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; - void onTransition(QEvent *) Q_DECL_OVERRIDE; + bool eventTest(QEvent *event) override; + void onTransition(QEvent *) override; private: Q_DISABLE_COPY(QBasicMouseEventTransition) diff --git a/src/widgets/statemachine/qkeyeventtransition.h b/src/widgets/statemachine/qkeyeventtransition.h index 23ce3c40be..676f5f7846 100644 --- a/src/widgets/statemachine/qkeyeventtransition.h +++ b/src/widgets/statemachine/qkeyeventtransition.h @@ -54,9 +54,9 @@ class Q_WIDGETS_EXPORT QKeyEventTransition : public QEventTransition Q_PROPERTY(int key READ key WRITE setKey) Q_PROPERTY(Qt::KeyboardModifiers modifierMask READ modifierMask WRITE setModifierMask) public: - QKeyEventTransition(QState *sourceState = Q_NULLPTR); + QKeyEventTransition(QState *sourceState = nullptr); QKeyEventTransition(QObject *object, QEvent::Type type, int key, - QState *sourceState = Q_NULLPTR); + QState *sourceState = nullptr); ~QKeyEventTransition(); int key() const; @@ -66,8 +66,8 @@ public: void setModifierMask(Qt::KeyboardModifiers modifiers); protected: - void onTransition(QEvent *event) Q_DECL_OVERRIDE; - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; + void onTransition(QEvent *event) override; + bool eventTest(QEvent *event) override; private: Q_DISABLE_COPY(QKeyEventTransition) diff --git a/src/widgets/statemachine/qmouseeventtransition.h b/src/widgets/statemachine/qmouseeventtransition.h index 3f40224d8c..41f738d894 100644 --- a/src/widgets/statemachine/qmouseeventtransition.h +++ b/src/widgets/statemachine/qmouseeventtransition.h @@ -55,9 +55,9 @@ class Q_WIDGETS_EXPORT QMouseEventTransition : public QEventTransition Q_PROPERTY(Qt::MouseButton button READ button WRITE setButton) Q_PROPERTY(Qt::KeyboardModifiers modifierMask READ modifierMask WRITE setModifierMask) public: - QMouseEventTransition(QState *sourceState = Q_NULLPTR); + QMouseEventTransition(QState *sourceState = nullptr); QMouseEventTransition(QObject *object, QEvent::Type type, - Qt::MouseButton button, QState *sourceState = Q_NULLPTR); + Qt::MouseButton button, QState *sourceState = nullptr); ~QMouseEventTransition(); Qt::MouseButton button() const; @@ -70,8 +70,8 @@ public: void setHitTestPath(const QPainterPath &path); protected: - void onTransition(QEvent *event) Q_DECL_OVERRIDE; - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; + void onTransition(QEvent *event) override; + bool eventTest(QEvent *event) override; private: Q_DISABLE_COPY(QMouseEventTransition) diff --git a/src/widgets/styles/qcommonstyle.h b/src/widgets/styles/qcommonstyle.h index ed880a150f..f39915295e 100644 --- a/src/widgets/styles/qcommonstyle.h +++ b/src/widgets/styles/qcommonstyle.h @@ -56,40 +56,40 @@ public: ~QCommonStyle(); void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QWidget *w = nullptr) const override; void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = Q_NULLPTR) const Q_DECL_OVERRIDE; - QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QWidget *w = nullptr) const override; + QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = nullptr) const override; void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *w = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QWidget *w = nullptr) const override; SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *w = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QPoint &pt, const QWidget *w = nullptr) const override; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, - const QWidget *w = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QWidget *w = nullptr) const override; QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QSize &contentsSize, const QWidget *widget = nullptr) const override; - int pixelMetric(PixelMetric m, const QStyleOption *opt = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + int pixelMetric(PixelMetric m, const QStyleOption *opt = nullptr, const QWidget *widget = nullptr) const override; - int styleHint(StyleHint sh, const QStyleOption *opt = Q_NULLPTR, const QWidget *w = Q_NULLPTR, - QStyleHintReturn *shret = Q_NULLPTR) const Q_DECL_OVERRIDE; + int styleHint(StyleHint sh, const QStyleOption *opt = nullptr, const QWidget *w = nullptr, + QStyleHintReturn *shret = nullptr) const override; - QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; - QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = nullptr, + const QWidget *widget = nullptr) const override; + QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt = nullptr, + const QWidget *widget = nullptr) const override; QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, - const QStyleOption *opt) const Q_DECL_OVERRIDE; + const QStyleOption *opt) const override; int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, - Qt::Orientation orientation, const QStyleOption *option = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; - - void polish(QPalette &) Q_DECL_OVERRIDE; - void polish(QApplication *app) Q_DECL_OVERRIDE; - void polish(QWidget *widget) Q_DECL_OVERRIDE; - void unpolish(QWidget *widget) Q_DECL_OVERRIDE; - void unpolish(QApplication *application) Q_DECL_OVERRIDE; + Qt::Orientation orientation, const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const override; + + void polish(QPalette &) override; + void polish(QApplication *app) override; + void polish(QWidget *widget) override; + void unpolish(QWidget *widget) override; + void unpolish(QApplication *application) override; protected: QCommonStyle(QCommonStylePrivate &dd); diff --git a/src/widgets/styles/qdrawutil.h b/src/widgets/styles/qdrawutil.h index d5582f2c90..346029e1b4 100644 --- a/src/widgets/styles/qdrawutil.h +++ b/src/widgets/styles/qdrawutil.h @@ -70,42 +70,42 @@ Q_WIDGETS_EXPORT void qDrawShadeLine(QPainter *p, const QPoint &p1, const QPoint Q_WIDGETS_EXPORT void qDrawShadeRect(QPainter *p, int x, int y, int w, int h, const QPalette &pal, bool sunken = false, int lineWidth = 1, int midLineWidth = 0, - const QBrush *fill = Q_NULLPTR); + const QBrush *fill = nullptr); Q_WIDGETS_EXPORT void qDrawShadeRect(QPainter *p, const QRect &r, const QPalette &pal, bool sunken = false, int lineWidth = 1, int midLineWidth = 0, - const QBrush *fill = Q_NULLPTR); + const QBrush *fill = nullptr); Q_WIDGETS_EXPORT void qDrawShadePanel(QPainter *p, int x, int y, int w, int h, const QPalette &pal, bool sunken = false, - int lineWidth = 1, const QBrush *fill = Q_NULLPTR); + int lineWidth = 1, const QBrush *fill = nullptr); Q_WIDGETS_EXPORT void qDrawShadePanel(QPainter *p, const QRect &r, const QPalette &pal, bool sunken = false, - int lineWidth = 1, const QBrush *fill = Q_NULLPTR); + int lineWidth = 1, const QBrush *fill = nullptr); Q_WIDGETS_EXPORT void qDrawWinButton(QPainter *p, int x, int y, int w, int h, const QPalette &pal, bool sunken = false, - const QBrush *fill = Q_NULLPTR); + const QBrush *fill = nullptr); Q_WIDGETS_EXPORT void qDrawWinButton(QPainter *p, const QRect &r, const QPalette &pal, bool sunken = false, - const QBrush *fill = Q_NULLPTR); + const QBrush *fill = nullptr); Q_WIDGETS_EXPORT void qDrawWinPanel(QPainter *p, int x, int y, int w, int h, const QPalette &pal, bool sunken = false, - const QBrush *fill = Q_NULLPTR); + const QBrush *fill = nullptr); Q_WIDGETS_EXPORT void qDrawWinPanel(QPainter *p, const QRect &r, const QPalette &pal, bool sunken = false, - const QBrush *fill = Q_NULLPTR); + const QBrush *fill = nullptr); Q_WIDGETS_EXPORT void qDrawPlainRect(QPainter *p, int x, int y, int w, int h, const QColor &, - int lineWidth = 1, const QBrush *fill = Q_NULLPTR); + int lineWidth = 1, const QBrush *fill = nullptr); Q_WIDGETS_EXPORT void qDrawPlainRect(QPainter *p, const QRect &r, const QColor &, - int lineWidth = 1, const QBrush *fill = Q_NULLPTR); + int lineWidth = 1, const QBrush *fill = nullptr); diff --git a/src/widgets/styles/qfusionstyle_p.h b/src/widgets/styles/qfusionstyle_p.h index 10f76045d5..e67e792727 100644 --- a/src/widgets/styles/qfusionstyle_p.h +++ b/src/widgets/styles/qfusionstyle_p.h @@ -69,41 +69,41 @@ public: QFusionStyle(); ~QFusionStyle(); - QPalette standardPalette () const Q_DECL_OVERRIDE; + QPalette standardPalette () const override; void drawPrimitive(PrimitiveElement elem, const QStyleOption *option, - QPainter *painter, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + QPainter *painter, const QWidget *widget = 0) const override; void drawControl(ControlElement ce, const QStyleOption *option, QPainter *painter, - const QWidget *widget) const Q_DECL_OVERRIDE; - int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *widget) const override; + int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const override; void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, - QPainter *painter, const QWidget *widget) const Q_DECL_OVERRIDE; - QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + QPainter *painter, const QWidget *widget) const override; + QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const override; QSize sizeFromContents(ContentsType type, const QStyleOption *option, - const QSize &size, const QWidget *widget) const Q_DECL_OVERRIDE; + const QSize &size, const QWidget *widget) const override; SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *w = 0) const Q_DECL_OVERRIDE; + const QPoint &pt, const QWidget *w = 0) const override; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, - SubControl sc, const QWidget *widget) const Q_DECL_OVERRIDE; + SubControl sc, const QWidget *widget) const override; QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, - const QStyleOption *opt) const Q_DECL_OVERRIDE; + const QStyleOption *opt) const override; int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, - QStyleHintReturn *returnData = 0) const Q_DECL_OVERRIDE; - QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const Q_DECL_OVERRIDE; + QStyleHintReturn *returnData = 0) const override; + QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const override; QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0, - const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *widget = 0) const override; QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, - const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *widget = 0) const override; void drawItemPixmap(QPainter *painter, const QRect &rect, - int alignment, const QPixmap &pixmap) const Q_DECL_OVERRIDE; + int alignment, const QPixmap &pixmap) const override; void drawItemText(QPainter *painter, const QRect &rect, int flags, const QPalette &pal, bool enabled, - const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const Q_DECL_OVERRIDE; - void polish(QWidget *widget) Q_DECL_OVERRIDE; - void polish(QApplication *app) Q_DECL_OVERRIDE; - void polish(QPalette &pal) Q_DECL_OVERRIDE; - void unpolish(QWidget *widget) Q_DECL_OVERRIDE; - void unpolish(QApplication *app) Q_DECL_OVERRIDE; + const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const override; + void polish(QWidget *widget) override; + void polish(QApplication *app) override; + void polish(QPalette &pal) override; + void unpolish(QWidget *widget) override; + void unpolish(QApplication *app) override; protected: QFusionStyle(QFusionStylePrivate &dd); diff --git a/src/widgets/styles/qpixmapstyle_p.h b/src/widgets/styles/qpixmapstyle_p.h index 618d6d2f50..590434d95e 100644 --- a/src/widgets/styles/qpixmapstyle_p.h +++ b/src/widgets/styles/qpixmapstyle_p.h @@ -136,34 +136,34 @@ public: QPixmapStyle(); ~QPixmapStyle(); - void polish(QApplication *application) Q_DECL_OVERRIDE; - void polish(QPalette &palette) Q_DECL_OVERRIDE; - void polish(QWidget *widget) Q_DECL_OVERRIDE; - void unpolish(QApplication *application) Q_DECL_OVERRIDE; - void unpolish(QWidget *widget) Q_DECL_OVERRIDE; + void polish(QApplication *application) override; + void polish(QPalette &palette) override; + void polish(QWidget *widget) override; + void unpolish(QApplication *application) override; + void unpolish(QWidget *widget) override; void drawPrimitive(PrimitiveElement element, const QStyleOption *option, - QPainter *painter, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + QPainter *painter, const QWidget *widget = nullptr) const override; void drawControl(ControlElement element, const QStyleOption *option, - QPainter *painter, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + QPainter *painter, const QWidget *widget = nullptr) const override; void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *option, - QPainter *painter, const QWidget *widget=0) const Q_DECL_OVERRIDE; + QPainter *painter, const QWidget *widget=0) const override; QSize sizeFromContents(ContentsType type, const QStyleOption *option, - const QSize &contentsSize, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QSize &contentsSize, const QWidget *widget = nullptr) const override; QRect subElementRect(SubElement element, const QStyleOption *option, - const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QWidget *widget = nullptr) const override; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *option, - SubControl sc, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + SubControl sc, const QWidget *widget = nullptr) const override; - int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const override; int styleHint(StyleHint hint, const QStyleOption *option, - const QWidget *widget, QStyleHintReturn *returnData) const Q_DECL_OVERRIDE; + const QWidget *widget, QStyleHintReturn *returnData) const override; SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option, - const QPoint &pos, const QWidget *widget) const Q_DECL_OVERRIDE; + const QPoint &pos, const QWidget *widget) const override; - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) override; void addDescriptor(ControlDescriptor control, const QString &fileName, QMargins margins = QMargins(), diff --git a/src/widgets/styles/qproxystyle.h b/src/widgets/styles/qproxystyle.h index 20a0f12868..c26d9abf59 100644 --- a/src/widgets/styles/qproxystyle.h +++ b/src/widgets/styles/qproxystyle.h @@ -54,47 +54,47 @@ class Q_WIDGETS_EXPORT QProxyStyle : public QCommonStyle Q_OBJECT public: - QProxyStyle(QStyle *style = Q_NULLPTR); + QProxyStyle(QStyle *style = nullptr); QProxyStyle(const QString &key); ~QProxyStyle(); QStyle *baseStyle() const; void setBaseStyle(QStyle *style); - void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; - void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; - void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = nullptr) const override; + void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = nullptr) const override; + void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget = nullptr) const override; void drawItemText(QPainter *painter, const QRect &rect, int flags, const QPalette &pal, bool enabled, - const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const Q_DECL_OVERRIDE; - virtual void drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, const QPixmap &pixmap) const Q_DECL_OVERRIDE; + const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const override; + virtual void drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, const QPixmap &pixmap) const override; - QSize sizeFromContents(ContentsType type, const QStyleOption *option, const QSize &size, const QWidget *widget) const Q_DECL_OVERRIDE; + QSize sizeFromContents(ContentsType type, const QStyleOption *option, const QSize &size, const QWidget *widget) const override; - QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const Q_DECL_OVERRIDE; - QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const Q_DECL_OVERRIDE; - QRect itemTextRect(const QFontMetrics &fm, const QRect &r, int flags, bool enabled, const QString &text) const Q_DECL_OVERRIDE; - QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const Q_DECL_OVERRIDE; + QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const override; + QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const override; + QRect itemTextRect(const QFontMetrics &fm, const QRect &r, int flags, bool enabled, const QString &text) const override; + QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const override; - SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option, const QPoint &pos, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; - int styleHint(StyleHint hint, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR, QStyleHintReturn *returnData = Q_NULLPTR) const Q_DECL_OVERRIDE; - int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option, const QPoint &pos, const QWidget *widget = nullptr) const override; + int styleHint(StyleHint hint, const QStyleOption *option = nullptr, const QWidget *widget = nullptr, QStyleHintReturn *returnData = nullptr) const override; + int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const override; int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, - Qt::Orientation orientation, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + Qt::Orientation orientation, const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const override; - QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; - QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; - QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const Q_DECL_OVERRIDE; - QPalette standardPalette() const Q_DECL_OVERRIDE; + QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const override; + QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget = nullptr) const override; + QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const override; + QPalette standardPalette() const override; - void polish(QWidget *widget) Q_DECL_OVERRIDE; - void polish(QPalette &pal) Q_DECL_OVERRIDE; - void polish(QApplication *app) Q_DECL_OVERRIDE; + void polish(QWidget *widget) override; + void polish(QPalette &pal) override; + void polish(QApplication *app) override; - void unpolish(QWidget *widget) Q_DECL_OVERRIDE; - void unpolish(QApplication *app) Q_DECL_OVERRIDE; + void unpolish(QWidget *widget) override; + void unpolish(QApplication *app) override; protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; private: Q_DISABLE_COPY(QProxyStyle) diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h index b4936a3e0a..f922aff7f1 100644 --- a/src/widgets/styles/qstyle.h +++ b/src/widgets/styles/qstyle.h @@ -202,7 +202,7 @@ public: Q_ENUM(PrimitiveElement) virtual void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = Q_NULLPTR) const = 0; + const QWidget *w = nullptr) const = 0; enum ControlElement { CE_PushButton, CE_PushButtonBevel, @@ -273,7 +273,7 @@ public: Q_ENUM(ControlElement) virtual void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = Q_NULLPTR) const = 0; + const QWidget *w = nullptr) const = 0; enum SubElement { SE_PushButtonContents, @@ -362,7 +362,7 @@ public: Q_ENUM(SubElement) virtual QRect subElementRect(SubElement subElement, const QStyleOption *option, - const QWidget *widget = Q_NULLPTR) const = 0; + const QWidget *widget = nullptr) const = 0; enum ComplexControl { @@ -441,11 +441,11 @@ public: virtual void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *widget = Q_NULLPTR) const = 0; + const QWidget *widget = nullptr) const = 0; virtual SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *widget = Q_NULLPTR) const = 0; + const QPoint &pt, const QWidget *widget = nullptr) const = 0; virtual QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, - SubControl sc, const QWidget *widget = Q_NULLPTR) const = 0; + SubControl sc, const QWidget *widget = nullptr) const = 0; enum PixelMetric { PM_ButtonMargin, @@ -579,8 +579,8 @@ public: }; Q_ENUM(PixelMetric) - virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR) const = 0; + virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const = 0; enum ContentsType { CT_PushButton, @@ -612,7 +612,7 @@ public: Q_ENUM(ContentsType) virtual QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *w = Q_NULLPTR) const = 0; + const QSize &contentsSize, const QWidget *w = nullptr) const = 0; enum RequestSoftwareInputPanel { RSIP_OnMouseClickAndAlreadyFocused, @@ -745,8 +745,8 @@ public: }; Q_ENUM(StyleHint) - virtual int styleHint(StyleHint stylehint, const QStyleOption *opt = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR, QStyleHintReturn* returnData = Q_NULLPTR) const = 0; + virtual int styleHint(StyleHint stylehint, const QStyleOption *opt = nullptr, + const QWidget *widget = nullptr, QStyleHintReturn* returnData = nullptr) const = 0; enum StandardPixmap { SP_TitleBarMenuButton, @@ -825,11 +825,11 @@ public: }; Q_ENUM(StandardPixmap) - virtual QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR) const = 0; + virtual QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt = nullptr, + const QWidget *widget = nullptr) const = 0; - virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR) const = 0; + virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const = 0; virtual QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const = 0; @@ -848,10 +848,10 @@ public: virtual int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, - const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const = 0; + const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const = 0; int combinedLayoutSpacing(QSizePolicy::ControlTypes controls1, QSizePolicy::ControlTypes controls2, Qt::Orientation orientation, - QStyleOption *option = Q_NULLPTR, QWidget *widget = Q_NULLPTR) const; + QStyleOption *option = nullptr, QWidget *widget = nullptr) const; const QStyle * proxy() const; diff --git a/src/widgets/styles/qstyleanimation_p.h b/src/widgets/styles/qstyleanimation_p.h index bb1ab9d877..a2ad4a91da 100644 --- a/src/widgets/styles/qstyleanimation_p.h +++ b/src/widgets/styles/qstyleanimation_p.h @@ -70,7 +70,7 @@ public: QObject *target() const; - int duration() const Q_DECL_OVERRIDE; + int duration() const override; void setDuration(int duration); int delay() const; @@ -97,7 +97,7 @@ public Q_SLOTS: protected: virtual bool isUpdateNeeded() const; - virtual void updateCurrentTime(int time) Q_DECL_OVERRIDE; + virtual void updateCurrentTime(int time) override; private: int _delay; @@ -121,7 +121,7 @@ public: void setSpeed(int speed); protected: - bool isUpdateNeeded() const Q_DECL_OVERRIDE; + bool isUpdateNeeded() const override; private: int _speed; @@ -144,7 +144,7 @@ public: qreal currentValue() const; protected: - bool isUpdateNeeded() const Q_DECL_OVERRIDE; + bool isUpdateNeeded() const override; private: qreal _start; @@ -170,7 +170,7 @@ public: QImage currentImage() const; protected: - virtual void updateCurrentTime(int time) Q_DECL_OVERRIDE; + virtual void updateCurrentTime(int time) override; private: Type _type; @@ -194,7 +194,7 @@ public: void setActive(bool active); private slots: - void updateCurrentTime(int time) Q_DECL_OVERRIDE; + void updateCurrentTime(int time) override; private: Mode _mode; diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h index f703c56917..2880917510 100644 --- a/src/widgets/styles/qstyleoption.h +++ b/src/widgets/styles/qstyleoption.h @@ -682,7 +682,7 @@ T qstyleoption_cast(const QStyleOption *opt) || (int(Opt::Type) == QStyleOption::SO_Complex && opt->type > QStyleOption::SO_Complex))) return static_cast<T>(opt); - return Q_NULLPTR; + return nullptr; } template <typename T> @@ -694,7 +694,7 @@ T qstyleoption_cast(QStyleOption *opt) || (int(Opt::Type) == QStyleOption::SO_Complex && opt->type > QStyleOption::SO_Complex))) return static_cast<T>(opt); - return Q_NULLPTR; + return nullptr; } // -------------------------- QStyleHintReturn ------------------------------- @@ -743,7 +743,7 @@ T qstyleoption_cast(const QStyleHintReturn *hint) if (hint && hint->version <= Opt::Version && (hint->type == Opt::Type || int(Opt::Type) == QStyleHintReturn::SH_Default)) return static_cast<T>(hint); - return Q_NULLPTR; + return nullptr; } template <typename T> @@ -753,7 +753,7 @@ T qstyleoption_cast(QStyleHintReturn *hint) if (hint && hint->version <= Opt::Version && (hint->type == Opt::Type || int(Opt::Type) == QStyleHintReturn::SH_Default)) return static_cast<T>(hint); - return Q_NULLPTR; + return nullptr; } #if !defined(QT_NO_DEBUG_STREAM) diff --git a/src/widgets/styles/qstylepainter.h b/src/widgets/styles/qstylepainter.h index 191360727e..b5e7956cb1 100644 --- a/src/widgets/styles/qstylepainter.h +++ b/src/widgets/styles/qstylepainter.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE class QStylePainter : public QPainter { public: - inline QStylePainter() : QPainter(), widget(Q_NULLPTR), wstyle(Q_NULLPTR) {} + inline QStylePainter() : QPainter(), widget(nullptr), wstyle(nullptr) {} inline explicit QStylePainter(QWidget *w) { begin(w, w); } inline QStylePainter(QPaintDevice *pd, QWidget *w) { begin(pd, w); } inline bool begin(QWidget *w) { return begin(w, w); } diff --git a/src/widgets/styles/qstyleplugin.h b/src/widgets/styles/qstyleplugin.h index d44f57d208..e9a26f9127 100644 --- a/src/widgets/styles/qstyleplugin.h +++ b/src/widgets/styles/qstyleplugin.h @@ -55,7 +55,7 @@ class Q_WIDGETS_EXPORT QStylePlugin : public QObject { Q_OBJECT public: - explicit QStylePlugin(QObject *parent = Q_NULLPTR); + explicit QStylePlugin(QObject *parent = nullptr); ~QStylePlugin(); virtual QStyle *create(const QString &key) = 0; diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index a721357ddc..fd812d8d0d 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -1463,7 +1463,7 @@ class QStyleSheetStyleSelector : public StyleSelector public: QStyleSheetStyleSelector() { } - QStringList nodeNames(NodePtr node) const Q_DECL_OVERRIDE + QStringList nodeNames(NodePtr node) const override { if (isNullNode(node)) return QStringList(); @@ -1479,7 +1479,7 @@ public: } while (metaObject != 0); return result; } - QString attribute(NodePtr node, const QString& name) const Q_DECL_OVERRIDE + QString attribute(NodePtr node, const QString& name) const override { if (isNullNode(node)) return QString(); @@ -1516,7 +1516,7 @@ public: cache[name] = valueStr; return valueStr; } - bool nodeNameEquals(NodePtr node, const QString& nodeName) const Q_DECL_OVERRIDE + bool nodeNameEquals(NodePtr node, const QString& nodeName) const override { if (isNullNode(node)) return false; @@ -1539,19 +1539,19 @@ public: } while (metaObject != 0); return false; } - bool hasAttributes(NodePtr) const Q_DECL_OVERRIDE + bool hasAttributes(NodePtr) const override { return true; } - QStringList nodeIds(NodePtr node) const Q_DECL_OVERRIDE + QStringList nodeIds(NodePtr node) const override { return isNullNode(node) ? QStringList() : QStringList(OBJECT_PTR(node)->objectName()); } - bool isNullNode(NodePtr node) const Q_DECL_OVERRIDE + bool isNullNode(NodePtr node) const override { return node.ptr == 0; } - NodePtr parentNode(NodePtr node) const Q_DECL_OVERRIDE + NodePtr parentNode(NodePtr node) const override { NodePtr n; n.ptr = isNullNode(node) ? 0 : parentObject(OBJECT_PTR(node)); return n; } - NodePtr previousSiblingNode(NodePtr) const Q_DECL_OVERRIDE + NodePtr previousSiblingNode(NodePtr) const override { NodePtr n; n.ptr = 0; return n; } - NodePtr duplicateNode(NodePtr node) const Q_DECL_OVERRIDE + NodePtr duplicateNode(NodePtr node) const override { return node; } - void freeNode(NodePtr) const Q_DECL_OVERRIDE + void freeNode(NodePtr) const override { } private: @@ -4262,7 +4262,7 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op switch (pe) { case PE_FrameStatusBar: { - QRenderRule subRule = renderRule(w ? w->parentWidget() : Q_NULLPTR, opt, PseudoElement_Item); + QRenderRule subRule = renderRule(w ? w->parentWidget() : nullptr, opt, PseudoElement_Item); if (subRule.hasDrawable()) { subRule.drawRule(p, opt->rect); return; diff --git a/src/widgets/styles/qstylesheetstyle_p.h b/src/widgets/styles/qstylesheetstyle_p.h index 2d302305bd..042abf5c22 100644 --- a/src/widgets/styles/qstylesheetstyle_p.h +++ b/src/widgets/styles/qstylesheetstyle_p.h @@ -82,48 +82,48 @@ public: ~QStyleSheetStyle(); void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; + const QWidget *w = 0) const override; void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; - void drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, const QPixmap &pixmap) const Q_DECL_OVERRIDE; + const QWidget *w = 0) const override; + void drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, const QPixmap &pixmap) const override; void drawItemText(QPainter *painter, const QRect& rect, int alignment, const QPalette &pal, - bool enabled, const QString& text, QPalette::ColorRole textRole = QPalette::NoRole) const Q_DECL_OVERRIDE; + bool enabled, const QString& text, QPalette::ColorRole textRole = QPalette::NoRole) const override; void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; + const QWidget *w = 0) const override; QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, - const QStyleOption *option) const Q_DECL_OVERRIDE; + const QStyleOption *option) const override; SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *w = 0) const Q_DECL_OVERRIDE; - QRect itemPixmapRect(const QRect &rect, int alignment, const QPixmap &pixmap) const Q_DECL_OVERRIDE; + const QPoint &pt, const QWidget *w = 0) const override; + QRect itemPixmapRect(const QRect &rect, int alignment, const QPixmap &pixmap) const override; QRect itemTextRect(const QFontMetrics &metrics, const QRect &rect, int alignment, bool enabled, - const QString &text) const Q_DECL_OVERRIDE; - int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE; - void polish(QWidget *widget) Q_DECL_OVERRIDE; - void polish(QApplication *app) Q_DECL_OVERRIDE; - void polish(QPalette &pal) Q_DECL_OVERRIDE; + const QString &text) const override; + int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const override; + void polish(QWidget *widget) override; + void polish(QApplication *app) override; + void polish(QPalette &pal) override; QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *widget = 0) const Q_DECL_OVERRIDE; - QPalette standardPalette() const Q_DECL_OVERRIDE; + const QSize &contentsSize, const QWidget *widget = 0) const override; + QPalette standardPalette() const override; QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0, - const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *widget = 0) const override; QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *option = 0, - const QWidget *w = 0 ) const Q_DECL_OVERRIDE; + const QWidget *w = 0 ) const override; int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option = 0, - const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *widget = 0) const override; int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = 0, - QStyleHintReturn *shret = 0) const Q_DECL_OVERRIDE; - QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + QStyleHintReturn *shret = 0) const override; + QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const override; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, - const QWidget *w = 0) const Q_DECL_OVERRIDE; + const QWidget *w = 0) const override; // These functions are called from QApplication/QWidget. Be careful. QStyle *baseStyle() const; void repolish(QWidget *widget); void repolish(QApplication *app); - void unpolish(QWidget *widget) Q_DECL_OVERRIDE; - void unpolish(QApplication *app) Q_DECL_OVERRIDE; + void unpolish(QWidget *widget) override; + void unpolish(QApplication *app) override; QStyle *base; void ref() { ++refcount; } @@ -136,7 +136,7 @@ public: bool styleSheetPalette(const QWidget* w, const QStyleOption* opt, QPalette* pal); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; private: int refcount; diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index 657166fc8d..9e53038348 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -380,7 +380,7 @@ int QWindowsStylePrivate::fixedPixelMetric(QStyle::PixelMetric pm) static QWindow *windowOf(const QWidget *w) { - QWindow *result = Q_NULLPTR; + QWindow *result = nullptr; if (w) { result = w->windowHandle(); if (!result) { diff --git a/src/widgets/styles/qwindowsstyle_p.h b/src/widgets/styles/qwindowsstyle_p.h index 12a682f330..7993b9f1c6 100644 --- a/src/widgets/styles/qwindowsstyle_p.h +++ b/src/widgets/styles/qwindowsstyle_p.h @@ -68,37 +68,37 @@ public: QWindowsStyle(); ~QWindowsStyle(); - void polish(QApplication*) Q_DECL_OVERRIDE; - void unpolish(QApplication*) Q_DECL_OVERRIDE; + void polish(QApplication*) override; + void unpolish(QApplication*) override; - void polish(QWidget*) Q_DECL_OVERRIDE; - void unpolish(QWidget*) Q_DECL_OVERRIDE; + void polish(QWidget*) override; + void unpolish(QWidget*) override; - void polish(QPalette &) Q_DECL_OVERRIDE; + void polish(QPalette &) override; void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; + const QWidget *w = 0) const override; void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; - QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *w = 0) const override; + QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const override; void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; + const QWidget *w = 0) const override; QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QSize &contentsSize, const QWidget *widget = 0) const override; - int pixelMetric(PixelMetric pm, const QStyleOption *option = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + int pixelMetric(PixelMetric pm, const QStyleOption *option = 0, const QWidget *widget = 0) const override; int styleHint(StyleHint hint, const QStyleOption *opt = 0, const QWidget *widget = 0, - QStyleHintReturn *returnData = 0) const Q_DECL_OVERRIDE; + QStyleHintReturn *returnData = 0) const override; QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, - const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *widget = 0) const override; QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0, - const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *widget = 0) const override; protected: - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) override; QWindowsStyle(QWindowsStylePrivate &dd); private: diff --git a/src/widgets/styles/qwindowsstyle_p_p.h b/src/widgets/styles/qwindowsstyle_p_p.h index 8b387b6ab9..67fa6a2f86 100644 --- a/src/widgets/styles/qwindowsstyle_p_p.h +++ b/src/widgets/styles/qwindowsstyle_p_p.h @@ -73,7 +73,7 @@ public: static int fixedPixelMetric(QStyle::PixelMetric pm); static qreal devicePixelRatio(const QWidget *widget = 0) { return widget ? widget->devicePixelRatioF() : QWindowsStylePrivate::appDevicePixelRatio(); } - static qreal nativeMetricScaleFactor(const QWidget *widget = Q_NULLPTR); + static qreal nativeMetricScaleFactor(const QWidget *widget = nullptr); bool hasSeenAlt(const QWidget *widget) const; bool altDown() const { return alt_down; } diff --git a/src/widgets/util/qcompleter.h b/src/widgets/util/qcompleter.h index 1a2c2440f5..de79302e15 100644 --- a/src/widgets/util/qcompleter.h +++ b/src/widgets/util/qcompleter.h @@ -82,10 +82,10 @@ public: CaseInsensitivelySortedModel }; - QCompleter(QObject *parent = Q_NULLPTR); - QCompleter(QAbstractItemModel *model, QObject *parent = Q_NULLPTR); + QCompleter(QObject *parent = nullptr); + QCompleter(QAbstractItemModel *model, QObject *parent = nullptr); #ifndef QT_NO_STRINGLISTMODEL - QCompleter(const QStringList& completions, QObject *parent = Q_NULLPTR); + QCompleter(const QStringList& completions, QObject *parent = nullptr); #endif ~QCompleter(); @@ -142,8 +142,8 @@ public: virtual QStringList splitPath(const QString &path) const; protected: - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; - bool event(QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) override; + bool event(QEvent *) override; Q_SIGNALS: void activated(const QString &text); diff --git a/src/widgets/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h index e76dcdc8bc..765363744b 100644 --- a/src/widgets/util/qcompleter_p.h +++ b/src/widgets/util/qcompleter_p.h @@ -177,7 +177,7 @@ class QSortedModelEngine : public QCompletionEngine { public: QSortedModelEngine(QCompleterPrivate *c) : QCompletionEngine(c) { } - QMatchData filter(const QString&, const QModelIndex&, int) Q_DECL_OVERRIDE; + QMatchData filter(const QString&, const QModelIndex&, int) override; QIndexMapper indexHint(QString, const QModelIndex&, Qt::SortOrder); Qt::SortOrder sortOrder(const QModelIndex&) const; }; @@ -187,8 +187,8 @@ class QUnsortedModelEngine : public QCompletionEngine public: QUnsortedModelEngine(QCompleterPrivate *c) : QCompletionEngine(c) { } - void filterOnDemand(int) Q_DECL_OVERRIDE; - QMatchData filter(const QString&, const QModelIndex&, int) Q_DECL_OVERRIDE; + void filterOnDemand(int) override; + QMatchData filter(const QString&, const QModelIndex&, int) override; private: int buildIndices(const QString& str, const QModelIndex& parent, int n, const QIndexMapper& iv, QMatchData* m); @@ -199,7 +199,7 @@ class QCompleterItemDelegate : public QItemDelegate public: QCompleterItemDelegate(QAbstractItemView *view) : QItemDelegate(view), view(view) { } - void paint(QPainter *p, const QStyleOptionViewItem& opt, const QModelIndex& idx) const Q_DECL_OVERRIDE { + void paint(QPainter *p, const QStyleOptionViewItem& opt, const QModelIndex& idx) const override { QStyleOptionViewItem optCopy = opt; optCopy.showDecorationSelected = true; if (view->currentIndex() == idx) @@ -228,16 +228,16 @@ public: bool setCurrentRow(int row); QModelIndex currentIndex(bool) const; - QModelIndex index(int row, int column, const QModelIndex & = QModelIndex()) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE; - bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex & = QModelIndex()) const Q_DECL_OVERRIDE { return QModelIndex(); } - QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + QModelIndex index(int row, int column, const QModelIndex & = QModelIndex()) const override; + int rowCount(const QModelIndex &index = QModelIndex()) const override; + int columnCount(const QModelIndex &index = QModelIndex()) const override; + bool hasChildren(const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex & = QModelIndex()) const override { return QModelIndex(); } + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; - void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE; - QModelIndex mapToSource(const QModelIndex& proxyIndex) const Q_DECL_OVERRIDE; - QModelIndex mapFromSource(const QModelIndex& sourceIndex) const Q_DECL_OVERRIDE; + void setSourceModel(QAbstractItemModel *sourceModel) override; + QModelIndex mapToSource(const QModelIndex& proxyIndex) const override; + QModelIndex mapFromSource(const QModelIndex& sourceIndex) const override; QCompleterPrivate *c; QScopedPointer<QCompletionEngine> engine; diff --git a/src/widgets/util/qflickgesture.cpp b/src/widgets/util/qflickgesture.cpp index 549b130c9d..b59fe0d504 100644 --- a/src/widgets/util/qflickgesture.cpp +++ b/src/widgets/util/qflickgesture.cpp @@ -256,7 +256,7 @@ public: } protected: - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE + void timerEvent(QTimerEvent *e) override { if (e->timerId() == pressDelayTimer) { if (pressDelayEvent && mouseTarget) { diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp index d8ac686fb9..a49dbe427e 100644 --- a/src/widgets/util/qscroller.cpp +++ b/src/widgets/util/qscroller.cpp @@ -198,7 +198,7 @@ public: : QAbstractAnimation(_d), d(_d), ignoreUpdate(false), skip(0) { } - int duration() const Q_DECL_OVERRIDE + int duration() const override { return -1; } @@ -214,7 +214,7 @@ public: } protected: - void updateCurrentTime(int /*currentTime*/) Q_DECL_OVERRIDE + void updateCurrentTime(int /*currentTime*/) override { if (!ignoreUpdate) { if (++skip >= d->frameRateSkip()) { diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h index 81f396ed83..e4652b742c 100644 --- a/src/widgets/util/qsystemtrayicon.h +++ b/src/widgets/util/qsystemtrayicon.h @@ -66,8 +66,8 @@ class Q_WIDGETS_EXPORT QSystemTrayIcon : public QObject Q_PROPERTY(bool visible READ isVisible WRITE setVisible DESIGNABLE false) public: - QSystemTrayIcon(QObject *parent = Q_NULLPTR); - QSystemTrayIcon(const QIcon &icon, QObject *parent = Q_NULLPTR); + QSystemTrayIcon(QObject *parent = nullptr); + QSystemTrayIcon(const QIcon &icon, QObject *parent = nullptr); ~QSystemTrayIcon(); enum ActivationReason { @@ -110,7 +110,7 @@ Q_SIGNALS: void messageClicked(); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; private: Q_DISABLE_COPY(QSystemTrayIcon) diff --git a/src/widgets/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h index 318edbd1e3..5bdf020a47 100644 --- a/src/widgets/util/qsystemtrayicon_p.h +++ b/src/widgets/util/qsystemtrayicon_p.h @@ -127,10 +127,10 @@ private: void balloon(const QPoint&, int, bool); protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; + void resizeEvent(QResizeEvent *) override; + void mousePressEvent(QMouseEvent *e) override; + void timerEvent(QTimerEvent *e) override; private: QSystemTrayIcon *trayIcon; diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index cd593d8d98..df93e15f80 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -87,12 +87,12 @@ public: QRect globalGeometry() const; protected: - virtual void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - virtual void mouseDoubleClickEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - virtual bool event(QEvent *) Q_DECL_OVERRIDE; - virtual void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - virtual void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - virtual void moveEvent(QMoveEvent *) Q_DECL_OVERRIDE; + virtual void mousePressEvent(QMouseEvent *ev) override; + virtual void mouseDoubleClickEvent(QMouseEvent *ev) override; + virtual bool event(QEvent *) override; + virtual void paintEvent(QPaintEvent *) override; + virtual void resizeEvent(QResizeEvent *) override; + virtual void moveEvent(QMoveEvent *) override; private slots: void systemTrayWindowChanged(QScreen *screen); diff --git a/src/widgets/util/qundogroup.h b/src/widgets/util/qundogroup.h index dba79ea706..1845f7e057 100644 --- a/src/widgets/util/qundogroup.h +++ b/src/widgets/util/qundogroup.h @@ -58,7 +58,7 @@ class Q_WIDGETS_EXPORT QUndoGroup : public QObject Q_DECLARE_PRIVATE(QUndoGroup) public: - explicit QUndoGroup(QObject *parent = Q_NULLPTR); + explicit QUndoGroup(QObject *parent = nullptr); ~QUndoGroup(); void addStack(QUndoStack *stack); diff --git a/src/widgets/util/qundostack.h b/src/widgets/util/qundostack.h index 7ab90b507a..4be24eadab 100644 --- a/src/widgets/util/qundostack.h +++ b/src/widgets/util/qundostack.h @@ -57,8 +57,8 @@ class Q_WIDGETS_EXPORT QUndoCommand QUndoCommandPrivate *d; public: - explicit QUndoCommand(QUndoCommand *parent = Q_NULLPTR); - explicit QUndoCommand(const QString &text, QUndoCommand *parent = Q_NULLPTR); + explicit QUndoCommand(QUndoCommand *parent = nullptr); + explicit QUndoCommand(const QString &text, QUndoCommand *parent = nullptr); virtual ~QUndoCommand(); virtual void undo(); @@ -92,7 +92,7 @@ class Q_WIDGETS_EXPORT QUndoStack : public QObject Q_PROPERTY(int undoLimit READ undoLimit WRITE setUndoLimit) public: - explicit QUndoStack(QObject *parent = Q_NULLPTR); + explicit QUndoStack(QObject *parent = nullptr); ~QUndoStack(); void clear(); diff --git a/src/widgets/util/qundoview.cpp b/src/widgets/util/qundoview.cpp index b56aa42aed..31f6c0dff2 100644 --- a/src/widgets/util/qundoview.cpp +++ b/src/widgets/util/qundoview.cpp @@ -59,11 +59,11 @@ public: QUndoStack *stack() const; virtual QModelIndex index(int row, int column, - const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - virtual QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - virtual int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + const QModelIndex &parent = QModelIndex()) const override; + virtual QModelIndex parent(const QModelIndex &child) const override; + virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override; + virtual int columnCount(const QModelIndex &parent = QModelIndex()) const override; + virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QModelIndex selectedIndex() const; QItemSelectionModel *selectionModel() const; diff --git a/src/widgets/util/qundoview.h b/src/widgets/util/qundoview.h index 0bfcdd0c18..403f05d2e4 100644 --- a/src/widgets/util/qundoview.h +++ b/src/widgets/util/qundoview.h @@ -62,10 +62,10 @@ class Q_WIDGETS_EXPORT QUndoView : public QListView Q_PROPERTY(QIcon cleanIcon READ cleanIcon WRITE setCleanIcon) public: - explicit QUndoView(QWidget *parent = Q_NULLPTR); - explicit QUndoView(QUndoStack *stack, QWidget *parent = Q_NULLPTR); + explicit QUndoView(QWidget *parent = nullptr); + explicit QUndoView(QUndoStack *stack, QWidget *parent = nullptr); #if QT_CONFIG(undogroup) - explicit QUndoView(QUndoGroup *group, QWidget *parent = Q_NULLPTR); + explicit QUndoView(QUndoGroup *group, QWidget *parent = nullptr); #endif ~QUndoView(); diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 22bdf08408..27d7fe9874 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -5,7 +5,6 @@ MODULE_CONFIG = uic CONFIG += $$MODULE_CONFIG DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000 -irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused QMAKE_DOCS = $$PWD/doc/qtwidgets.qdocconf diff --git a/src/widgets/widgets/qabstractbutton.h b/src/widgets/widgets/qabstractbutton.h index 01dbf4e92d..e8dee142f2 100644 --- a/src/widgets/widgets/qabstractbutton.h +++ b/src/widgets/widgets/qabstractbutton.h @@ -72,7 +72,7 @@ class Q_WIDGETS_EXPORT QAbstractButton : public QWidget Q_PROPERTY(bool down READ isDown WRITE setDown DESIGNABLE false) public: - explicit QAbstractButton(QWidget *parent = Q_NULLPTR); + explicit QAbstractButton(QWidget *parent = nullptr); ~QAbstractButton(); void setText(const QString &text); @@ -126,25 +126,25 @@ Q_SIGNALS: void toggled(bool checked); protected: - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE = 0; + void paintEvent(QPaintEvent *e) override = 0; virtual bool hitButton(const QPoint &pos) const; virtual void checkStateSet(); virtual void nextCheckState(); - bool event(QEvent *e) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - void changeEvent(QEvent *e) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void focusInEvent(QFocusEvent *e) override; + void focusOutEvent(QFocusEvent *e) override; + void changeEvent(QEvent *e) override; + void timerEvent(QTimerEvent *e) override; protected: - QAbstractButton(QAbstractButtonPrivate &dd, QWidget* parent = Q_NULLPTR); + QAbstractButton(QAbstractButtonPrivate &dd, QWidget* parent = nullptr); private: Q_DECLARE_PRIVATE(QAbstractButton) diff --git a/src/widgets/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h index cee8481e6f..8a17036fb2 100644 --- a/src/widgets/widgets/qabstractscrollarea.h +++ b/src/widgets/widgets/qabstractscrollarea.h @@ -61,7 +61,7 @@ class Q_WIDGETS_EXPORT QAbstractScrollArea : public QFrame Q_PROPERTY(SizeAdjustPolicy sizeAdjustPolicy READ sizeAdjustPolicy WRITE setSizeAdjustPolicy) public: - explicit QAbstractScrollArea(QWidget *parent = Q_NULLPTR); + explicit QAbstractScrollArea(QWidget *parent = nullptr); ~QAbstractScrollArea(); enum SizeAdjustPolicy { @@ -91,9 +91,9 @@ public: void setViewport(QWidget *widget); QSize maximumViewportSize() const; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const override; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; virtual void setupViewport(QWidget *viewport); @@ -101,35 +101,35 @@ public: void setSizeAdjustPolicy(SizeAdjustPolicy policy); protected: - QAbstractScrollArea(QAbstractScrollAreaPrivate &dd, QWidget *parent = Q_NULLPTR); + QAbstractScrollArea(QAbstractScrollAreaPrivate &dd, QWidget *parent = nullptr); void setViewportMargins(int left, int top, int right, int bottom); void setViewportMargins(const QMargins &margins); QMargins viewportMargins() const; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; - bool event(QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; + bool event(QEvent *) override; virtual bool viewportEvent(QEvent *); - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *) override; + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseDoubleClickEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *) override; #endif #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *) override; #endif #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QDragEnterEvent *) Q_DECL_OVERRIDE; - void dragMoveEvent(QDragMoveEvent *) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *) override; + void dragMoveEvent(QDragMoveEvent *) override; + void dragLeaveEvent(QDragLeaveEvent *) override; + void dropEvent(QDropEvent *) override; #endif - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *) override; virtual void scrollContentsBy(int dx, int dy); diff --git a/src/widgets/widgets/qabstractscrollarea_p.h b/src/widgets/widgets/qabstractscrollarea_p.h index c52e7f9fd4..251e563724 100644 --- a/src/widgets/widgets/qabstractscrollarea_p.h +++ b/src/widgets/widgets/qabstractscrollarea_p.h @@ -124,7 +124,7 @@ class QAbstractScrollAreaFilter : public QObject public: QAbstractScrollAreaFilter(QAbstractScrollAreaPrivate *p) : d(p) { setObjectName(QLatin1String("qt_abstractscrollarea_filter")); } - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE + bool eventFilter(QObject *o, QEvent *e) override { return (o == d->viewport ? d->viewportEvent(e) : false); } private: QAbstractScrollAreaPrivate *d; diff --git a/src/widgets/widgets/qabstractslider.h b/src/widgets/widgets/qabstractslider.h index d26d6a879c..7791d30d10 100644 --- a/src/widgets/widgets/qabstractslider.h +++ b/src/widgets/widgets/qabstractslider.h @@ -67,7 +67,7 @@ class Q_WIDGETS_EXPORT QAbstractSlider : public QWidget Q_PROPERTY(bool sliderDown READ isSliderDown WRITE setSliderDown DESIGNABLE false) public: - explicit QAbstractSlider(QWidget *parent = Q_NULLPTR); + explicit QAbstractSlider(QWidget *parent = nullptr); ~QAbstractSlider(); Qt::Orientation orientation() const; @@ -131,7 +131,7 @@ Q_SIGNALS: void actionTriggered(int action); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; void setRepeatAction(SliderAction action, int thresholdTime = 500, int repeatTime = 50); SliderAction repeatAction() const; @@ -144,16 +144,16 @@ protected: }; virtual void sliderChange(SliderChange change); - void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *ev) override; + void timerEvent(QTimerEvent *) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *e) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *e) override; #endif - void changeEvent(QEvent *e) Q_DECL_OVERRIDE; + void changeEvent(QEvent *e) override; protected: - QAbstractSlider(QAbstractSliderPrivate &dd, QWidget *parent = Q_NULLPTR); + QAbstractSlider(QAbstractSliderPrivate &dd, QWidget *parent = nullptr); private: Q_DISABLE_COPY(QAbstractSlider) diff --git a/src/widgets/widgets/qabstractspinbox.h b/src/widgets/widgets/qabstractspinbox.h index 88735baf1c..83bf83d779 100644 --- a/src/widgets/widgets/qabstractspinbox.h +++ b/src/widgets/widgets/qabstractspinbox.h @@ -70,7 +70,7 @@ class Q_WIDGETS_EXPORT QAbstractSpinBox : public QWidget Q_PROPERTY(bool keyboardTracking READ keyboardTracking WRITE setKeyboardTracking) Q_PROPERTY(bool showGroupSeparator READ isGroupSeparatorShown WRITE setGroupSeparatorShown) public: - explicit QAbstractSpinBox(QWidget *parent = Q_NULLPTR); + explicit QAbstractSpinBox(QWidget *parent = nullptr); ~QAbstractSpinBox(); enum StepEnabledFlag { StepNone = 0x00, StepUpEnabled = 0x01, @@ -162,7 +162,7 @@ protected: Q_SIGNALS: void editingFinished(); protected: - QAbstractSpinBox(QAbstractSpinBoxPrivate &dd, QWidget *parent = Q_NULLPTR); + QAbstractSpinBox(QAbstractSpinBoxPrivate &dd, QWidget *parent = nullptr); private: Q_PRIVATE_SLOT(d_func(), void _q_editorTextChanged(const QString &)) diff --git a/src/widgets/widgets/qbuttongroup.h b/src/widgets/widgets/qbuttongroup.h index 1b4f2377ae..fec94ccb3e 100644 --- a/src/widgets/widgets/qbuttongroup.h +++ b/src/widgets/widgets/qbuttongroup.h @@ -57,7 +57,7 @@ class Q_WIDGETS_EXPORT QButtonGroup : public QObject Q_PROPERTY(bool exclusive READ exclusive WRITE setExclusive) public: - explicit QButtonGroup(QObject *parent = Q_NULLPTR); + explicit QButtonGroup(QObject *parent = nullptr); ~QButtonGroup(); void setExclusive(bool); diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 94911d1cb1..d496d86906 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -115,11 +115,11 @@ class QCalendarDayValidator : public QCalendarDateSectionValidator public: QCalendarDayValidator(); - virtual Section handleKey(int key) Q_DECL_OVERRIDE; - virtual QDate applyToDate(const QDate &date) const Q_DECL_OVERRIDE; - virtual void setDate(const QDate &date) Q_DECL_OVERRIDE; - virtual QString text() const Q_DECL_OVERRIDE; - virtual QString text(const QDate &date, int repeat) const Q_DECL_OVERRIDE; + virtual Section handleKey(int key) override; + virtual QDate applyToDate(const QDate &date) const override; + virtual void setDate(const QDate &date) override; + virtual QString text() const override; + virtual QString text(const QDate &date, int repeat) const override; private: int m_pos; int m_day; @@ -223,11 +223,11 @@ class QCalendarMonthValidator : public QCalendarDateSectionValidator public: QCalendarMonthValidator(); - virtual Section handleKey(int key) Q_DECL_OVERRIDE; - virtual QDate applyToDate(const QDate &date) const Q_DECL_OVERRIDE; - virtual void setDate(const QDate &date) Q_DECL_OVERRIDE; - virtual QString text() const Q_DECL_OVERRIDE; - virtual QString text(const QDate &date, int repeat) const Q_DECL_OVERRIDE; + virtual Section handleKey(int key) override; + virtual QDate applyToDate(const QDate &date) const override; + virtual void setDate(const QDate &date) override; + virtual QString text() const override; + virtual QString text(const QDate &date, int repeat) const override; private: int m_pos; int m_month; @@ -333,11 +333,11 @@ class QCalendarYearValidator : public QCalendarDateSectionValidator public: QCalendarYearValidator(); - virtual Section handleKey(int key) Q_DECL_OVERRIDE; - virtual QDate applyToDate(const QDate &date) const Q_DECL_OVERRIDE; - virtual void setDate(const QDate &date) Q_DECL_OVERRIDE; - virtual QString text() const Q_DECL_OVERRIDE; - virtual QString text(const QDate &date, int repeat) const Q_DECL_OVERRIDE; + virtual Section handleKey(int key) override; + virtual QDate applyToDate(const QDate &date) const override; + virtual void setDate(const QDate &date) override; + virtual QString text() const override; + virtual QString text(const QDate &date, int repeat) const override; private: int pow10(int n); int m_pos; @@ -654,8 +654,8 @@ public: void setDate(const QDate &date); - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) override; + void timerEvent(QTimerEvent *e) override; signals: void dateChanged(const QDate &date); @@ -861,32 +861,32 @@ class QCalendarModel : public QAbstractTableModel public: QCalendarModel(QObject *parent = 0); - int rowCount(const QModelIndex &) const Q_DECL_OVERRIDE + int rowCount(const QModelIndex &) const override { return RowCount + m_firstRow; } - int columnCount(const QModelIndex &) const Q_DECL_OVERRIDE + int columnCount(const QModelIndex &) const override { return ColumnCount + m_firstColumn; } - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; - bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE + bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override { beginInsertRows(parent, row, row + count - 1); endInsertRows(); return true; } - bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE + bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override { beginInsertColumns(parent, column, column + count - 1); endInsertColumns(); return true; } - bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE + bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override { beginRemoveRows(parent, row, row + count - 1); endRemoveRows(); return true; } - bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE + bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override { beginRemoveColumns(parent, column, column + count - 1); endRemoveColumns(); @@ -947,7 +947,7 @@ public: void internalUpdate() { updateGeometries(); } void setReadOnly(bool enable); - virtual void keyboardSearch(const QString & search) Q_DECL_OVERRIDE { Q_UNUSED(search) } + virtual void keyboardSearch(const QString & search) override { Q_UNUSED(search) } signals: void showDate(const QDate &date); @@ -955,16 +955,16 @@ signals: void clicked(const QDate &date); void editingFinished(); protected: - QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *event) override; #endif - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) override; + bool event(QEvent *event) override; QDate handleMouseEvent(QMouseEvent *event); public: @@ -988,7 +988,7 @@ QCalendarModel::QCalendarModel(QObject *parent) m_firstDay(QLocale().firstDayOfWeek()), m_horizontalHeaderFormat(QCalendarWidget::ShortDayNames), m_weekNumbersShown(true), - m_view(Q_NULLPTR) + m_view(nullptr) { } @@ -1563,7 +1563,7 @@ public: : QItemDelegate(parent), calendarWidgetPrivate(w) { } virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; void paintCell(QPainter *painter, const QRect &rect, const QDate &date) const; private: @@ -1579,7 +1579,7 @@ public: : QToolButton(parent) { } protected: - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE + void paintEvent(QPaintEvent *e) override { Q_UNUSED(e) @@ -1607,7 +1607,7 @@ class QPrevNextCalButton : public QToolButton public: QPrevNextCalButton(QWidget *parent) : QToolButton(parent) {} protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE { + void paintEvent(QPaintEvent *) override { QStylePainter painter(this); QStyleOptionToolButton opt; initStyleOption(&opt); diff --git a/src/widgets/widgets/qcalendarwidget.h b/src/widgets/widgets/qcalendarwidget.h index 29e2ff698b..44ba340289 100644 --- a/src/widgets/widgets/qcalendarwidget.h +++ b/src/widgets/widgets/qcalendarwidget.h @@ -89,11 +89,11 @@ public: }; Q_ENUM(SelectionMode) - explicit QCalendarWidget(QWidget *parent = Q_NULLPTR); + explicit QCalendarWidget(QWidget *parent = nullptr); ~QCalendarWidget(); - virtual QSize sizeHint() const Q_DECL_OVERRIDE; - virtual QSize minimumSizeHint() const Q_DECL_OVERRIDE; + virtual QSize sizeHint() const override; + virtual QSize minimumSizeHint() const override; QDate selectedDate() const; @@ -138,11 +138,11 @@ public: void setDateEditAcceptDelay(int delay); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent * event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent * event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + bool eventFilter(QObject *watched, QEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void resizeEvent(QResizeEvent * event) override; + void keyPressEvent(QKeyEvent * event) override; virtual void paintCell(QPainter *painter, const QRect &rect, const QDate &date) const; void updateCell(const QDate &date); diff --git a/src/widgets/widgets/qcheckbox.h b/src/widgets/widgets/qcheckbox.h index 8543c4c86f..80cb22b82e 100644 --- a/src/widgets/widgets/qcheckbox.h +++ b/src/widgets/widgets/qcheckbox.h @@ -58,12 +58,12 @@ class Q_WIDGETS_EXPORT QCheckBox : public QAbstractButton Q_PROPERTY(bool tristate READ isTristate WRITE setTristate) public: - explicit QCheckBox(QWidget *parent = Q_NULLPTR); - explicit QCheckBox(const QString &text, QWidget *parent = Q_NULLPTR); + explicit QCheckBox(QWidget *parent = nullptr); + explicit QCheckBox(const QString &text, QWidget *parent = nullptr); ~QCheckBox(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; void setTristate(bool y = true); bool isTristate() const; @@ -75,12 +75,12 @@ Q_SIGNALS: void stateChanged(int); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - bool hitButton(const QPoint &pos) const Q_DECL_OVERRIDE; - void checkStateSet() Q_DECL_OVERRIDE; - void nextCheckState() Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + bool hitButton(const QPoint &pos) const override; + void checkStateSet() override; + void nextCheckState() override; + void paintEvent(QPaintEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; void initStyleOption(QStyleOptionButton *option) const; diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index 59f2a425a0..671c883584 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -82,7 +82,7 @@ class Q_WIDGETS_EXPORT QComboBox : public QWidget Q_PROPERTY(int modelColumn READ modelColumn WRITE setModelColumn) public: - explicit QComboBox(QWidget *parent = Q_NULLPTR); + explicit QComboBox(QWidget *parent = nullptr); ~QComboBox(); int maxVisibleItems() const; @@ -196,14 +196,14 @@ public: QAbstractItemView *view() const; void setView(QAbstractItemView *itemView); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; virtual void showPopup(); virtual void hidePopup(); - bool event(QEvent *event) Q_DECL_OVERRIDE; - QVariant inputMethodQuery(Qt::InputMethodQuery) const Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + QVariant inputMethodQuery(Qt::InputMethodQuery) const override; Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, const QVariant &argument) const; public Q_SLOTS: @@ -224,24 +224,24 @@ Q_SIGNALS: void currentTextChanged(const QString &); protected: - void focusInEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - void changeEvent(QEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *e) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *e) override; + void focusOutEvent(QFocusEvent *e) override; + void changeEvent(QEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + void paintEvent(QPaintEvent *e) override; + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *e) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *e) override; #endif #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *e) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *e) override; #endif // QT_NO_CONTEXTMENU - void inputMethodEvent(QInputMethodEvent *) Q_DECL_OVERRIDE; + void inputMethodEvent(QInputMethodEvent *) override; void initStyleOption(QStyleOptionComboBox *option) const; diff --git a/src/widgets/widgets/qcommandlinkbutton.h b/src/widgets/widgets/qcommandlinkbutton.h index d8215a256e..2d01d63df8 100644 --- a/src/widgets/widgets/qcommandlinkbutton.h +++ b/src/widgets/widgets/qcommandlinkbutton.h @@ -58,20 +58,20 @@ class Q_WIDGETS_EXPORT QCommandLinkButton: public QPushButton Q_PROPERTY(bool flat READ isFlat WRITE setFlat DESIGNABLE false) public: - explicit QCommandLinkButton(QWidget *parent = Q_NULLPTR); - explicit QCommandLinkButton(const QString &text, QWidget *parent = Q_NULLPTR); - explicit QCommandLinkButton(const QString &text, const QString &description, QWidget *parent = Q_NULLPTR); + explicit QCommandLinkButton(QWidget *parent = nullptr); + explicit QCommandLinkButton(const QString &text, QWidget *parent = nullptr); + explicit QCommandLinkButton(const QString &text, const QString &description, QWidget *parent = nullptr); ~QCommandLinkButton(); QString description() const; void setDescription(const QString &description); protected: - QSize sizeHint() const Q_DECL_OVERRIDE; - int heightForWidth(int) const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + QSize sizeHint() const override; + int heightForWidth(int) const override; + QSize minimumSizeHint() const override; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *) override; private: Q_DISABLE_COPY(QCommandLinkButton) diff --git a/src/widgets/widgets/qdatetimeedit.h b/src/widgets/widgets/qdatetimeedit.h index b46434c1a4..b6fb35fc71 100644 --- a/src/widgets/widgets/qdatetimeedit.h +++ b/src/widgets/widgets/qdatetimeedit.h @@ -92,10 +92,10 @@ public: Q_DECLARE_FLAGS(Sections, Section) Q_FLAG(Sections) - explicit QDateTimeEdit(QWidget *parent = Q_NULLPTR); - explicit QDateTimeEdit(const QDateTime &dt, QWidget *parent = Q_NULLPTR); - explicit QDateTimeEdit(const QDate &d, QWidget *parent = Q_NULLPTR); - explicit QDateTimeEdit(const QTime &t, QWidget *parent = Q_NULLPTR); + explicit QDateTimeEdit(QWidget *parent = nullptr); + explicit QDateTimeEdit(const QDateTime &dt, QWidget *parent = nullptr); + explicit QDateTimeEdit(const QDate &d, QWidget *parent = nullptr); + explicit QDateTimeEdit(const QTime &t, QWidget *parent = nullptr); ~QDateTimeEdit(); QDateTime dateTime() const; @@ -191,7 +191,7 @@ protected: void paintEvent(QPaintEvent *event) override; void initStyleOption(QStyleOptionSpinBox *option) const; - QDateTimeEdit(const QVariant &val, QVariant::Type parserType, QWidget *parent = Q_NULLPTR); + QDateTimeEdit(const QVariant &val, QVariant::Type parserType, QWidget *parent = nullptr); private: Q_DECLARE_PRIVATE(QDateTimeEdit) Q_DISABLE_COPY(QDateTimeEdit) @@ -204,8 +204,8 @@ class Q_WIDGETS_EXPORT QTimeEdit : public QDateTimeEdit Q_OBJECT Q_PROPERTY(QTime time READ time WRITE setTime NOTIFY userTimeChanged USER true) public: - explicit QTimeEdit(QWidget *parent = Q_NULLPTR); - explicit QTimeEdit(const QTime &time, QWidget *parent = Q_NULLPTR); + explicit QTimeEdit(QWidget *parent = nullptr); + explicit QTimeEdit(const QTime &time, QWidget *parent = nullptr); ~QTimeEdit(); Q_SIGNALS: @@ -217,8 +217,8 @@ class Q_WIDGETS_EXPORT QDateEdit : public QDateTimeEdit Q_OBJECT Q_PROPERTY(QDate date READ date WRITE setDate NOTIFY userDateChanged USER true) public: - explicit QDateEdit(QWidget *parent = Q_NULLPTR); - explicit QDateEdit(const QDate &date, QWidget *parent = Q_NULLPTR); + explicit QDateEdit(QWidget *parent = nullptr); + explicit QDateEdit(const QDate &date, QWidget *parent = nullptr); ~QDateEdit(); Q_SIGNALS: diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h index 5ac5a9db6a..1ebc98dedf 100644 --- a/src/widgets/widgets/qdatetimeedit_p.h +++ b/src/widgets/widgets/qdatetimeedit_p.h @@ -80,25 +80,25 @@ public: void clearSection(int index); // Override QAbstractSpinBoxPrivate: - void emitSignals(EmitPolicy ep, const QVariant &old) Q_DECL_OVERRIDE; - QString textFromValue(const QVariant &f) const Q_DECL_OVERRIDE; - QVariant valueFromText(const QString &f) const Q_DECL_OVERRIDE; - void _q_editorCursorPositionChanged(int oldpos, int newpos) Q_DECL_OVERRIDE; - void interpret(EmitPolicy ep) Q_DECL_OVERRIDE; - void clearCache() const Q_DECL_OVERRIDE; - QStyle::SubControl newHoverControl(const QPoint &pos) Q_DECL_OVERRIDE; - void updateEditFieldGeometry() Q_DECL_OVERRIDE; - QVariant getZeroVariant() const Q_DECL_OVERRIDE; - void setRange(const QVariant &min, const QVariant &max) Q_DECL_OVERRIDE; - void updateEdit() Q_DECL_OVERRIDE; + void emitSignals(EmitPolicy ep, const QVariant &old) override; + QString textFromValue(const QVariant &f) const override; + QVariant valueFromText(const QString &f) const override; + void _q_editorCursorPositionChanged(int oldpos, int newpos) override; + void interpret(EmitPolicy ep) override; + void clearCache() const override; + QStyle::SubControl newHoverControl(const QPoint &pos) override; + void updateEditFieldGeometry() override; + QVariant getZeroVariant() const override; + void setRange(const QVariant &min, const QVariant &max) override; + void updateEdit() override; // Override QDateTimeParser: - QString displayText() const Q_DECL_OVERRIDE { return edit->text(); } - QDateTime getMinimum() const Q_DECL_OVERRIDE { return minimum.toDateTime(); } - QDateTime getMaximum() const Q_DECL_OVERRIDE { return maximum.toDateTime(); } - QLocale locale() const Q_DECL_OVERRIDE { return q_func()->locale(); } - QString getAmPmText(AmPm ap, Case cs) const Q_DECL_OVERRIDE; - int cursorPosition() const Q_DECL_OVERRIDE { return edit ? edit->cursorPosition() : -1; } + QString displayText() const override { return edit->text(); } + QDateTime getMinimum() const override { return minimum.toDateTime(); } + QDateTime getMaximum() const override { return maximum.toDateTime(); } + QLocale locale() const override { return q_func()->locale(); } + QString getAmPmText(AmPm ap, Case cs) const override; + int cursorPosition() const override { return edit ? edit->cursorPosition() : -1; } int absoluteIndex(QDateTimeEdit::Section s, int index) const; int absoluteIndex(const SectionNode &s) const; diff --git a/src/widgets/widgets/qdial.cpp b/src/widgets/widgets/qdial.cpp index c08c820127..25d57970bf 100644 --- a/src/widgets/widgets/qdial.cpp +++ b/src/widgets/widgets/qdial.cpp @@ -79,7 +79,7 @@ public: int valueFromPoint(const QPoint &) const; double angle(const QPoint &, const QPoint &) const; void init(); - virtual int bound(int val) const Q_DECL_OVERRIDE; + virtual int bound(int val) const override; }; void QDialPrivate::init() diff --git a/src/widgets/widgets/qdial.h b/src/widgets/widgets/qdial.h index ed753d86b0..1db1f9bb07 100644 --- a/src/widgets/widgets/qdial.h +++ b/src/widgets/widgets/qdial.h @@ -61,7 +61,7 @@ class Q_WIDGETS_EXPORT QDial: public QAbstractSlider Q_PROPERTY(qreal notchTarget READ notchTarget WRITE setNotchTarget) Q_PROPERTY(bool notchesVisible READ notchesVisible WRITE setNotchesVisible) public: - explicit QDial(QWidget *parent = Q_NULLPTR); + explicit QDial(QWidget *parent = nullptr); ~QDial(); @@ -73,23 +73,23 @@ public: qreal notchTarget() const; bool notchesVisible() const; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; public Q_SLOTS: void setNotchesVisible(bool visible); void setWrapping(bool on); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *re) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *pe) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void resizeEvent(QResizeEvent *re) override; + void paintEvent(QPaintEvent *pe) override; - void mousePressEvent(QMouseEvent *me) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *me) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *me) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *me) override; + void mouseReleaseEvent(QMouseEvent *me) override; + void mouseMoveEvent(QMouseEvent *me) override; - void sliderChange(SliderChange change) Q_DECL_OVERRIDE; + void sliderChange(SliderChange change) override; void initStyleOption(QStyleOptionSlider *option) const; diff --git a/src/widgets/widgets/qdialogbuttonbox.h b/src/widgets/widgets/qdialogbuttonbox.h index 02d14dee7c..a9a1a3453d 100644 --- a/src/widgets/widgets/qdialogbuttonbox.h +++ b/src/widgets/widgets/qdialogbuttonbox.h @@ -117,11 +117,11 @@ public: AndroidLayout = GnomeLayout + 2 // ### Qt 6: reorder }; - QDialogButtonBox(QWidget *parent = Q_NULLPTR); - QDialogButtonBox(Qt::Orientation orientation, QWidget *parent = Q_NULLPTR); - explicit QDialogButtonBox(StandardButtons buttons, QWidget *parent = Q_NULLPTR); + QDialogButtonBox(QWidget *parent = nullptr); + QDialogButtonBox(Qt::Orientation orientation, QWidget *parent = nullptr); + explicit QDialogButtonBox(StandardButtons buttons, QWidget *parent = nullptr); QDialogButtonBox(StandardButtons buttons, Qt::Orientation orientation, - QWidget *parent = Q_NULLPTR); + QWidget *parent = nullptr); ~QDialogButtonBox(); void setOrientation(Qt::Orientation orientation); @@ -151,8 +151,8 @@ Q_SIGNALS: void rejected(); protected: - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void changeEvent(QEvent *event) override; + bool event(QEvent *event) override; private: Q_DISABLE_COPY(QDialogButtonBox) diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index bfb3a98d7e..26060052d3 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -73,7 +73,7 @@ static inline QMainWindowLayout *qt_mainwindow_layout_from_dock(const QDockWidge return qt_mainwindow_layout(window); p = p->parentWidget(); } - return Q_NULLPTR; + return nullptr; } static inline bool hasFeature(const QDockWidgetPrivate *priv, QDockWidget::DockWidgetFeature feature) @@ -120,13 +120,13 @@ class QDockWidgetTitleButton : public QAbstractButton public: QDockWidgetTitleButton(QDockWidget *dockWidget); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override; + QSize minimumSizeHint() const override { return sizeHint(); } - void enterEvent(QEvent *event) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void enterEvent(QEvent *event) override; + void leaveEvent(QEvent *event) override; + void paintEvent(QPaintEvent *event) override; }; diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h index b53fa19a03..b53a991dae 100644 --- a/src/widgets/widgets/qdockwidget.h +++ b/src/widgets/widgets/qdockwidget.h @@ -63,9 +63,9 @@ class Q_WIDGETS_EXPORT QDockWidget : public QWidget Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle DESIGNABLE true) public: - explicit QDockWidget(const QString &title, QWidget *parent = Q_NULLPTR, + explicit QDockWidget(const QString &title, QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); - explicit QDockWidget(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()); + explicit QDockWidget(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); ~QDockWidget(); QWidget *widget() const; @@ -113,10 +113,10 @@ Q_SIGNALS: void dockLocationChanged(Qt::DockWidgetArea area); protected: - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void changeEvent(QEvent *event) override; + void closeEvent(QCloseEvent *event) override; + void paintEvent(QPaintEvent *event) override; + bool event(QEvent *event) override; void initStyleOption(QStyleOptionDockWidget *option) const; private: diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h index 2c16176c37..e35fd17fc2 100644 --- a/src/widgets/widgets/qdockwidget_p.h +++ b/src/widgets/widgets/qdockwidget_p.h @@ -135,18 +135,18 @@ class Q_WIDGETS_EXPORT QDockWidgetLayout : public QLayout public: QDockWidgetLayout(QWidget *parent = 0); ~QDockWidgetLayout(); - void addItem(QLayoutItem *item) Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; + void addItem(QLayoutItem *item) override; + QLayoutItem *itemAt(int index) const override; + QLayoutItem *takeAt(int index) override; + int count() const override; - QSize maximumSize() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize maximumSize() const override; + QSize minimumSize() const override; + QSize sizeHint() const override; QSize sizeFromContent(const QSize &content, bool floating) const; - void setGeometry(const QRect &r) Q_DECL_OVERRIDE; + void setGeometry(const QRect &r) override; enum Role { Content, CloseButton, FloatButton, TitleBar, RoleCount }; QWidget *widgetForRole(Role r) const; @@ -178,9 +178,9 @@ class QDockWidgetItem : public QWidgetItem { public: QDockWidgetItem(QDockWidget *dockWidget); - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSize() const override; + QSize maximumSize() const override; + QSize sizeHint() const override; private: inline QLayoutItem *dockWidgetChildItem() const; diff --git a/src/widgets/widgets/qeffects.cpp b/src/widgets/widgets/qeffects.cpp index d4ef33966b..08ef795b07 100644 --- a/src/widgets/widgets/qeffects.cpp +++ b/src/widgets/widgets/qeffects.cpp @@ -71,10 +71,10 @@ public: void run(int time); protected: - void paintEvent(QPaintEvent* e) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent*) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent* e) override; + void closeEvent(QCloseEvent*) override; void alphaBlend(); - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; protected slots: void render(); @@ -348,8 +348,8 @@ public: void run(int time); protected: - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent*) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent*) override; + void closeEvent(QCloseEvent*) override; private slots: void scroll(); diff --git a/src/widgets/widgets/qfocusframe.h b/src/widgets/widgets/qfocusframe.h index a1fc6d345d..73d5b42bd8 100644 --- a/src/widgets/widgets/qfocusframe.h +++ b/src/widgets/widgets/qfocusframe.h @@ -53,17 +53,17 @@ class Q_WIDGETS_EXPORT QFocusFrame : public QWidget { Q_OBJECT public: - QFocusFrame(QWidget *parent = Q_NULLPTR); + QFocusFrame(QWidget *parent = nullptr); ~QFocusFrame(); void setWidget(QWidget *widget); QWidget *widget() const; protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; + void paintEvent(QPaintEvent *) override; void initStyleOption(QStyleOption *option) const; private: diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp index 1c56c19c8f..49f1223d9c 100644 --- a/src/widgets/widgets/qfontcombobox.cpp +++ b/src/widgets/widgets/qfontcombobox.cpp @@ -189,10 +189,10 @@ public: // painting void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; const QIcon truetype; const QIcon bitmap; diff --git a/src/widgets/widgets/qfontcombobox.h b/src/widgets/widgets/qfontcombobox.h index 1e4555ce2d..6c1871dd2d 100644 --- a/src/widgets/widgets/qfontcombobox.h +++ b/src/widgets/widgets/qfontcombobox.h @@ -58,7 +58,7 @@ class Q_WIDGETS_EXPORT QFontComboBox : public QComboBox Q_PROPERTY(QFont currentFont READ currentFont WRITE setCurrentFont NOTIFY currentFontChanged) public: - explicit QFontComboBox(QWidget *parent = Q_NULLPTR); + explicit QFontComboBox(QWidget *parent = nullptr); ~QFontComboBox(); void setWritingSystem(QFontDatabase::WritingSystem); @@ -78,7 +78,7 @@ public: FontFilters fontFilters() const; QFont currentFont() const; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; public Q_SLOTS: void setCurrentFont(const QFont &f); @@ -87,7 +87,7 @@ Q_SIGNALS: void currentFontChanged(const QFont &f); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; private: Q_DISABLE_COPY(QFontComboBox) diff --git a/src/widgets/widgets/qframe.h b/src/widgets/widgets/qframe.h index 986915a28f..595dfa929d 100644 --- a/src/widgets/widgets/qframe.h +++ b/src/widgets/widgets/qframe.h @@ -61,7 +61,7 @@ class Q_WIDGETS_EXPORT QFrame : public QWidget Q_PROPERTY(QRect frameRect READ frameRect WRITE setFrameRect DESIGNABLE false) public: - explicit QFrame(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); + explicit QFrame(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); ~QFrame(); int frameStyle() const; @@ -69,7 +69,7 @@ public: int frameWidth() const; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; enum Shape { NoFrame = 0, // no frame @@ -108,14 +108,14 @@ public: void setFrameRect(const QRect &); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *) override; + void changeEvent(QEvent *) override; void drawFrame(QPainter *); protected: - QFrame(QFramePrivate &dd, QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); + QFrame(QFramePrivate &dd, QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); void initStyleOption(QStyleOptionFrame *option) const; private: diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h index 668dc03f3d..deaeba4656 100644 --- a/src/widgets/widgets/qgroupbox.h +++ b/src/widgets/widgets/qgroupbox.h @@ -59,8 +59,8 @@ class Q_WIDGETS_EXPORT QGroupBox : public QWidget Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable) Q_PROPERTY(bool checked READ isChecked WRITE setChecked DESIGNABLE isCheckable NOTIFY toggled USER true) public: - explicit QGroupBox(QWidget *parent = Q_NULLPTR); - explicit QGroupBox(const QString &title, QWidget *parent = Q_NULLPTR); + explicit QGroupBox(QWidget *parent = nullptr); + explicit QGroupBox(const QString &title, QWidget *parent = nullptr); ~QGroupBox(); QString title() const; @@ -69,7 +69,7 @@ public: Qt::Alignment alignment() const; void setAlignment(int alignment); - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const override; bool isFlat() const; void setFlat(bool flat); @@ -85,15 +85,15 @@ Q_SIGNALS: void toggled(bool); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - void childEvent(QChildEvent *event) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + void childEvent(QChildEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void paintEvent(QPaintEvent *event) override; + void focusInEvent(QFocusEvent *event) override; + void changeEvent(QEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; void initStyleOption(QStyleOptionGroupBox *option) const; diff --git a/src/widgets/widgets/qkeysequenceedit.h b/src/widgets/widgets/qkeysequenceedit.h index d5b4b199cd..85d76f14a3 100644 --- a/src/widgets/widgets/qkeysequenceedit.h +++ b/src/widgets/widgets/qkeysequenceedit.h @@ -55,8 +55,8 @@ class Q_WIDGETS_EXPORT QKeySequenceEdit : public QWidget Q_PROPERTY(QKeySequence keySequence READ keySequence WRITE setKeySequence NOTIFY keySequenceChanged USER true) public: - explicit QKeySequenceEdit(QWidget *parent = Q_NULLPTR); - explicit QKeySequenceEdit(const QKeySequence &keySequence, QWidget *parent = Q_NULLPTR); + explicit QKeySequenceEdit(QWidget *parent = nullptr); + explicit QKeySequenceEdit(const QKeySequence &keySequence, QWidget *parent = nullptr); ~QKeySequenceEdit(); QKeySequence keySequence() const; @@ -72,10 +72,10 @@ Q_SIGNALS: protected: QKeySequenceEdit(QKeySequenceEditPrivate &d, QWidget *parent, Qt::WindowFlags f); - bool event(QEvent *) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void keyReleaseEvent(QKeyEvent *) override; + void timerEvent(QTimerEvent *) override; private: Q_DISABLE_COPY(QKeySequenceEdit) diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index e3225800cc..70dc13287d 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -66,16 +66,16 @@ QLabelPrivate::QLabelPrivate() sh(), msh(), text(), - pixmap(Q_NULLPTR), - scaledpixmap(Q_NULLPTR), - cachedimage(Q_NULLPTR), + pixmap(nullptr), + scaledpixmap(nullptr), + cachedimage(nullptr), #ifndef QT_NO_PICTURE - picture(Q_NULLPTR), + picture(nullptr), #endif #if QT_CONFIG(movie) movie(), #endif - control(Q_NULLPTR), + control(nullptr), shortcutCursor(), #ifndef QT_NO_CURSOR cursor(), diff --git a/src/widgets/widgets/qlabel.h b/src/widgets/widgets/qlabel.h index 469254a145..e1cc333a1c 100644 --- a/src/widgets/widgets/qlabel.h +++ b/src/widgets/widgets/qlabel.h @@ -67,8 +67,8 @@ class Q_WIDGETS_EXPORT QLabel : public QFrame Q_PROPERTY(QString selectedText READ selectedText) public: - explicit QLabel(QWidget *parent=Q_NULLPTR, Qt::WindowFlags f=Qt::WindowFlags()); - explicit QLabel(const QString &text, QWidget *parent=Q_NULLPTR, Qt::WindowFlags f=Qt::WindowFlags()); + explicit QLabel(QWidget *parent=nullptr, Qt::WindowFlags f=Qt::WindowFlags()); + explicit QLabel(const QString &text, QWidget *parent=nullptr, Qt::WindowFlags f=Qt::WindowFlags()); ~QLabel(); QString text() const; @@ -97,13 +97,13 @@ public: bool hasScaledContents() const; void setScaledContents(bool); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; #ifndef QT_NO_SHORTCUT void setBuddy(QWidget *); QWidget *buddy() const; #endif - int heightForWidth(int) const Q_DECL_OVERRIDE; + int heightForWidth(int) const override; bool openExternalLinks() const; void setOpenExternalLinks(bool open); @@ -134,19 +134,19 @@ Q_SIGNALS: void linkHovered(const QString& link); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void keyPressEvent(QKeyEvent *ev) override; + void paintEvent(QPaintEvent *) override; + void changeEvent(QEvent *) override; + void mousePressEvent(QMouseEvent *ev) override; + void mouseMoveEvent(QMouseEvent *ev) override; + void mouseReleaseEvent(QMouseEvent *ev) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *ev) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *ev) override; #endif // QT_NO_CONTEXTMENU - void focusInEvent(QFocusEvent *ev) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *ev) Q_DECL_OVERRIDE; - bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *ev) override; + void focusOutEvent(QFocusEvent *ev) override; + bool focusNextPrevChild(bool next) override; private: diff --git a/src/widgets/widgets/qlcdnumber.h b/src/widgets/widgets/qlcdnumber.h index 28fd530e6e..644c39eaf3 100644 --- a/src/widgets/widgets/qlcdnumber.h +++ b/src/widgets/widgets/qlcdnumber.h @@ -59,8 +59,8 @@ class Q_WIDGETS_EXPORT QLCDNumber : public QFrame // LCD number widget Q_PROPERTY(int intValue READ intValue WRITE display) public: - explicit QLCDNumber(QWidget* parent = Q_NULLPTR); - explicit QLCDNumber(uint numDigits, QWidget* parent = Q_NULLPTR); + explicit QLCDNumber(QWidget* parent = nullptr); + explicit QLCDNumber(uint numDigits, QWidget* parent = nullptr); ~QLCDNumber(); enum Mode { @@ -88,7 +88,7 @@ public: double value() const; int intValue() const; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; public Q_SLOTS: void display(const QString &str); @@ -104,8 +104,8 @@ Q_SIGNALS: void overflow(); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *) override; public: diff --git a/src/widgets/widgets/qlineedit.h b/src/widgets/widgets/qlineedit.h index b98307390c..099bf4bb18 100644 --- a/src/widgets/widgets/qlineedit.h +++ b/src/widgets/widgets/qlineedit.h @@ -90,8 +90,8 @@ public: }; Q_ENUM(ActionPosition) - explicit QLineEdit(QWidget *parent = Q_NULLPTR); - explicit QLineEdit(const QString &, QWidget *parent = Q_NULLPTR); + explicit QLineEdit(QWidget *parent = nullptr); + explicit QLineEdit(const QString &, QWidget *parent = nullptr); ~QLineEdit(); QString text() const; @@ -128,8 +128,8 @@ public: QCompleter *completer() const; #endif - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; int cursorPosition() const; void setCursorPosition(int); @@ -209,31 +209,31 @@ Q_SIGNALS: void selectionChanged(); protected: - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseDoubleClickEvent(QMouseEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void focusInEvent(QFocusEvent *) override; + void focusOutEvent(QFocusEvent *) override; + void paintEvent(QPaintEvent *) override; #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QDragEnterEvent *) Q_DECL_OVERRIDE; - void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *) override; + void dragMoveEvent(QDragMoveEvent *e) override; + void dragLeaveEvent(QDragLeaveEvent *e) override; + void dropEvent(QDropEvent *) override; #endif - void changeEvent(QEvent *) Q_DECL_OVERRIDE; + void changeEvent(QEvent *) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *) override; #endif - void inputMethodEvent(QInputMethodEvent *) Q_DECL_OVERRIDE; + void inputMethodEvent(QInputMethodEvent *) override; void initStyleOption(QStyleOptionFrame *option) const; public: - QVariant inputMethodQuery(Qt::InputMethodQuery) const Q_DECL_OVERRIDE; + QVariant inputMethodQuery(Qt::InputMethodQuery) const override; Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery property, QVariant argument) const; - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; protected: QRect cursorRect() const; diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index 5b352f5554..c66b842223 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -330,13 +330,13 @@ QLineEditIconButton::QLineEditIconButton(QWidget *parent) QLineEditPrivate *QLineEditIconButton::lineEditPrivate() const { QLineEdit *le = qobject_cast<QLineEdit *>(parentWidget()); - return le ? static_cast<QLineEditPrivate *>(qt_widget_private(le)) : Q_NULLPTR; + return le ? static_cast<QLineEditPrivate *>(qt_widget_private(le)) : nullptr; } void QLineEditIconButton::paintEvent(QPaintEvent *) { QPainter painter(this); - QWindow *window = Q_NULLPTR; + QWindow *window = nullptr; if (const QWidget *nativeParent = nativeParentWidget()) window = nativeParent->windowHandle(); // Note isDown should really use the active state but in most styles diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h index 77a91880df..a3f549ad31 100644 --- a/src/widgets/widgets/qlineedit_p.h +++ b/src/widgets/widgets/qlineedit_p.h @@ -94,8 +94,8 @@ public: #endif protected: - void actionEvent(QActionEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void actionEvent(QActionEvent *e) override; + void paintEvent(QPaintEvent *event) override; private slots: void updateCursor(); diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h index d926ef8569..0de3989167 100644 --- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h +++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h @@ -52,7 +52,7 @@ class Q_WIDGETS_EXPORT QMacCocoaViewContainer : public QWidget { Q_OBJECT public: - QMacCocoaViewContainer(NSView *cocoaViewToWrap, QWidget *parent = Q_NULLPTR); + QMacCocoaViewContainer(NSView *cocoaViewToWrap, QWidget *parent = nullptr); virtual ~QMacCocoaViewContainer(); void setCocoaView(NSView *view); diff --git a/src/widgets/widgets/qmacnativewidget_mac.h b/src/widgets/widgets/qmacnativewidget_mac.h index a8faffd6be..6fd90516ac 100644 --- a/src/widgets/widgets/qmacnativewidget_mac.h +++ b/src/widgets/widgets/qmacnativewidget_mac.h @@ -51,7 +51,7 @@ class Q_WIDGETS_EXPORT QMacNativeWidget : public QWidget { Q_OBJECT public: - QMacNativeWidget(NSView *parentView = Q_NULLPTR); + QMacNativeWidget(NSView *parentView = nullptr); ~QMacNativeWidget(); QSize sizeHint() const override; diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index 50d840cf61..069683d4ac 100644 --- a/src/widgets/widgets/qmainwindow.h +++ b/src/widgets/widgets/qmainwindow.h @@ -91,7 +91,7 @@ public: Q_DECLARE_FLAGS(DockOptions, DockOption) Q_FLAG(DockOptions) - explicit QMainWindow(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()); + explicit QMainWindow(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); ~QMainWindow(); QSize iconSize() const; @@ -203,9 +203,9 @@ Q_SIGNALS: protected: #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *event) override; #endif - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; private: Q_DECLARE_PRIVATE(QMainWindow) diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index 1767a8458f..9b38da340c 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -202,14 +202,14 @@ public: layoutState.deleteAllLayoutItems(); } - void addItem(QLayoutItem*) Q_DECL_OVERRIDE { Q_UNREACHABLE(); } - int count() const Q_DECL_OVERRIDE { return 0; } - QLayoutItem* itemAt(int index) const Q_DECL_OVERRIDE + void addItem(QLayoutItem*) override { Q_UNREACHABLE(); } + int count() const override { return 0; } + QLayoutItem* itemAt(int index) const override { int x = 0; return layoutState.itemAt(&x, index); } - QLayoutItem* takeAt(int index) Q_DECL_OVERRIDE + QLayoutItem* takeAt(int index) override { int x = 0; QLayoutItem *ret = layoutState.takeAt(&x, index); @@ -225,22 +225,22 @@ public: } return ret; } - QSize sizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override { int fw = frameWidth(); return layoutState.sizeHint() + QSize(fw, fw); } - QSize minimumSize() const Q_DECL_OVERRIDE + QSize minimumSize() const override { int fw = frameWidth(); return layoutState.minimumSize() + QSize(fw, fw); } - QSize maximumSize() const Q_DECL_OVERRIDE + QSize maximumSize() const override { int fw = frameWidth(); return layoutState.maximumSize() + QSize(fw, fw); } - void setGeometry(const QRect&r) Q_DECL_OVERRIDE + void setGeometry(const QRect&r) override { groupWindow()->destroyOrHideIfEmpty(); QDockAreaLayoutInfo *li = dockAreaLayoutInfo(); @@ -1658,9 +1658,9 @@ class QMainWindowTabBar : public QTabBar public: QMainWindowTabBar(QMainWindow *parent); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent*) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; }; diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index c61c4f6aa8..168d4444b9 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -345,8 +345,8 @@ public: QList<int> currentGapPos; protected: - bool event(QEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + void paintEvent(QPaintEvent*) override; private: QSize m_removedFrameSize; @@ -358,9 +358,9 @@ class QDockWidgetGroupWindowItem : public QWidgetItem { public: explicit QDockWidgetGroupWindowItem(QDockWidgetGroupWindow *parent) : QWidgetItem(parent) {} - QSize minimumSize() const Q_DECL_OVERRIDE { return lay()->minimumSize(); } - QSize maximumSize() const Q_DECL_OVERRIDE { return lay()->maximumSize(); } - QSize sizeHint() const Q_DECL_OVERRIDE { return lay()->sizeHint(); } + QSize minimumSize() const override { return lay()->minimumSize(); } + QSize maximumSize() const override { return lay()->maximumSize(); } + QSize sizeHint() const override { return lay()->sizeHint(); } private: QLayout *lay() const { return const_cast<QDockWidgetGroupWindowItem *>(this)->widget()->layout(); } @@ -533,17 +533,17 @@ public: // QLayout interface - void addItem(QLayoutItem *item) Q_DECL_OVERRIDE; - void setGeometry(const QRect &r) Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; + void addItem(QLayoutItem *item) override; + void setGeometry(const QRect &r) override; + QLayoutItem *itemAt(int index) const override; + QLayoutItem *takeAt(int index) override; + int count() const override; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSize() const override; mutable QSize szHint; mutable QSize minSize; - void invalidate() Q_DECL_OVERRIDE; + void invalidate() override; // animations diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index 4e7925556a..bc7333df2e 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -570,9 +570,9 @@ public: QMdiAreaTabBar(QWidget *parent) : QTabBar(parent) {} protected: - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *event) override; #endif private: diff --git a/src/widgets/widgets/qmdiarea.h b/src/widgets/widgets/qmdiarea.h index 05deb9e21f..35edde9eb8 100644 --- a/src/widgets/widgets/qmdiarea.h +++ b/src/widgets/widgets/qmdiarea.h @@ -87,11 +87,11 @@ public: }; Q_ENUM(ViewMode) - QMdiArea(QWidget *parent = Q_NULLPTR); + QMdiArea(QWidget *parent = nullptr); ~QMdiArea(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; QMdiSubWindow *currentSubWindow() const; QMdiSubWindow *activeSubWindow() const; @@ -143,18 +143,18 @@ public Q_SLOTS: void activatePreviousSubWindow(); protected Q_SLOTS: - void setupViewport(QWidget *viewport) Q_DECL_OVERRIDE; + void setupViewport(QWidget *viewport) override; protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *paintEvent) Q_DECL_OVERRIDE; - void childEvent(QChildEvent *childEvent) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *resizeEvent) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *timerEvent) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *showEvent) Q_DECL_OVERRIDE; - bool viewportEvent(QEvent *event) Q_DECL_OVERRIDE; - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + bool eventFilter(QObject *object, QEvent *event) override; + void paintEvent(QPaintEvent *paintEvent) override; + void childEvent(QChildEvent *childEvent) override; + void resizeEvent(QResizeEvent *resizeEvent) override; + void timerEvent(QTimerEvent *timerEvent) override; + void showEvent(QShowEvent *showEvent) override; + bool viewportEvent(QEvent *event) override; + void scrollContentsBy(int dx, int dy) override; private: Q_DISABLE_COPY(QMdiArea) diff --git a/src/widgets/widgets/qmdiarea_p.h b/src/widgets/widgets/qmdiarea_p.h index 4740993af7..fd00118ec6 100644 --- a/src/widgets/widgets/qmdiarea_p.h +++ b/src/widgets/widgets/qmdiarea_p.h @@ -88,8 +88,8 @@ class RegularTiler : public Rearranger // Rearranges widgets according to a regular tiling pattern // covering the entire domain. // Both positions and sizes may change. - void rearrange(QList<QWidget *> &widgets, const QRect &domain) const Q_DECL_OVERRIDE; - Type type() const Q_DECL_OVERRIDE { return Rearranger::RegularTiler; } + void rearrange(QList<QWidget *> &widgets, const QRect &domain) const override; + Type type() const override { return Rearranger::RegularTiler; } }; class SimpleCascader : public Rearranger @@ -97,8 +97,8 @@ class SimpleCascader : public Rearranger // Rearranges widgets according to a simple, regular cascading pattern. // Widgets are resized to minimumSize. // Both positions and sizes may change. - void rearrange(QList<QWidget *> &widgets, const QRect &domain) const Q_DECL_OVERRIDE; - Type type() const Q_DECL_OVERRIDE { return Rearranger::SimpleCascader; } + void rearrange(QList<QWidget *> &widgets, const QRect &domain) const override; + Type type() const override { return Rearranger::SimpleCascader; } }; class IconTiler : public Rearranger @@ -106,8 +106,8 @@ class IconTiler : public Rearranger // Rearranges icons (assumed to be the same size) according to a regular // tiling pattern filling up the domain from the bottom. // Only positions may change. - void rearrange(QList<QWidget *> &widgets, const QRect &domain) const Q_DECL_OVERRIDE; - Type type() const Q_DECL_OVERRIDE { return Rearranger::IconTiler; } + void rearrange(QList<QWidget *> &widgets, const QRect &domain) const override; + Type type() const override { return Rearranger::IconTiler; } }; class Placer @@ -122,7 +122,7 @@ public: class MinOverlapPlacer : public Placer { - QPoint place(const QSize &size, const QVector<QRect> &rects, const QRect &domain) const Q_DECL_OVERRIDE; + QPoint place(const QSize &size, const QVector<QRect> &rects, const QRect &domain) const override; static int accumulatedOverlap(const QRect &source, const QVector<QRect> &rects); static QRect findMinOverlapRect(const QVector<QRect> &source, const QVector<QRect> &rects); static QVector<QRect> getCandidatePlacements(const QSize &size, const QVector<QRect> &rects, const QRect &domain); @@ -206,7 +206,7 @@ public: bool lastWindowAboutToBeDestroyed() const; void setChildActivationEnabled(bool enable = true, bool onlyNextActivationEvent = false) const; QRect resizeToMinimumTileSize(const QSize &minSubWindowSize, int subWindowCount); - void scrollBarPolicyChanged(Qt::Orientation, Qt::ScrollBarPolicy) Q_DECL_OVERRIDE; // reimp + void scrollBarPolicyChanged(Qt::Orientation, Qt::ScrollBarPolicy) override; // reimp QMdiSubWindow *nextVisibleSubWindow(int increaseFactor, QMdiArea::WindowOrder, int removed = -1, int fromIndex = -1) const; void highlightNextSubWindow(int increaseFactor); diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp index 129898a08d..0fdeaeb1e6 100644 --- a/src/widgets/widgets/qmdisubwindow.cpp +++ b/src/widgets/widgets/qmdisubwindow.cpp @@ -373,18 +373,18 @@ class ControlLabel : public QWidget public: ControlLabel(QMdiSubWindow *subWindow, QWidget *parent = 0); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; signals: void _q_clicked(); void _q_doubleClicked(); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *paintEvent) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + void paintEvent(QPaintEvent *paintEvent) override; + void mousePressEvent(QMouseEvent *mouseEvent) override; + void mouseDoubleClickEvent(QMouseEvent *mouseEvent) override; + void mouseReleaseEvent(QMouseEvent *mouseEvent) override; private: QPixmap label; @@ -504,7 +504,7 @@ class ControllerWidget : public QWidget Q_OBJECT public: ControllerWidget(QMdiSubWindow *subWindow, QWidget *parent = 0); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; void setControlVisible(QMdiSubWindowPrivate::WindowStateAction action, bool visible); inline bool hasVisibleControls() const { @@ -519,12 +519,12 @@ signals: void _q_close(); protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void leaveEvent(QEvent *event) override; + bool event(QEvent *event) override; private: QStyle::SubControl activeControl; diff --git a/src/widgets/widgets/qmdisubwindow.h b/src/widgets/widgets/qmdisubwindow.h index adaafa352a..302522e1c3 100644 --- a/src/widgets/widgets/qmdisubwindow.h +++ b/src/widgets/widgets/qmdisubwindow.h @@ -66,11 +66,11 @@ public: }; Q_DECLARE_FLAGS(SubWindowOptions, SubWindowOption) - QMdiSubWindow(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()); + QMdiSubWindow(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); ~QMdiSubWindow(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; void setWidget(QWidget *widget); QWidget *widget() const; @@ -107,28 +107,28 @@ public Q_SLOTS: void showShaded(); protected: - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *showEvent) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *hideEvent) Q_DECL_OVERRIDE; - void changeEvent(QEvent *changeEvent) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent *closeEvent) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *leaveEvent) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *resizeEvent) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *timerEvent) Q_DECL_OVERRIDE; - void moveEvent(QMoveEvent *moveEvent) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *paintEvent) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; + bool event(QEvent *event) override; + void showEvent(QShowEvent *showEvent) override; + void hideEvent(QHideEvent *hideEvent) override; + void changeEvent(QEvent *changeEvent) override; + void closeEvent(QCloseEvent *closeEvent) override; + void leaveEvent(QEvent *leaveEvent) override; + void resizeEvent(QResizeEvent *resizeEvent) override; + void timerEvent(QTimerEvent *timerEvent) override; + void moveEvent(QMoveEvent *moveEvent) override; + void paintEvent(QPaintEvent *paintEvent) override; + void mousePressEvent(QMouseEvent *mouseEvent) override; + void mouseDoubleClickEvent(QMouseEvent *mouseEvent) override; + void mouseReleaseEvent(QMouseEvent *mouseEvent) override; + void mouseMoveEvent(QMouseEvent *mouseEvent) override; + void keyPressEvent(QKeyEvent *keyEvent) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *contextMenuEvent) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *contextMenuEvent) override; #endif - void focusInEvent(QFocusEvent *focusInEvent) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *focusOutEvent) Q_DECL_OVERRIDE; - void childEvent(QChildEvent *childEvent) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *focusInEvent) override; + void focusOutEvent(QFocusEvent *focusOutEvent) override; + void childEvent(QChildEvent *childEvent) override; private: Q_DISABLE_COPY(QMdiSubWindow) diff --git a/src/widgets/widgets/qmdisubwindow_p.h b/src/widgets/widgets/qmdisubwindow_p.h index d03aca168b..719984c8d4 100644 --- a/src/widgets/widgets/qmdisubwindow_p.h +++ b/src/widgets/widgets/qmdisubwindow_p.h @@ -271,7 +271,7 @@ public: void setFocusWidget(); bool restoreFocus(); void storeFocusWidget(); - void setWindowFlags(Qt::WindowFlags windowFlags) Q_DECL_OVERRIDE; + void setWindowFlags(Qt::WindowFlags windowFlags) override; void setVisible(WindowStateAction, bool visible = true); #ifndef QT_NO_ACTION void setEnabled(WindowStateAction, bool enable = true); diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index ded218de73..e26742f75e 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -116,7 +116,7 @@ class QTornOffMenu : public QMenu q->setFixedSize(size); } - QVector<QPointer<QWidget> > calcCausedStack() const Q_DECL_OVERRIDE { return causedStack; } + QVector<QPointer<QWidget> > calcCausedStack() const override { return causedStack; } QPointer<QMenu> causedMenu; QVector<QPointer<QWidget> > causedStack; bool initialized; @@ -162,7 +162,7 @@ public: } else if (act->type() == QEvent::ActionRemoved) removeAction(act->action()); } - void actionEvent(QActionEvent *e) Q_DECL_OVERRIDE + void actionEvent(QActionEvent *e) override { Q_D(QTornOffMenu); QMenu::actionEvent(e); @@ -243,7 +243,7 @@ void QMenuPrivate::syncPlatformMenu() if (platformMenu.isNull()) return; - QPlatformMenuItem *beforeItem = Q_NULLPTR; + QPlatformMenuItem *beforeItem = nullptr; const QList<QAction*> actions = q->actions(); for (QList<QAction*>::const_reverse_iterator it = actions.rbegin(), end = actions.rend(); it != end; ++it) { QPlatformMenuItem *menuItem = platformMenu->createMenuItem(); @@ -623,7 +623,7 @@ void QMenuPrivate::setCurrentAction(QAction *action, int popup, SelectionReason if (action && (action->isSeparator() || (!action->isEnabled() && !q->style()->styleHint(QStyle::SH_Menu_AllowActiveAndDisabled, 0, q)))) - action = Q_NULLPTR; + action = nullptr; // Reselect the currently active action in case mouse moved over other menu items when // moving from sub menu action to sub menu (QTBUG-20094). @@ -697,13 +697,13 @@ void QMenuSloppyState::reset() m_use_reset_action = true; m_uni_dir_discarded_count = 0; m_time.stop(); - m_reset_action = Q_NULLPTR; - m_origin_action = Q_NULLPTR; + m_reset_action = nullptr; + m_origin_action = nullptr; m_action_rect = QRect(); m_previous_point = QPointF(); if (m_sub_menu) { - QMenuPrivate::get(m_sub_menu)->sloppyState.m_parent = Q_NULLPTR; - m_sub_menu = Q_NULLPTR; + QMenuPrivate::get(m_sub_menu)->sloppyState.m_parent = nullptr; + m_sub_menu = nullptr; } } void QMenuSloppyState::enter() @@ -812,7 +812,7 @@ void QMenuSloppyState::timeout() if (m_use_reset_action) menu_priv->setCurrentAction(m_reset_action, 0); } else { - menu_priv->setCurrentAction(Q_NULLPTR, 0); + menu_priv->setCurrentAction(nullptr, 0); } } @@ -2185,7 +2185,7 @@ void QMenu::hideTearOffMenu() // should consider the torn-off menu deleted. // This way showTearOffMenu() will not try to // reuse the dying torn-off menu. - d->tornPopup = Q_NULLPTR; + d->tornPopup = nullptr; } } diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index 7cf73f55b3..86d927e919 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -71,8 +71,8 @@ private: Q_PROPERTY(bool toolTipsVisible READ toolTipsVisible WRITE setToolTipsVisible) public: - explicit QMenu(QWidget *parent = Q_NULLPTR); - explicit QMenu(const QString &title, QWidget *parent = Q_NULLPTR); + explicit QMenu(QWidget *parent = nullptr); + explicit QMenu(const QString &title, QWidget *parent = nullptr); ~QMenu(); using QWidget::addAction; @@ -184,17 +184,17 @@ public: void setActiveAction(QAction *act); QAction *activeAction() const; - void popup(const QPoint &pos, QAction *at = Q_NULLPTR); + void popup(const QPoint &pos, QAction *at = nullptr); QAction *exec(); - QAction *exec(const QPoint &pos, QAction *at = Q_NULLPTR); + QAction *exec(const QPoint &pos, QAction *at = nullptr); #if QT_VERSION >= QT_VERSION_CHECK(6,0,0) - static QAction *exec(const QList<QAction *> &actions, const QPoint &pos, QAction *at = Q_NULLPTR, QWidget *parent = Q_NULLPTR); + static QAction *exec(const QList<QAction *> &actions, const QPoint &pos, QAction *at = nullptr, QWidget *parent = nullptr); #else - static QAction *exec(QList<QAction*> actions, const QPoint &pos, QAction *at = Q_NULLPTR, QWidget *parent = Q_NULLPTR); + static QAction *exec(QList<QAction*> actions, const QPoint &pos, QAction *at = nullptr, QWidget *parent = nullptr); #endif - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; QRect actionGeometry(QAction *) const; QAction *actionAt(const QPoint &) const; @@ -231,22 +231,22 @@ Q_SIGNALS: protected: int columnCount() const; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void changeEvent(QEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *) override; #endif - void enterEvent(QEvent *) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void actionEvent(QActionEvent *) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; - bool event(QEvent *) Q_DECL_OVERRIDE; - bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; + void enterEvent(QEvent *) override; + void leaveEvent(QEvent *) override; + void hideEvent(QHideEvent *) override; + void paintEvent(QPaintEvent *) override; + void actionEvent(QActionEvent *) override; + void timerEvent(QTimerEvent *) override; + bool event(QEvent *) override; + bool focusNextPrevChild(bool next) override; void initStyleOption(QStyleOptionMenuItem *option, const QAction *action) const; private Q_SLOTS: @@ -259,7 +259,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_platformMenuAboutToShow()) protected: - QMenu(QMenuPrivate &dd, QWidget* parent = Q_NULLPTR); + QMenu(QMenuPrivate &dd, QWidget* parent = nullptr); private: Q_DISABLE_COPY(QMenu) diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h index 5869bc8420..fac58f59ab 100644 --- a/src/widgets/widgets/qmenu_p.h +++ b/src/widgets/widgets/qmenu_p.h @@ -91,7 +91,7 @@ class QMenuSloppyState Q_DISABLE_COPY(QMenuSloppyState) public: QMenuSloppyState() - : m_menu(Q_NULLPTR) + : m_menu(nullptr) , m_enabled(false) , m_uni_directional(false) , m_select_other_actions(false) @@ -101,9 +101,9 @@ public: , m_uni_dir_discarded_count(0) , m_uni_dir_fail_at_count(0) , m_timeout(0) - , m_reset_action(Q_NULLPTR) - , m_origin_action(Q_NULLPTR) - , m_parent(Q_NULLPTR) + , m_reset_action(nullptr) + , m_origin_action(nullptr) + , m_parent(nullptr) { } ~QMenuSloppyState() { reset(); } @@ -186,7 +186,7 @@ public: QSetValueOnDestroy<QPointF> setPreviousPoint(m_previous_point, mousePos); if (resetAction && resetAction->isSeparator()) { - m_reset_action = Q_NULLPTR; + m_reset_action = nullptr; m_use_reset_action = true; } else if (m_reset_action != resetAction) { if (m_use_reset_action && resetAction) { @@ -465,8 +465,8 @@ public: public: enum Type { ScrollUp, ScrollDown }; ScrollerTearOffItem(Type type, QMenuPrivate *mPrivate, - QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); + void paintEvent(QPaintEvent *e) override; void updateScrollerRects(const QRect &rect); private: diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index cc6f39c439..c469c0b793 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -75,8 +75,8 @@ class QMenuBarExtension : public QToolButton public: explicit QMenuBarExtension(QWidget *parent); - QSize sizeHint() const Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + QSize sizeHint() const override; + void paintEvent(QPaintEvent *) override; }; QMenuBarExtension::QMenuBarExtension(QWidget *parent) @@ -1323,7 +1323,7 @@ void QMenuBarPrivate::handleReparent() //Note: if parent is reparented, then window may change even if parent doesn't. // We need to install an avent filter on each parent up to the parent that is // also a window (for shortcuts) - QWidget *newWindow = newParent ? newParent->window() : Q_NULLPTR; + QWidget *newWindow = newParent ? newParent->window() : nullptr; QVector<QPointer<QWidget> > newParents; // Remove event filters on ex-parents, keep them on still-parents @@ -1702,7 +1702,7 @@ void QMenuBarPrivate::_q_internalShortcutActivated(int id) QAction *act = actions.at(id); if (act && act->menu()) { if (QPlatformMenu *platformMenu = act->menu()->platformMenu()) { - platformMenu->showPopup(q->windowHandle(), actionRects.at(id), Q_NULLPTR); + platformMenu->showPopup(q->windowHandle(), actionRects.at(id), nullptr); return; } } diff --git a/src/widgets/widgets/qmenubar.h b/src/widgets/widgets/qmenubar.h index be70f4ea48..4f8e3b8d53 100644 --- a/src/widgets/widgets/qmenubar.h +++ b/src/widgets/widgets/qmenubar.h @@ -60,7 +60,7 @@ class Q_WIDGETS_EXPORT QMenuBar : public QWidget Q_PROPERTY(bool nativeMenuBar READ isNativeMenuBar WRITE setNativeMenuBar) public: - explicit QMenuBar(QWidget *parent = Q_NULLPTR); + explicit QMenuBar(QWidget *parent = nullptr); ~QMenuBar(); using QWidget::addAction; diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index 555b1f94ad..9f23169736 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -747,7 +747,8 @@ QPlainTextEditPrivate::QPlainTextEditPrivate() tabChangesFocus(false), lineWrap(QPlainTextEdit::WidgetWidth), wordWrap(QTextOption::WrapAtWordBoundaryOrAnywhere), - clickCausedFocus(0),topLine(0),topLineFracture(0), + clickCausedFocus(0), placeholderVisible(1), + topLine(0), topLineFracture(0), pageUpDownLastCursorYIsValid(false) { showCursorOnInitialShow = true; @@ -784,6 +785,7 @@ void QPlainTextEditPrivate::init(const QString &txt) QObject::connect(control, SIGNAL(selectionChanged()), q, SIGNAL(selectionChanged())); QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SLOT(_q_cursorPositionChanged())); + QObject::connect(control, SIGNAL(textChanged()), q, SLOT(_q_textChanged())); QObject::connect(control, SIGNAL(textChanged()), q, SLOT(updateMicroFocus())); // set a null page size initially to avoid any relayouting until the textedit @@ -816,6 +818,24 @@ void QPlainTextEditPrivate::init(const QString &txt) #endif } +void QPlainTextEditPrivate::_q_textChanged() +{ + Q_Q(QPlainTextEdit); + + // We normally only repaint the part of view that contains text in the + // document that has changed (in _q_repaintContents). But the placeholder + // text is not a part of the document, but is drawn on separately. So whenever + // we either show or hide the placeholder text, we issue a full update. + bool placeholderCurrentyVisible = placeholderVisible; + + placeholderVisible = !placeholderText.isEmpty() + && q->document()->isEmpty() + && q->firstVisibleBlock().layout()->preeditAreaText().isEmpty(); + + if (placeholderCurrentyVisible != placeholderVisible) + viewport->update(); +} + void QPlainTextEditPrivate::_q_repaintContents(const QRectF &contentsRect) { Q_Q(QPlainTextEdit); @@ -1881,6 +1901,7 @@ static void fillBackground(QPainter *p, const QRectF &rect, QBrush brush, const */ void QPlainTextEdit::paintEvent(QPaintEvent *e) { + Q_D(QPlainTextEdit); QPainter painter(viewport()); Q_ASSERT(qobject_cast<QPlainTextDocumentLayout*>(document()->documentLayout())); @@ -1903,6 +1924,15 @@ void QPlainTextEdit::paintEvent(QPaintEvent *e) er.setRight(qMin(er.right(), maxX)); painter.setClipRect(er); + if (d->placeholderVisible) { + QColor col = d->control->palette().text().color(); + col.setAlpha(128); + painter.setPen(col); + painter.setClipRect(e->rect()); + const int margin = int(document()->documentMargin()); + QRectF textRect = viewportRect.adjusted(margin, margin, 0, 0); + painter.drawText(textRect, Qt::AlignTop | Qt::TextWordWrap, placeholderText()); + } QAbstractTextDocumentLayout::PaintContext context = getPaintContext(); @@ -1977,17 +2007,8 @@ void QPlainTextEdit::paintEvent(QPaintEvent *e) } } + layout->draw(&painter, offset, selections, er); - if (!placeholderText().isEmpty() && document()->isEmpty() && layout->preeditAreaText().isEmpty()) { - Q_D(QPlainTextEdit); - QColor col = d->control->palette().text().color(); - col.setAlpha(128); - painter.setPen(col); - const int margin = int(document()->documentMargin()); - painter.drawText(r.adjusted(margin, 0, 0, 0), Qt::AlignTop | Qt::TextWordWrap, placeholderText()); - } else { - layout->draw(&painter, offset, selections, er); - } if ((drawCursor && !drawCursorAsBlock) || (editable && context.cursorPosition < -1 && !layout->preeditAreaText().isEmpty())) { 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: diff --git a/src/widgets/widgets/qplaintextedit_p.h b/src/widgets/widgets/qplaintextedit_p.h index 3d6e7781ed..534f0d4681 100644 --- a/src/widgets/widgets/qplaintextedit_p.h +++ b/src/widgets/widgets/qplaintextedit_p.h @@ -84,19 +84,19 @@ public: QPlainTextEditControl(QPlainTextEdit *parent); - QMimeData *createMimeDataFromSelection() const Q_DECL_OVERRIDE; - bool canInsertFromMimeData(const QMimeData *source) const Q_DECL_OVERRIDE; - void insertFromMimeData(const QMimeData *source) Q_DECL_OVERRIDE; - int hitTest(const QPointF &point, Qt::HitTestAccuracy = Qt::FuzzyHit) const Q_DECL_OVERRIDE; - QRectF blockBoundingRect(const QTextBlock &block) const Q_DECL_OVERRIDE; - QString anchorAt(const QPointF &pos) const Q_DECL_OVERRIDE; + QMimeData *createMimeDataFromSelection() const override; + bool canInsertFromMimeData(const QMimeData *source) const override; + void insertFromMimeData(const QMimeData *source) override; + int hitTest(const QPointF &point, Qt::HitTestAccuracy = Qt::FuzzyHit) const override; + QRectF blockBoundingRect(const QTextBlock &block) const override; + QString anchorAt(const QPointF &pos) const override; inline QRectF cursorRect(const QTextCursor &cursor) const { QRectF r = QWidgetTextControl::cursorRect(cursor); r.setLeft(qMax(r.left(), (qreal) 0.)); return r; } inline QRectF cursorRect() { return cursorRect(textCursor()); } - void ensureCursorVisible() Q_DECL_OVERRIDE { + void ensureCursorVisible() override { textEdit->ensureCursorVisible(); emit microFocusChanged(); } @@ -106,7 +106,7 @@ public: int topBlock; QTextBlock firstVisibleBlock() const; - QVariant loadResource(int type, const QUrl &name) Q_DECL_OVERRIDE { + QVariant loadResource(int type, const QUrl &name) override { return textEdit->loadResource(type, name); } @@ -121,6 +121,7 @@ public: void init(const QString &txt = QString()); void _q_repaintContents(const QRectF &contentsRect); + void _q_textChanged(); inline QPoint mapToContents(const QPoint &point) const { return QPoint(point.x() + horizontalOffset(), point.y() + verticalOffset()); } @@ -157,6 +158,7 @@ public: uint centerOnScroll : 1; uint inDrag : 1; uint clickCausedFocus : 1; + uint placeholderVisible : 1; int topLine; qreal topLineFracture; // for non-int sized fonts diff --git a/src/widgets/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h index e0f5e9084b..ec9686068c 100644 --- a/src/widgets/widgets/qprogressbar.h +++ b/src/widgets/widgets/qprogressbar.h @@ -68,7 +68,7 @@ public: enum Direction { TopToBottom, BottomToTop }; Q_ENUM(Direction) - explicit QProgressBar(QWidget *parent = Q_NULLPTR); + explicit QProgressBar(QWidget *parent = nullptr); ~QProgressBar(); int minimum() const; @@ -83,8 +83,8 @@ public: Qt::Alignment alignment() const; void setAlignment(Qt::Alignment alignment); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; Qt::Orientation orientation() const; @@ -109,8 +109,8 @@ Q_SIGNALS: void valueChanged(int value); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *) override; void initStyleOption(QStyleOptionProgressBar *option) const; private: diff --git a/src/widgets/widgets/qpushbutton.h b/src/widgets/widgets/qpushbutton.h index c005f320cc..b02ba63d07 100644 --- a/src/widgets/widgets/qpushbutton.h +++ b/src/widgets/widgets/qpushbutton.h @@ -61,13 +61,13 @@ class Q_WIDGETS_EXPORT QPushButton : public QAbstractButton Q_PROPERTY(bool flat READ isFlat WRITE setFlat) public: - explicit QPushButton(QWidget *parent = Q_NULLPTR); - explicit QPushButton(const QString &text, QWidget *parent = Q_NULLPTR); - QPushButton(const QIcon& icon, const QString &text, QWidget *parent = Q_NULLPTR); + explicit QPushButton(QWidget *parent = nullptr); + explicit QPushButton(const QString &text, QWidget *parent = nullptr); + QPushButton(const QIcon& icon, const QString &text, QWidget *parent = nullptr); ~QPushButton(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; bool autoDefault() const; void setAutoDefault(bool); @@ -88,13 +88,13 @@ public Q_SLOTS: #endif protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void focusInEvent(QFocusEvent *) override; + void focusOutEvent(QFocusEvent *) override; void initStyleOption(QStyleOptionButton *option) const; - QPushButton(QPushButtonPrivate &dd, QWidget* parent = Q_NULLPTR); + QPushButton(QPushButtonPrivate &dd, QWidget* parent = nullptr); public: diff --git a/src/widgets/widgets/qradiobutton.h b/src/widgets/widgets/qradiobutton.h index 137ae01380..c6b5ddce84 100644 --- a/src/widgets/widgets/qradiobutton.h +++ b/src/widgets/widgets/qradiobutton.h @@ -56,18 +56,18 @@ class Q_WIDGETS_EXPORT QRadioButton : public QAbstractButton Q_OBJECT public: - explicit QRadioButton(QWidget *parent = Q_NULLPTR); - explicit QRadioButton(const QString &text, QWidget *parent = Q_NULLPTR); + explicit QRadioButton(QWidget *parent = nullptr); + explicit QRadioButton(const QString &text, QWidget *parent = nullptr); ~QRadioButton(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - bool hitButton(const QPoint &) const Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + bool hitButton(const QPoint &) const override; + void paintEvent(QPaintEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; void initStyleOption(QStyleOptionButton *button) const; diff --git a/src/widgets/widgets/qrubberband.h b/src/widgets/widgets/qrubberband.h index a05eb0d543..c683c24a18 100644 --- a/src/widgets/widgets/qrubberband.h +++ b/src/widgets/widgets/qrubberband.h @@ -56,7 +56,7 @@ class Q_WIDGETS_EXPORT QRubberBand : public QWidget public: enum Shape { Line, Rectangle }; - explicit QRubberBand(Shape, QWidget * = Q_NULLPTR); + explicit QRubberBand(Shape, QWidget * = nullptr); ~QRubberBand(); Shape shape() const; @@ -73,12 +73,12 @@ public: { resize(s.width(), s.height()); } protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void moveEvent(QMoveEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *) override; + void changeEvent(QEvent *) override; + void showEvent(QShowEvent *) override; + void resizeEvent(QResizeEvent *) override; + void moveEvent(QMoveEvent *) override; void initStyleOption(QStyleOptionRubberBand *option) const; private: diff --git a/src/widgets/widgets/qscrollarea.h b/src/widgets/widgets/qscrollarea.h index d38bced2f2..6d252821c5 100644 --- a/src/widgets/widgets/qscrollarea.h +++ b/src/widgets/widgets/qscrollarea.h @@ -56,7 +56,7 @@ class Q_WIDGETS_EXPORT QScrollArea : public QAbstractScrollArea Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment) public: - explicit QScrollArea(QWidget *parent = Q_NULLPTR); + explicit QScrollArea(QWidget *parent = nullptr); ~QScrollArea(); QWidget *widget() const; @@ -66,9 +66,9 @@ public: bool widgetResizable() const; void setWidgetResizable(bool resizable); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; - bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; + bool focusNextPrevChild(bool next) override; Qt::Alignment alignment() const; void setAlignment(Qt::Alignment); @@ -77,13 +77,13 @@ public: void ensureWidgetVisible(QWidget *childWidget, int xmargin = 50, int ymargin = 50); protected: - QScrollArea(QScrollAreaPrivate &dd, QWidget *parent = Q_NULLPTR); - bool event(QEvent *) Q_DECL_OVERRIDE; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + QScrollArea(QScrollAreaPrivate &dd, QWidget *parent = nullptr); + bool event(QEvent *) override; + bool eventFilter(QObject *, QEvent *) override; + void resizeEvent(QResizeEvent *) override; + void scrollContentsBy(int dx, int dy) override; - QSize viewportSizeHint() const Q_DECL_OVERRIDE; + QSize viewportSizeHint() const override; private: Q_DECLARE_PRIVATE(QScrollArea) diff --git a/src/widgets/widgets/qscrollbar.h b/src/widgets/widgets/qscrollbar.h index 22b9bfcddb..171195fd24 100644 --- a/src/widgets/widgets/qscrollbar.h +++ b/src/widgets/widgets/qscrollbar.h @@ -56,25 +56,25 @@ class Q_WIDGETS_EXPORT QScrollBar : public QAbstractSlider { Q_OBJECT public: - explicit QScrollBar(QWidget *parent = Q_NULLPTR); - explicit QScrollBar(Qt::Orientation, QWidget *parent = Q_NULLPTR); + explicit QScrollBar(QWidget *parent = nullptr); + explicit QScrollBar(Qt::Orientation, QWidget *parent = nullptr); ~QScrollBar(); - QSize sizeHint() const Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + QSize sizeHint() const override; + bool event(QEvent *event) override; protected: #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *) override; #endif - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent*) Q_DECL_OVERRIDE; - void sliderChange(SliderChange change) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void hideEvent(QHideEvent*) override; + void sliderChange(SliderChange change) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *) override; #endif void initStyleOption(QStyleOptionSlider *option) const; diff --git a/src/widgets/widgets/qsizegrip.h b/src/widgets/widgets/qsizegrip.h index 6ad2405339..5285ffdfb8 100644 --- a/src/widgets/widgets/qsizegrip.h +++ b/src/widgets/widgets/qsizegrip.h @@ -55,19 +55,19 @@ public: explicit QSizeGrip(QWidget *parent); ~QSizeGrip(); - QSize sizeHint() const Q_DECL_OVERRIDE; - void setVisible(bool) Q_DECL_OVERRIDE; + QSize sizeHint() const override; + void setVisible(bool) override; protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; - void moveEvent(QMoveEvent *moveEvent) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *showEvent) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *hideEvent) Q_DECL_OVERRIDE; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; - bool event(QEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *mouseEvent) override; + void moveEvent(QMoveEvent *moveEvent) override; + void showEvent(QShowEvent *showEvent) override; + void hideEvent(QHideEvent *hideEvent) override; + bool eventFilter(QObject *, QEvent *) override; + bool event(QEvent *) override; public: diff --git a/src/widgets/widgets/qslider.h b/src/widgets/widgets/qslider.h index 642e836af7..f74f9c8576 100644 --- a/src/widgets/widgets/qslider.h +++ b/src/widgets/widgets/qslider.h @@ -68,13 +68,13 @@ public: }; Q_ENUM(TickPosition) - explicit QSlider(QWidget *parent = Q_NULLPTR); - explicit QSlider(Qt::Orientation orientation, QWidget *parent = Q_NULLPTR); + explicit QSlider(QWidget *parent = nullptr); + explicit QSlider(Qt::Orientation orientation, QWidget *parent = nullptr); ~QSlider(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; void setTickPosition(TickPosition position); TickPosition tickPosition() const; @@ -82,13 +82,13 @@ public: void setTickInterval(int ti); int tickInterval() const; - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; protected: - void paintEvent(QPaintEvent *ev) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *ev) override; + void mousePressEvent(QMouseEvent *ev) override; + void mouseReleaseEvent(QMouseEvent *ev) override; + void mouseMoveEvent(QMouseEvent *ev) override; void initStyleOption(QStyleOptionSlider *option) const; diff --git a/src/widgets/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp index b62a7768ce..561215ec85 100644 --- a/src/widgets/widgets/qspinbox.cpp +++ b/src/widgets/widgets/qspinbox.cpp @@ -61,10 +61,10 @@ class QSpinBoxPrivate : public QAbstractSpinBoxPrivate Q_DECLARE_PUBLIC(QSpinBox) public: QSpinBoxPrivate(); - void emitSignals(EmitPolicy ep, const QVariant &) Q_DECL_OVERRIDE; + void emitSignals(EmitPolicy ep, const QVariant &) override; - virtual QVariant valueFromText(const QString &n) const Q_DECL_OVERRIDE; - virtual QString textFromValue(const QVariant &n) const Q_DECL_OVERRIDE; + virtual QVariant valueFromText(const QString &n) const override; + virtual QString textFromValue(const QVariant &n) const override; QVariant validateAndInterpret(QString &input, int &pos, QValidator::State &state) const; @@ -82,10 +82,10 @@ class QDoubleSpinBoxPrivate : public QAbstractSpinBoxPrivate Q_DECLARE_PUBLIC(QDoubleSpinBox) public: QDoubleSpinBoxPrivate(); - void emitSignals(EmitPolicy ep, const QVariant &) Q_DECL_OVERRIDE; + void emitSignals(EmitPolicy ep, const QVariant &) override; - virtual QVariant valueFromText(const QString &n) const Q_DECL_OVERRIDE; - virtual QString textFromValue(const QVariant &n) const Q_DECL_OVERRIDE; + virtual QVariant valueFromText(const QString &n) const override; + virtual QString textFromValue(const QVariant &n) const override; QVariant validateAndInterpret(QString &input, int &pos, QValidator::State &state) const; double round(double input) const; diff --git a/src/widgets/widgets/qspinbox.h b/src/widgets/widgets/qspinbox.h index b61e665413..73489c9a68 100644 --- a/src/widgets/widgets/qspinbox.h +++ b/src/widgets/widgets/qspinbox.h @@ -62,7 +62,7 @@ class Q_WIDGETS_EXPORT QSpinBox : public QAbstractSpinBox Q_PROPERTY(int displayIntegerBase READ displayIntegerBase WRITE setDisplayIntegerBase) public: - explicit QSpinBox(QWidget *parent = Q_NULLPTR); + explicit QSpinBox(QWidget *parent = nullptr); ~QSpinBox(); int value() const; @@ -123,7 +123,7 @@ class Q_WIDGETS_EXPORT QDoubleSpinBox : public QAbstractSpinBox Q_PROPERTY(double singleStep READ singleStep WRITE setSingleStep) Q_PROPERTY(double value READ value WRITE setValue NOTIFY valueChanged USER true) public: - explicit QDoubleSpinBox(QWidget *parent = Q_NULLPTR); + explicit QDoubleSpinBox(QWidget *parent = nullptr); ~QDoubleSpinBox(); double value() const; diff --git a/src/widgets/widgets/qsplashscreen.h b/src/widgets/widgets/qsplashscreen.h index 1971b8bacf..8bdf4e7749 100644 --- a/src/widgets/widgets/qsplashscreen.h +++ b/src/widgets/widgets/qsplashscreen.h @@ -73,9 +73,9 @@ Q_SIGNALS: void messageChanged(const QString &message); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; virtual void drawContents(QPainter *painter); - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *) override; private: Q_DISABLE_COPY(QSplashScreen) diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h index bc4d7bca39..16fac48d1c 100644 --- a/src/widgets/widgets/qsplitter.h +++ b/src/widgets/widgets/qsplitter.h @@ -64,8 +64,8 @@ class Q_WIDGETS_EXPORT QSplitter : public QFrame Q_PROPERTY(bool childrenCollapsible READ childrenCollapsible WRITE setChildrenCollapsible) public: - explicit QSplitter(QWidget* parent = Q_NULLPTR); - explicit QSplitter(Qt::Orientation, QWidget* parent = Q_NULLPTR); + explicit QSplitter(QWidget* parent = nullptr); + explicit QSplitter(Qt::Orientation, QWidget* parent = nullptr); ~QSplitter(); void addWidget(QWidget *widget); @@ -84,8 +84,8 @@ public: bool opaqueResize() const; void refresh(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; QList<int> sizes() const; void setSizes(const QList<int> &list); @@ -111,12 +111,12 @@ Q_SIGNALS: protected: virtual QSplitterHandle *createHandle(); - void childEvent(QChildEvent *) Q_DECL_OVERRIDE; + void childEvent(QChildEvent *) override; - bool event(QEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + void resizeEvent(QResizeEvent *) override; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; + void changeEvent(QEvent *) override; void moveSplitter(int pos, int index); void setRubberBand(int position); int closestLegalPosition(int, int); @@ -145,15 +145,15 @@ public: bool opaqueResize() const; QSplitter *splitter() const; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - bool event(QEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void resizeEvent(QResizeEvent *) override; + bool event(QEvent *) override; void moveSplitter(int p); int closestLegalPosition(int p); diff --git a/src/widgets/widgets/qstackedwidget.h b/src/widgets/widgets/qstackedwidget.h index 29df145b70..5508f905d4 100644 --- a/src/widgets/widgets/qstackedwidget.h +++ b/src/widgets/widgets/qstackedwidget.h @@ -56,7 +56,7 @@ class Q_WIDGETS_EXPORT QStackedWidget : public QFrame Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentChanged) Q_PROPERTY(int count READ count) public: - explicit QStackedWidget(QWidget *parent = Q_NULLPTR); + explicit QStackedWidget(QWidget *parent = nullptr); ~QStackedWidget(); int addWidget(QWidget *w); @@ -79,7 +79,7 @@ Q_SIGNALS: void widgetRemoved(int index); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; private: Q_DISABLE_COPY(QStackedWidget) diff --git a/src/widgets/widgets/qstatusbar.h b/src/widgets/widgets/qstatusbar.h index 9ac637931c..2492e8487f 100644 --- a/src/widgets/widgets/qstatusbar.h +++ b/src/widgets/widgets/qstatusbar.h @@ -56,7 +56,7 @@ class Q_WIDGETS_EXPORT QStatusBar: public QWidget Q_PROPERTY(bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled) public: - explicit QStatusBar(QWidget *parent = Q_NULLPTR); + explicit QStatusBar(QWidget *parent = nullptr); virtual ~QStatusBar(); void addWidget(QWidget *widget, int stretch = 0); @@ -79,14 +79,14 @@ Q_SIGNALS: void messageChanged(const QString &text); protected: - void showEvent(QShowEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *) override; + void paintEvent(QPaintEvent *) override; + void resizeEvent(QResizeEvent *) override; // ### Qt 6: consider making reformat() and hideOrShow() private void reformat(); void hideOrShow(); - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; private: Q_DISABLE_COPY(QStatusBar) diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h index ebcd1094ef..fc619355f0 100644 --- a/src/widgets/widgets/qtabbar.h +++ b/src/widgets/widgets/qtabbar.h @@ -71,7 +71,7 @@ class Q_WIDGETS_EXPORT QTabBar: public QWidget Q_PROPERTY(bool changeCurrentOnDrag READ changeCurrentOnDrag WRITE setChangeCurrentOnDrag) public: - explicit QTabBar(QWidget *parent = Q_NULLPTR); + explicit QTabBar(QWidget *parent = nullptr); ~QTabBar(); enum Shape { RoundedNorth, RoundedSouth, RoundedWest, RoundedEast, @@ -136,8 +136,8 @@ public: int currentIndex() const; int count() const; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; void setDrawBase(bool drawTheBase); bool drawBase() const; @@ -194,20 +194,20 @@ protected: virtual void tabRemoved(int index); virtual void tabLayoutChange(); - bool event(QEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mousePressEvent (QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent (QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent (QMouseEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + void resizeEvent(QResizeEvent *) override; + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; + void paintEvent(QPaintEvent *) override; + void mousePressEvent (QMouseEvent *) override; + void mouseMoveEvent (QMouseEvent *) override; + void mouseReleaseEvent (QMouseEvent *) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *event) override; #endif - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *) override; + void changeEvent(QEvent *) override; + void timerEvent(QTimerEvent *event) override; void initStyleOption(QStyleOptionTab *option, int tabIndex) const; #ifndef QT_NO_ACCESSIBILITY diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h index 195ff79c5d..1092878f2c 100644 --- a/src/widgets/widgets/qtabbar_p.h +++ b/src/widgets/widgets/qtabbar_p.h @@ -71,11 +71,11 @@ QT_BEGIN_NAMESPACE class QMovableTabWidget : public QWidget { public: - explicit QMovableTabWidget(QWidget *parent = Q_NULLPTR); + explicit QMovableTabWidget(QWidget *parent = nullptr); void setPixmap(const QPixmap &pixmap); protected: - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *e) override; private: QPixmap m_pixmap; @@ -142,9 +142,9 @@ public: TabBarAnimation(Tab *t, QTabBarPrivate *_priv) : tab(t), priv(_priv) { setEasingCurve(QEasingCurve::InOutQuad); } - void updateCurrentValue(const QVariant ¤t) Q_DECL_OVERRIDE; + void updateCurrentValue(const QVariant ¤t) override; - void updateState(State, State newState) Q_DECL_OVERRIDE; + void updateState(State, State newState) override; private: //these are needed for the callbacks Tab *tab; @@ -278,12 +278,12 @@ class CloseButton : public QAbstractButton public: explicit CloseButton(QWidget *parent = 0); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override; + QSize minimumSizeHint() const override { return sizeHint(); } - void enterEvent(QEvent *event) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void enterEvent(QEvent *event) override; + void leaveEvent(QEvent *event) override; + void paintEvent(QPaintEvent *event) override; }; QT_END_NAMESPACE diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h index b80fdba1fb..f55e71488b 100644 --- a/src/widgets/widgets/qtabwidget.h +++ b/src/widgets/widgets/qtabwidget.h @@ -68,7 +68,7 @@ class Q_WIDGETS_EXPORT QTabWidget : public QWidget Q_PROPERTY(bool tabBarAutoHide READ tabBarAutoHide WRITE setTabBarAutoHide) public: - explicit QTabWidget(QWidget *parent = Q_NULLPTR); + explicit QTabWidget(QWidget *parent = nullptr); ~QTabWidget(); int addTab(QWidget *widget, const QString &); @@ -120,10 +120,10 @@ public: TabShape tabShape() const; void setTabShape(TabShape s); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; - int heightForWidth(int width) const Q_DECL_OVERRIDE; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; + int heightForWidth(int width) const override; + bool hasHeightForWidth() const override; void setCornerWidget(QWidget * w, Qt::Corner corner = Qt::TopRightCorner); QWidget * cornerWidget(Qt::Corner corner = Qt::TopRightCorner) const; @@ -161,13 +161,13 @@ protected: virtual void tabInserted(int index); virtual void tabRemoved(int index); - void showEvent(QShowEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *) override; + void resizeEvent(QResizeEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void paintEvent(QPaintEvent *) override; void setTabBar(QTabBar *); - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - bool event(QEvent *) Q_DECL_OVERRIDE; + void changeEvent(QEvent *) override; + bool event(QEvent *) override; void initStyleOption(QStyleOptionTabWidgetFrame *option) const; diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp index 0797120960..fa4dd14c92 100644 --- a/src/widgets/widgets/qtextbrowser.cpp +++ b/src/widgets/widgets/qtextbrowser.cpp @@ -135,7 +135,7 @@ public: void setSource(const QUrl &url); // re-imlemented from QTextEditPrivate - virtual QUrl resolveUrl(const QUrl &url) const Q_DECL_OVERRIDE; + virtual QUrl resolveUrl(const QUrl &url) const override; inline QUrl resolveUrl(const QString &url) const { return resolveUrl(QUrl(url)); } diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h index f36c86bc86..ea81256f50 100644 --- a/src/widgets/widgets/qtextbrowser.h +++ b/src/widgets/widgets/qtextbrowser.h @@ -63,7 +63,7 @@ class Q_WIDGETS_EXPORT QTextBrowser : public QTextEdit Q_PROPERTY(bool openLinks READ openLinks WRITE setOpenLinks) public: - explicit QTextBrowser(QWidget* parent = Q_NULLPTR); + explicit QTextBrowser(QWidget* parent = nullptr); virtual ~QTextBrowser(); QUrl source() const; @@ -71,7 +71,7 @@ public: QStringList searchPaths() const; void setSearchPaths(const QStringList &paths); - virtual QVariant loadResource(int type, const QUrl &name) Q_DECL_OVERRIDE; + virtual QVariant loadResource(int type, const QUrl &name) override; bool isBackwardAvailable() const; bool isForwardAvailable() const; @@ -104,14 +104,14 @@ Q_SIGNALS: void anchorClicked(const QUrl &); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - virtual void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE; - virtual void mouseMoveEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - virtual void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - virtual void focusOutEvent(QFocusEvent *ev) Q_DECL_OVERRIDE; - virtual bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; - virtual void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + virtual void keyPressEvent(QKeyEvent *ev) override; + virtual void mouseMoveEvent(QMouseEvent *ev) override; + virtual void mousePressEvent(QMouseEvent *ev) override; + virtual void mouseReleaseEvent(QMouseEvent *ev) override; + virtual void focusOutEvent(QFocusEvent *ev) override; + virtual bool focusNextPrevChild(bool next) override; + virtual void paintEvent(QPaintEvent *e) override; private: Q_DISABLE_COPY(QTextBrowser) diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index df8ecba112..95c85dc4fe 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -84,19 +84,19 @@ class QTextEditControl : public QWidgetTextControl public: inline QTextEditControl(QObject *parent) : QWidgetTextControl(parent) {} - virtual QMimeData *createMimeDataFromSelection() const Q_DECL_OVERRIDE { + virtual QMimeData *createMimeDataFromSelection() const override { QTextEdit *ed = qobject_cast<QTextEdit *>(parent()); if (!ed) return QWidgetTextControl::createMimeDataFromSelection(); return ed->createMimeDataFromSelection(); } - virtual bool canInsertFromMimeData(const QMimeData *source) const Q_DECL_OVERRIDE { + virtual bool canInsertFromMimeData(const QMimeData *source) const override { QTextEdit *ed = qobject_cast<QTextEdit *>(parent()); if (!ed) return QWidgetTextControl::canInsertFromMimeData(source); return ed->canInsertFromMimeData(source); } - virtual void insertFromMimeData(const QMimeData *source) Q_DECL_OVERRIDE { + virtual void insertFromMimeData(const QMimeData *source) override { QTextEdit *ed = qobject_cast<QTextEdit *>(parent()); if (!ed) QWidgetTextControl::insertFromMimeData(source); diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index 954f0167ae..9e0913160d 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -102,8 +102,8 @@ public: Q_DECLARE_FLAGS(AutoFormatting, AutoFormattingFlag) Q_FLAG(AutoFormatting) - explicit QTextEdit(QWidget *parent = Q_NULLPTR); - explicit QTextEdit(const QString &text, QWidget *parent = Q_NULLPTR); + explicit QTextEdit(QWidget *parent = nullptr); + explicit QTextEdit(const QString &text, QWidget *parent = nullptr); virtual ~QTextEdit(); void setDocument(QTextDocument *document); @@ -216,7 +216,7 @@ public: void print(QPagedPaintDevice *printer) 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: @@ -270,43 +270,43 @@ Q_SIGNALS: void cursorPositionChanged(); 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; QTextEdit(QTextEditPrivate &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); void zoomInF(float range); diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h index 9ffb472c76..0253541a2e 100644 --- a/src/widgets/widgets/qtoolbar.h +++ b/src/widgets/widgets/qtoolbar.h @@ -76,8 +76,8 @@ class Q_WIDGETS_EXPORT QToolBar : public QWidget Q_PROPERTY(bool floatable READ isFloatable WRITE setFloatable) public: - explicit QToolBar(const QString &title, QWidget *parent = Q_NULLPTR); - explicit QToolBar(QWidget *parent = Q_NULLPTR); + explicit QToolBar(const QString &title, QWidget *parent = nullptr); + explicit QToolBar(QWidget *parent = nullptr); ~QToolBar(); void setMovable(bool movable); @@ -188,10 +188,10 @@ Q_SIGNALS: void visibilityChanged(bool visible); protected: - void actionEvent(QActionEvent *event) Q_DECL_OVERRIDE; - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void actionEvent(QActionEvent *event) override; + void changeEvent(QEvent *event) override; + void paintEvent(QPaintEvent *event) override; + bool event(QEvent *event) override; void initStyleOption(QStyleOptionToolBar *option) const; diff --git a/src/widgets/widgets/qtoolbarextension_p.h b/src/widgets/widgets/qtoolbarextension_p.h index b6223107c4..a388f1e40f 100644 --- a/src/widgets/widgets/qtoolbarextension_p.h +++ b/src/widgets/widgets/qtoolbarextension_p.h @@ -64,8 +64,8 @@ class Q_AUTOTEST_EXPORT QToolBarExtension : public QToolButton public: explicit QToolBarExtension(QWidget *parent); - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; + QSize sizeHint() const override; public Q_SLOTS: void setOrientation(Qt::Orientation o); diff --git a/src/widgets/widgets/qtoolbarlayout_p.h b/src/widgets/widgets/qtoolbarlayout_p.h index 9a81c4e50e..8c60164439 100644 --- a/src/widgets/widgets/qtoolbarlayout_p.h +++ b/src/widgets/widgets/qtoolbarlayout_p.h @@ -68,7 +68,7 @@ class QToolBarItem : public QWidgetItem { public: QToolBarItem(QWidget *widget); - bool isEmpty() const Q_DECL_OVERRIDE; + bool isEmpty() const override; QAction *action; bool customWidget; @@ -82,22 +82,22 @@ public: QToolBarLayout(QWidget *parent = 0); ~QToolBarLayout(); - void addItem(QLayoutItem *item) Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; + void addItem(QLayoutItem *item) override; + QLayoutItem *itemAt(int index) const override; + QLayoutItem *takeAt(int index) override; + int count() const override; - bool isEmpty() const Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; + bool isEmpty() const override; + void invalidate() override; + Qt::Orientations expandingDirections() const override; - void setGeometry(const QRect &r) Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + void setGeometry(const QRect &r) override; + QSize minimumSize() const override; + QSize sizeHint() const override; void insertAction(int index, QAction *action); int indexOf(QAction *action) const; - int indexOf(QWidget *widget) const Q_DECL_OVERRIDE { return QLayout::indexOf(widget); } + int indexOf(QWidget *widget) const override { return QLayout::indexOf(widget); } bool layoutActions(const QSize &size); QSize expandedSize(const QSize &size) const; diff --git a/src/widgets/widgets/qtoolbarseparator_p.h b/src/widgets/widgets/qtoolbarseparator_p.h index 8c9cf9f46a..d52b4fa6ae 100644 --- a/src/widgets/widgets/qtoolbarseparator_p.h +++ b/src/widgets/widgets/qtoolbarseparator_p.h @@ -71,9 +71,9 @@ public: Qt::Orientation orientation() const; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; void initStyleOption(QStyleOption *option) const; public Q_SLOTS: diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp index fdcd07eb06..46ade0277c 100644 --- a/src/widgets/widgets/qtoolbox.cpp +++ b/src/widgets/widgets/qtoolbox.cpp @@ -69,12 +69,12 @@ public: inline void setSelected(bool b) { selected = b; update(); } inline void setIndex(int newIndex) { indexInPage = newIndex; } - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; protected: void initStyleOption(QStyleOptionToolBox *opt) const; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; private: bool selected; diff --git a/src/widgets/widgets/qtoolbox.h b/src/widgets/widgets/qtoolbox.h index 321507ba07..2796631b94 100644 --- a/src/widgets/widgets/qtoolbox.h +++ b/src/widgets/widgets/qtoolbox.h @@ -57,7 +57,7 @@ class Q_WIDGETS_EXPORT QToolBox : public QFrame Q_PROPERTY(int count READ count) public: - explicit QToolBox(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); + explicit QToolBox(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); ~QToolBox(); int addItem(QWidget *widget, const QString &text); @@ -95,11 +95,11 @@ Q_SIGNALS: void currentChanged(int index); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; virtual void itemInserted(int index); virtual void itemRemoved(int index); - void showEvent(QShowEvent *e) Q_DECL_OVERRIDE; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *e) override; + void changeEvent(QEvent *) override; private: diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h index dd9964cb94..52bd2d5f7a 100644 --- a/src/widgets/widgets/qtoolbutton.h +++ b/src/widgets/widgets/qtoolbutton.h @@ -71,11 +71,11 @@ public: }; Q_ENUM(ToolButtonPopupMode) - explicit QToolButton(QWidget *parent = Q_NULLPTR); + explicit QToolButton(QWidget *parent = nullptr); ~QToolButton(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; Qt::ToolButtonStyle toolButtonStyle() const; @@ -106,19 +106,19 @@ Q_SIGNALS: void triggered(QAction *); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void actionEvent(QActionEvent *) Q_DECL_OVERRIDE; - - void enterEvent(QEvent *) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - - bool hitButton(const QPoint &pos) const Q_DECL_OVERRIDE; - void nextCheckState() Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void paintEvent(QPaintEvent *) override; + void actionEvent(QActionEvent *) override; + + void enterEvent(QEvent *) override; + void leaveEvent(QEvent *) override; + void timerEvent(QTimerEvent *) override; + void changeEvent(QEvent *) override; + + bool hitButton(const QPoint &pos) const override; + void nextCheckState() override; void initStyleOption(QStyleOptionToolButton *option) const; private: diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h index 16c9cc71eb..16eb337416 100644 --- a/src/widgets/widgets/qwidgetlinecontrol_p.h +++ b/src/widgets/widgets/qwidgetlinecontrol_p.h @@ -550,7 +550,7 @@ Q_SIGNALS: void editFocusChange(bool); #endif protected: - virtual void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + virtual void timerEvent(QTimerEvent *event) override; private Q_SLOTS: void _q_deleteSelected(); diff --git a/src/widgets/widgets/qwidgetresizehandler_p.h b/src/widgets/widgets/qwidgetresizehandler_p.h index 669cb6f256..b87bbd6229 100644 --- a/src/widgets/widgets/qwidgetresizehandler_p.h +++ b/src/widgets/widgets/qwidgetresizehandler_p.h @@ -95,7 +95,7 @@ Q_SIGNALS: void activate(); protected: - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) override; void mouseMoveEvent(QMouseEvent *e); void keyPressEvent(QKeyEvent *e); diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index aa5a3329e9..5712ea6151 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -1887,8 +1887,6 @@ void QWidgetTextControlPrivate::contextMenuEvent(const QPoint &screenPos, const Q_UNUSED(contextWidget); #else Q_Q(QWidgetTextControl); - if (!hasFocus) - return; QMenu *menu = q->createStandardContextMenu(docPos, contextWidget); if (!menu) return; diff --git a/src/widgets/widgets/qwidgettextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h index 11ff63c5e4..4b2acbd934 100644 --- a/src/widgets/widgets/qwidgettextcontrol_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p.h @@ -258,9 +258,9 @@ public: bool findNextPrevAnchor(const QTextCursor& from, bool next, QTextCursor& newAnchor); protected: - virtual void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + virtual void timerEvent(QTimerEvent *e) override; - virtual bool event(QEvent *e) Q_DECL_OVERRIDE; + virtual bool event(QEvent *e) override; private: Q_DISABLE_COPY(QWidgetTextControl) @@ -296,9 +296,9 @@ class QTextEditMimeData : public QMimeData public: inline QTextEditMimeData(const QTextDocumentFragment &aFragment) : fragment(aFragment) {} - virtual QStringList formats() const Q_DECL_OVERRIDE; + virtual QStringList formats() const override; protected: - virtual QVariant retrieveData(const QString &mimeType, QVariant::Type type) const Q_DECL_OVERRIDE; + virtual QVariant retrieveData(const QString &mimeType, QVariant::Type type) const override; private: void setup() const; |