From 6c52d95201e64080bdef64ea036bea698a04a872 Mon Sep 17 00:00:00 2001 From: plc-user <74435298+plc-user@users.noreply.github.com> Date: Mon, 3 Mar 2025 22:41:44 +0100 Subject: [PATCH] same simplifications as in #376 "use the same code for Qt5 & Qt6" --- sources/qetgraphicsitem/conductor.cpp | 7 ------- sources/qetgraphicsitem/element.cpp | 7 ------- 2 files changed, 14 deletions(-) diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp index 5393efc1d..97312677c 100644 --- a/sources/qetgraphicsitem/conductor.cpp +++ b/sources/qetgraphicsitem/conductor.cpp @@ -520,14 +520,7 @@ void Conductor::paint(QPainter *painter, const QStyleOptionGraphicsItem *options final_conductor_pen.setJoinStyle(Qt::SvgMiterJoin); // better rendering with dot //Use a cosmetique line, below a certain zoom -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove - if (options && options -> levelOfDetail < 1.0) -#else -#if TODO_LIST -#pragma message("@TODO remove code for QT 6 or later") -#endif if (options && options->levelOfDetailFromTransform(painter->worldTransform()) < 1.0) -#endif { final_conductor_pen.setCosmetic(true); } diff --git a/sources/qetgraphicsitem/element.cpp b/sources/qetgraphicsitem/element.cpp index 1e8d010de..e1f842da2 100644 --- a/sources/qetgraphicsitem/element.cpp +++ b/sources/qetgraphicsitem/element.cpp @@ -225,14 +225,7 @@ void Element::paint( QBrush brush; painter->setPen(pen); painter->setBrush(brush); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove - if (options && options -> levelOfDetail < 1.0) -#else -#if TODO_LIST -#pragma message("@TODO remove code for QT 6 or later") -#endif if (options && options->levelOfDetailFromTransform(painter->worldTransform()) < 1.0) -#endif { painter->drawPicture(0, 0, m_low_zoom_picture); } else {