From 01de3217e14b52e44356185729f804460147c85c Mon Sep 17 00:00:00 2001 From: Valentin Ochs Date: Sat, 20 Jun 2020 16:01:27 +0200 Subject: [PATCH] Replace obsolete\/deprecated Qt methods [Thomas: Backport from upstream commit ae726b70a7ada9a4be5808e00f0c951318479684, one conflict manually resolved in pv\/util.cpp.] Signed-off-by: Thomas Petazzoni [Fabrice: restore original patch in pv\/util.cpp for 0.4.2] Signed-off-by: Fabrice Fontaine [Dario: make the patch to be applied with fuzz factor 0] Signed-off-by: Dario Binacchi --- pv\/util.cpp | 21 +++++++++++++++++++-- pv\/util.hpp | 10 ++++++++++ pv\/views\/trace\/decodetrace.cpp | 3 ++- pv\/views\/trace\/ruler.cpp | 2 +- pv\/widgets\/timestampspinbox.cpp | 2 +- 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a\/pv\/util.cpp b\/pv\/util.cpp index 9a9a5065a2e1..b0c29f304287 100644 --- a\/pv\/util.cpp +++ b\/pv\/util.cpp @@ -137,7 +137,7 @@ QString format_time_si(const Timestamp& v, SIPrefix prefix, QString s; QTextStream ts(&s); if (sign && !v.is_zero()) - ts << forcesign; + ts.setNumberFlags(ts.numberFlags() | QTextStream::ForceSign); ts << qSetRealNumberPrecision(precision) << (v * multiplier); ts << ' ' << prefix << unit; @@ -175,7 +175,7 @@ QString format_value_si(double v, SIPrefix prefix, unsigned precision, QString s; QTextStream ts(&s); if (sign && (v != 0)) - ts << forcesign; + ts.setNumberFlags(ts.numberFlags() | QTextStream::ForceSign); ts.setRealNumberNotation(QTextStream::FixedNotation); ts.setRealNumberPrecision(precision); ts << (v * multiplier) << ' ' << prefix << unit; @@ -285,5 +285,22 @@ vector split_string(string text, string separator) return result; } +\/** + * Return the width of a string in a given font. + * + * @param[in] metric metrics of the font + * @param[in] string the string whose width should be determined + * + * @return width of the string in pixels + *\/ +std::streamsize text_width(const QFontMetrics &metric, const QString &string) +{ +#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) + return metric.horizontalAdvance(string); +#else + return metric.width(string); +#endif +} + } \/\/ namespace util } \/\/ namespace pv diff --git a\/pv\/util.hpp b\/pv\/util.hpp index e1640c4a374d..a6cdfdcad4d9 100644 --- a\/pv\/util.hpp +++ b\/pv\/util.hpp @@ -30,6 +30,7 @@ #include #include +#include using std::string; using std::vector; @@ -138,6 +139,15 @@ QString format_time_minutes(const Timestamp& t, signed precision = 0, vector split_string(string text, string separator); +\/** + * Return the width of a string in a given font. + * @param[in] metric metrics of the font + * @param[in] string the string whose width should be determined + * + * @return width of the string in pixels + *\/ +std::streamsize text_width(const QFontMetrics &metric, const QString &string); + } \/\/ namespace util } \/\/ namespace pv diff --git a\/pv\/views\/trace\/decodetrace.cpp b\/pv\/views\/trace\/decodetrace.cpp index 1cc89feb67ae..0347b3327b27 100644 --- a\/pv\/views\/trace\/decodetrace.cpp +++ b\/pv\/views\/trace\/decodetrace.cpp @@ -164,7 +164,8 @@ DecodeTrace::DecodeTrace(pv::Session &session, \/\/ Determine shortest string we want to see displayed in full QFontMetrics m(QApplication::font()); - min_useful_label_width_ = m.width("XX"); \/\/ e.g. two hex characters + \/\/ e.g. two hex characters + min_useful_label_width_ = util::text_width(m, "XX"); default_row_height_ = (ViewItemPaintParams::text_height() * 6) \/ 4; annotation_height_ = (ViewItemPaintParams::text_height() * 5) \/ 4; diff --git a\/pv\/views\/trace\/ruler.cpp b\/pv\/views\/trace\/ruler.cpp index 555794fc42c6..83ffed281b5f 100644 --- a\/pv\/views\/trace\/ruler.cpp +++ b\/pv\/views\/trace\/ruler.cpp @@ -283,7 +283,7 @@ void Ruler::paintEvent(QPaintEvent*) const int rightedge = width(); const int x_tick = tick.first; if ((x_tick > leftedge) && (x_tick < rightedge)) { - const int x_left_bound = QFontMetrics(font()).width(tick.second) \/ 2; + const int x_left_bound = util::text_width(QFontMetrics(font()), tick.second) \/ 2; const int x_right_bound = rightedge - x_left_bound; const int x_legend = min(max(x_tick, x_left_bound), x_right_bound); p.drawText(x_legend, ValueMargin, 0, text_height, diff --git a\/pv\/widgets\/timestampspinbox.cpp b\/pv\/widgets\/timestampspinbox.cpp index fea8175e8e00..01424a5b7837 100644 --- a\/pv\/widgets\/timestampspinbox.cpp +++ b\/pv\/widgets\/timestampspinbox.cpp @@ -76,7 +76,7 @@ QSize TimestampSpinBox::minimumSizeHint() const { const QFontMetrics fm(fontMetrics()); const int l = round(value_).str().size() + precision_ + 10; - const int w = fm.width(QString(l, '0')); + const int w = util::text_width(fm, QString(l, '0')); const int h = lineEdit()->minimumSizeHint().height(); return QSize(w, h); } -- 2.43.0

Other Versions#

Patches#