X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Ftimestampspinbox.cpp;h=b99a640a843055fa2d2271bcae9c67d6607f63a9;hp=fea8175e8e00b74b21f6690cf9d726e3a9cd418c;hb=HEAD;hpb=ee7fd68c0851423c9a5c6ce244ba3fb4e28bbfc3

diff --git a/pv/widgets/timestampspinbox.cpp b/pv/widgets/timestampspinbox.cpp
index fea8175e..b99a640a 100644
--- a/pv/widgets/timestampspinbox.cpp
+++ b/pv/widgets/timestampspinbox.cpp
@@ -20,7 +20,11 @@
 #include "timestampspinbox.hpp"
 
 #include <QLineEdit>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QRegularExpression>
+#else
 #include <QRegExp>
+#endif
 
 namespace pv {
 namespace widgets {
@@ -76,7 +80,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);
 }
@@ -93,10 +97,25 @@ void TimestampSpinBox::setValue(const pv::util::Timestamp& val)
 
 void TimestampSpinBox::on_editingFinished()
 {
-	QRegExp re(R"(\s*([-+]?)\s*([0-9]+\.?[0-9]*).*)");
+	static const auto re_pattern = R"(\s*([-+]?)\s*([0-9]+\.?[0-9]*).*)";
+
+	bool has_match;
+	QStringList captures;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	QRegularExpression re(re_pattern);
+	has_match = re.match(text()).hasMatch();
+	if (has_match) {
+		captures = re.match(text()).capturedTexts();
+	}
+#else
+	QRegExp re(re_pattern);
+	has_match = re.exactMatch(text());
+	if (has_match) {
+		captures = re.capturedTexts();
+	}
+#endif
 
-	if (re.exactMatch(text())) {
-		QStringList captures = re.capturedTexts();
+	if (has_match) {
 		captures.removeFirst(); // remove entire match
 		QString str = captures.join("");
 		setValue(pv::util::Timestamp(str.toStdString()));