diff options
Diffstat (limited to 'examples/widgets/widgets/mousebuttons')
| -rw-r--r-- | examples/widgets/widgets/mousebuttons/buttontester.h | 5 | ||||
| -rw-r--r-- | examples/widgets/widgets/mousebuttons/main.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/examples/widgets/widgets/mousebuttons/buttontester.h b/examples/widgets/widgets/mousebuttons/buttontester.h index d99dcceb18..231733bd44 100644 --- a/examples/widgets/widgets/mousebuttons/buttontester.h +++ b/examples/widgets/widgets/mousebuttons/buttontester.h @@ -59,13 +59,14 @@ class ButtonTester : public QTextEdit { Q_OBJECT - +public: + using QTextEdit::QTextEdit; protected: void mousePressEvent(QMouseEvent *event) override; void mouseReleaseEvent(QMouseEvent *event) override; void mouseDoubleClickEvent(QMouseEvent *event) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent * event) override; + void wheelEvent(QWheelEvent *event) override; #endif int buttonByNumber(const Qt::MouseButton button); QString enumNameFromValue(const Qt::MouseButton button); diff --git a/examples/widgets/widgets/mousebuttons/main.cpp b/examples/widgets/widgets/mousebuttons/main.cpp index 28be0ffddf..e35a442181 100644 --- a/examples/widgets/widgets/mousebuttons/main.cpp +++ b/examples/widgets/widgets/mousebuttons/main.cpp @@ -68,7 +68,7 @@ int main(int argv, char **args) testArea->setText("To test your mouse with Qt, press buttons in this area.\nYou may also scroll or tilt your mouse wheel."); QPushButton *quitButton = new QPushButton("Quit"); - QObject::connect(quitButton, SIGNAL(clicked()), qApp, SLOT(quit())); + QObject::connect(quitButton, &QPushButton::clicked, qApp, &QCoreApplication::quit); QVBoxLayout *layout = new QVBoxLayout; layout->addWidget(testArea); |