diff options
Diffstat (limited to 'examples/widgets/graphicsview/embeddeddialogs')
4 files changed, 10 insertions, 11 deletions
diff --git a/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp b/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp index f510ebc07f..6eda94e8ba 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp +++ b/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp @@ -50,14 +50,13 @@ #include "customproxy.h" -#include <QStyleOptionGraphicsItem> -#include <QPainter> #include <QGraphicsScene> +#include <QPainter> +#include <QStyleOptionGraphicsItem> CustomProxy::CustomProxy(QGraphicsItem *parent, Qt::WindowFlags wFlags) - : QGraphicsProxyWidget(parent, wFlags), popupShown(false), currentPopup(nullptr) + : QGraphicsProxyWidget(parent, wFlags), timeLine(new QTimeLine(250, this)) { - timeLine = new QTimeLine(250, this); connect(timeLine, &QTimeLine::valueChanged, this, &CustomProxy::updateStep); connect(timeLine, &QTimeLine::stateChanged, @@ -99,7 +98,7 @@ void CustomProxy::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { QGraphicsProxyWidget::hoverEnterEvent(event); scene()->setActiveWindow(this); - if (timeLine->currentValue() != 1) + if (qFuzzyCompare(timeLine->currentValue(), 1)) zoomIn(); } @@ -107,7 +106,7 @@ void CustomProxy::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { QGraphicsProxyWidget::hoverLeaveEvent(event); if (!popupShown - && (timeLine->direction() != QTimeLine::Backward || timeLine->currentValue() != 0)) { + && (timeLine->direction() != QTimeLine::Backward || qFuzzyIsNull(timeLine->currentValue()))) { zoomOut(); } } diff --git a/examples/widgets/graphicsview/embeddeddialogs/customproxy.h b/examples/widgets/graphicsview/embeddeddialogs/customproxy.h index 36209b7073..d7df2b7b4b 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/customproxy.h +++ b/examples/widgets/graphicsview/embeddeddialogs/customproxy.h @@ -59,7 +59,7 @@ class CustomProxy : public QGraphicsProxyWidget Q_OBJECT public: - explicit CustomProxy(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); + explicit CustomProxy(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = nullptr); QRectF boundingRect() const override; void paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option, @@ -79,8 +79,8 @@ private slots: private: QTimeLine *timeLine; - bool popupShown; - QGraphicsItem *currentPopup; + QGraphicsItem *currentPopup = nullptr; + bool popupShown = false; }; #endif // CUSTOMPROXY_H diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp index 0c831360cf..9fa24fcd17 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp +++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp @@ -73,7 +73,7 @@ EmbeddedDialog::EmbeddedDialog(QWidget *parent) this, &EmbeddedDialog::spacingChanged); connect(ui->fontComboBox, &QFontComboBox::currentFontChanged, this, &EmbeddedDialog::fontChanged); - connect(ui->style, QOverload<const QString &>::of(&QComboBox::activated), + connect(ui->style, &QComboBox::textActivated, this, &EmbeddedDialog::styleChanged); } diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h index 29daaa58c1..c2d87a5660 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h +++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h @@ -64,7 +64,7 @@ class EmbeddedDialog : public QDialog Q_OBJECT public: - EmbeddedDialog(QWidget *parent = 0); + EmbeddedDialog(QWidget *parent = nullptr); ~EmbeddedDialog(); private slots: |