diff options
Diffstat (limited to 'src/templates/qquickcombobox_p.h')
| -rw-r--r-- | src/templates/qquickcombobox_p.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/templates/qquickcombobox_p.h b/src/templates/qquickcombobox_p.h index 1d8f498a..23def3c8 100644 --- a/src/templates/qquickcombobox_p.h +++ b/src/templates/qquickcombobox_p.h @@ -72,7 +72,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickComboBox : public QQuickControl Q_PROPERTY(QQuickPopup *popup READ popup WRITE setPopup NOTIFY popupChanged FINAL) public: - explicit QQuickComboBox(QQuickItem *parent = Q_NULLPTR); + explicit QQuickComboBox(QQuickItem *parent = nullptr); ~QQuickComboBox(); int count() const; @@ -106,6 +106,9 @@ public: Q_INVOKABLE QString textAt(int index) const; Q_INVOKABLE int find(const QString &text, Qt::MatchFlags flags = Qt::MatchExactly) const; +public Q_SLOTS: + void increase(); + void decrease(); Q_SIGNALS: void countChanged(); @@ -124,17 +127,18 @@ Q_SIGNALS: void highlighted(int index); protected: - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *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 mouseUngrabEvent() Q_DECL_OVERRIDE; - - void componentComplete() Q_DECL_OVERRIDE; - - QFont defaultFont() const Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseUngrabEvent() override; + void wheelEvent(QWheelEvent *event) override; + + void componentComplete() override; + + QFont defaultFont() const override; private: Q_DISABLE_COPY(QQuickComboBox) |