From c2039861112498b5f830b0509b2302fb2a417646 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 23 Oct 2016 19:38:34 +0300 Subject: [PATCH 1/3] Fix support Qt 5.0. --HG-- branch : develop --- src/libs/vtools/tools/vtooldetail.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/libs/vtools/tools/vtooldetail.cpp b/src/libs/vtools/tools/vtooldetail.cpp index 7694f92cf..495591597 100644 --- a/src/libs/vtools/tools/vtooldetail.cpp +++ b/src/libs/vtools/tools/vtooldetail.cpp @@ -420,9 +420,16 @@ void VToolDetail::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio { if (scene()->views().count() > 0) { - QPoint pt0 = scene()->views().at(0)->mapFromScene(0, 0); - QPoint pt = scene()->views().at(0)->mapFromScene(0, 100); - qreal dScale = qSqrt(QPoint::dotProduct(pt - pt0, pt - pt0)); + const QPoint pt0 = scene()->views().at(0)->mapFromScene(0, 0); + const QPoint pt = scene()->views().at(0)->mapFromScene(0, 100); + + const QPoint p = pt - pt0; + +#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) + const qreal dScale = qSqrt(QPoint::dotProduct(p, p)); +#else + const qreal dScale = qSqrt(p.xp * p.xp + p.yp * p.yp); +#endif //QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) grainLine->SetScale(100/dScale); //qDebug() << "SCALE" << dScale << 10/dScale; } From 7d935add5b4720a6129e3b8ed5e3200342bd801d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 23 Oct 2016 19:45:45 +0300 Subject: [PATCH 2/3] Fix building. Error about private members. --HG-- branch : develop --- src/libs/vtools/tools/vtooldetail.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/vtools/tools/vtooldetail.cpp b/src/libs/vtools/tools/vtooldetail.cpp index 495591597..fba812af2 100644 --- a/src/libs/vtools/tools/vtooldetail.cpp +++ b/src/libs/vtools/tools/vtooldetail.cpp @@ -428,7 +428,7 @@ void VToolDetail::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio #if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) const qreal dScale = qSqrt(QPoint::dotProduct(p, p)); #else - const qreal dScale = qSqrt(p.xp * p.xp + p.yp * p.yp); + const qreal dScale = qSqrt(p.x() * p.x() + p.y() * p.y()); #endif //QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) grainLine->SetScale(100/dScale); //qDebug() << "SCALE" << dScale << 10/dScale; From 0a7097f259cc06e928c4c5d89f1c887d41cbe2be Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 24 Oct 2016 12:57:27 +0300 Subject: [PATCH 3/3] Fix MSVC warning. --HG-- branch : develop --- src/libs/vtools/dialogs/tools/dialogdetail.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.cpp b/src/libs/vtools/dialogs/tools/dialogdetail.cpp index 1049cc744..189c4ea7d 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.cpp +++ b/src/libs/vtools/dialogs/tools/dialogdetail.cpp @@ -1002,7 +1002,7 @@ void DialogDetail::EditFormula() DialogEditWrongFormula dlg(data, NULL_ID, this); dlg.SetFormula(pleFormula->toPlainText()); dlg.setCheckZero(bCheckZero); - if (dlg.exec() == true) + if (dlg.exec() == QDialog::Accepted) { QString qsFormula = dlg.GetFormula(); qsFormula.replace("\n", " ");