Replace obsolete/deprecated Qt methods

[pulseview.git] / pv / subwindows / decoder_selector / subwindow.cpp

diff --git a/pv/subwindows/decoder_selector/subwindow.cpp b/pv/subwindows/decoder_selector/subwindow.cpp
index 20603ed2b958a7eed50a3d1d530cc3da67b1b8a8..2c65dcf2e4f3f928ac38216a4303fd7fe543b8be 100644 (file)
--- a/pv/subwindows/decoder_selector/subwindow.cpp
+++ b/pv/subwindows/decoder_selector/subwindow.cpp
@@ -33,6 +33,7 @@
 #include "pv/subwindows/decoder_selector/subwindow.hpp"
 
 #include <libsigrokdecode/libsigrokdecode.h>
+#include "subwindow.hpp"  // Required only for lupdate since above include isn't recognized
 
 #define DECODERS_HAVE_TAGS \
        ((SRD_PACKAGE_VERSION_MAJOR > 0) || \
@@ -46,7 +47,7 @@ namespace decoder_selector {
 
 const char *initial_notice =
        QT_TRANSLATE_NOOP("pv::subwindows::decoder_selector::SubWindow",
-               "Select a decoder to see its description here.");  // clazy:exclude=non-pod-global-static
+                       "Select a decoder to see its description here.");  // clazy:exclude=non-pod-global-static
 
 const int min_width_margin = 75;
 
@@ -184,7 +185,7 @@ QToolBar* SubWindow::create_toolbar(QWidget *parent) const
 int SubWindow::minimum_width() const
 {
        QFontMetrics m(info_label_body_->font());
-       const int label_width = m.width(QString(tr(initial_notice)));
+       const int label_width = util::text_width(m, tr(initial_notice));
 
        return label_width + min_width_margin;
 }