diff options
author | Samuel Gaist <samuel.gaist@idiap.ch> | 2023-02-23 20:52:29 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2023-12-11 14:27:02 +0100 |
commit | 1dbdd93e0ab5474bbe7ee9077358add439eee67e (patch) | |
tree | 4e96777255184469dda2be12404888421ce22ef1 | |
parent | 92938ffef142378cafefe0fa4dd04bbef22e7915 (diff) |
examples: port embedded svg viewer example to new connection style
Task-number: QTBUG-111463
Change-Id: Iea2512ef0cbd09bb73ba29c49be8cdecec7ef112
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r-- | tests/manual/examples/embeddedsvgviewer/embeddedsvgviewer.cpp | 13 | ||||
-rw-r--r-- | tests/manual/examples/embeddedsvgviewer/embeddedsvgviewer.h | 11 |
2 files changed, 14 insertions, 10 deletions
diff --git a/tests/manual/examples/embeddedsvgviewer/embeddedsvgviewer.cpp b/tests/manual/examples/embeddedsvgviewer/embeddedsvgviewer.cpp index f3e1096..bff0f3f 100644 --- a/tests/manual/examples/embeddedsvgviewer/embeddedsvgviewer.cpp +++ b/tests/manual/examples/embeddedsvgviewer/embeddedsvgviewer.cpp @@ -3,11 +3,13 @@ #include <QPainter> #include <QApplication> +#include <QMouseEvent> +#include <QSlider> +#include <QPushButton> +#include <QSvgRenderer> #include "embeddedsvgviewer.h" - - EmbeddedSvgViewer::EmbeddedSvgViewer(const QString &filePath) { qApp->setStyleSheet(" QSlider:vertical { width: 50px; } \ @@ -24,15 +26,16 @@ EmbeddedSvgViewer::EmbeddedSvgViewer(const QString &filePath) m_zoomSlider->setMaximum(150); m_zoomSlider->setMinimum(1); - connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoom(int))); + connect(m_zoomSlider, &QSlider::valueChanged, this, &EmbeddedSvgViewer::setZoom); m_zoomSlider->setValue(100); m_quitButton = new QPushButton("Quit", this); - connect(m_quitButton, SIGNAL(pressed()), QApplication::instance(), SLOT(quit())); + connect(m_quitButton, &QPushButton::pressed, QApplication::instance(), &QApplication::quit); if (m_renderer->animated()) - connect(m_renderer, SIGNAL(repaintNeeded()), this, SLOT(update())); + connect(m_renderer, &QSvgRenderer::repaintNeeded, + this, qOverload<>(&EmbeddedSvgViewer::update)); } diff --git a/tests/manual/examples/embeddedsvgviewer/embeddedsvgviewer.h b/tests/manual/examples/embeddedsvgviewer/embeddedsvgviewer.h index cbf0a3e..402f638 100644 --- a/tests/manual/examples/embeddedsvgviewer/embeddedsvgviewer.h +++ b/tests/manual/examples/embeddedsvgviewer/embeddedsvgviewer.h @@ -6,11 +6,12 @@ #include <QWidget> #include <QString> -#include <QSvgRenderer> #include <QSize> -#include <QMouseEvent> -#include <QSlider> -#include <QPushButton> + +class QSvgRenderer; +class QMouseEvent; +class QSlider; +class QPushButton; class EmbeddedSvgViewer : public QWidget { @@ -22,7 +23,7 @@ public: void mousePressEvent(QMouseEvent *event) override; void resizeEvent(QResizeEvent *event) override; -public slots: +public Q_SLOTS: void setZoom(int); // 100 <= newZoom < 0 private: |