diff options
Diffstat (limited to 'src/widgets/util')
-rw-r--r-- | src/widgets/util/qcompleter.h | 4 | ||||
-rw-r--r-- | src/widgets/util/qcompleter_p.h | 26 | ||||
-rw-r--r-- | src/widgets/util/qflickgesture.cpp | 2 | ||||
-rw-r--r-- | src/widgets/util/qscroller.cpp | 4 | ||||
-rw-r--r-- | src/widgets/util/qsystemtrayicon.h | 2 | ||||
-rw-r--r-- | src/widgets/util/qsystemtrayicon_p.h | 8 | ||||
-rw-r--r-- | src/widgets/util/qsystemtrayicon_x11.cpp | 12 | ||||
-rw-r--r-- | src/widgets/util/qundoview.cpp | 10 |
8 files changed, 34 insertions, 34 deletions
diff --git a/src/widgets/util/qcompleter.h b/src/widgets/util/qcompleter.h index 3bee280719..c252284b85 100644 --- a/src/widgets/util/qcompleter.h +++ b/src/widgets/util/qcompleter.h @@ -136,8 +136,8 @@ public: virtual QStringList splitPath(const QString &path) const; protected: - bool eventFilter(QObject *o, QEvent *e); - bool event(QEvent *); + bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *) Q_DECL_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 50f7cdacdb..b4ead17cab 100644 --- a/src/widgets/util/qcompleter_p.h +++ b/src/widgets/util/qcompleter_p.h @@ -167,7 +167,7 @@ class QSortedModelEngine : public QCompletionEngine { public: QSortedModelEngine(QCompleterPrivate *c) : QCompletionEngine(c) { } - QMatchData filter(const QString&, const QModelIndex&, int); + QMatchData filter(const QString&, const QModelIndex&, int) Q_DECL_OVERRIDE; QIndexMapper indexHint(QString, const QModelIndex&, Qt::SortOrder); Qt::SortOrder sortOrder(const QModelIndex&) const; }; @@ -177,8 +177,8 @@ class QUnsortedModelEngine : public QCompletionEngine public: QUnsortedModelEngine(QCompleterPrivate *c) : QCompletionEngine(c) { } - void filterOnDemand(int); - QMatchData filter(const QString&, const QModelIndex&, int); + void filterOnDemand(int) Q_DECL_OVERRIDE; + QMatchData filter(const QString&, const QModelIndex&, int) Q_DECL_OVERRIDE; private: int buildIndices(const QString& str, const QModelIndex& parent, int n, const QIndexMapper& iv, QMatchData* m); @@ -189,7 +189,7 @@ class QCompleterItemDelegate : public QItemDelegate public: QCompleterItemDelegate(QAbstractItemView *view) : QItemDelegate(view), view(view) { } - void paint(QPainter *p, const QStyleOptionViewItem& opt, const QModelIndex& idx) const { + void paint(QPainter *p, const QStyleOptionViewItem& opt, const QModelIndex& idx) const Q_DECL_OVERRIDE { QStyleOptionViewItem optCopy = opt; optCopy.showDecorationSelected = true; if (view->currentIndex() == idx) @@ -218,16 +218,16 @@ public: bool setCurrentRow(int row); QModelIndex currentIndex(bool) const; - QModelIndex index(int row, int column, const QModelIndex & = QModelIndex()) const; - int rowCount(const QModelIndex &index = QModelIndex()) const; - int columnCount(const QModelIndex &index = QModelIndex()) const; - bool hasChildren(const QModelIndex &parent = QModelIndex()) const; - QModelIndex parent(const QModelIndex & = QModelIndex()) const { return QModelIndex(); } - QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) 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; - void setSourceModel(QAbstractItemModel *sourceModel); - QModelIndex mapToSource(const QModelIndex& proxyIndex) const; - QModelIndex mapFromSource(const QModelIndex& sourceIndex) const; + 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; QCompleterPrivate *c; QScopedPointer<QCompletionEngine> engine; diff --git a/src/widgets/util/qflickgesture.cpp b/src/widgets/util/qflickgesture.cpp index a5f2cf2e66..8c87d9b269 100644 --- a/src/widgets/util/qflickgesture.cpp +++ b/src/widgets/util/qflickgesture.cpp @@ -240,7 +240,7 @@ public: } protected: - void timerEvent(QTimerEvent *e) + void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE { if (e->timerId() == pressDelayTimer) { if (pressDelayEvent && mouseTarget) { diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp index 8cd7b97e30..5235511b6d 100644 --- a/src/widgets/util/qscroller.cpp +++ b/src/widgets/util/qscroller.cpp @@ -190,7 +190,7 @@ public: : d(_d), ignoreUpdate(false), skip(0) { } - int duration() const + int duration() const Q_DECL_OVERRIDE { return -1; } @@ -206,7 +206,7 @@ public: } protected: - void updateCurrentTime(int /*currentTime*/) + void updateCurrentTime(int /*currentTime*/) Q_DECL_OVERRIDE { if (!ignoreUpdate) { if (++skip >= d->frameRateSkip()) { diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h index 4d92d811ed..29a9f849b4 100644 --- a/src/widgets/util/qsystemtrayicon.h +++ b/src/widgets/util/qsystemtrayicon.h @@ -102,7 +102,7 @@ Q_SIGNALS: void messageClicked(); protected: - bool event(QEvent *event); + bool event(QEvent *event) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QSystemTrayIcon) diff --git a/src/widgets/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h index 0dda689c51..ce88313707 100644 --- a/src/widgets/util/qsystemtrayicon_p.h +++ b/src/widgets/util/qsystemtrayicon_p.h @@ -119,10 +119,10 @@ private: void balloon(const QPoint&, int, bool); protected: - void paintEvent(QPaintEvent *); - void resizeEvent(QResizeEvent *); - void mousePressEvent(QMouseEvent *e); - void timerEvent(QTimerEvent *e); + 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; private: QSystemTrayIcon *trayIcon; diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index 09f2d6266c..8fbbc96f6c 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -74,12 +74,12 @@ public: QRect globalGeometry() const; protected: - virtual void mousePressEvent(QMouseEvent *ev); - virtual void mouseDoubleClickEvent(QMouseEvent *ev); - virtual bool event(QEvent *); - virtual void paintEvent(QPaintEvent *); - virtual void resizeEvent(QResizeEvent *); - virtual void moveEvent(QMoveEvent *); + 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; private slots: void systemTrayWindowChanged(QScreen *screen); diff --git a/src/widgets/util/qundoview.cpp b/src/widgets/util/qundoview.cpp index 970541cf73..4ead2910a2 100644 --- a/src/widgets/util/qundoview.cpp +++ b/src/widgets/util/qundoview.cpp @@ -53,11 +53,11 @@ public: QUndoStack *stack() const; virtual QModelIndex index(int row, int column, - const QModelIndex &parent = QModelIndex()) const; - virtual QModelIndex parent(const QModelIndex &child) const; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; - virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + 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; QModelIndex selectedIndex() const; QItemSelectionModel *selectionModel() const; |