Make use of QStringView

daschuer · Jun 21, 2023 · 0a50a49 · 0a50a49
1 parent 671c532
commit 0a50a49
Showing 1 changed file with 26 additions and 19 deletions.
diff --git a/src/widget/wslidercomposed.cpp b/src/widget/wslidercomposed.cpp
@@ -1,5 +1,6 @@
 #include "widget/wslidercomposed.h"
 
+#include <QStringView>
 #include <QStyleOption>
 #include <QStylePainter>
 #include <QtDebug>
@@ -74,18 +75,21 @@ void WSliderComposed::setup(const QDomNode& node, const SkinContext& context) {
         QString bgMargins;
         if (context.hasNodeSelectString(node, "BarMargins", &margins)) {
             int comma = margins.indexOf(",");
-            bool m1ok;
-            bool m2ok;
+            if (comma > 0 && comma < margins.size()) {
+                bool m1ok;
+                bool m2ok;
+                QStringView marginsView(margins);
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-            double m1 = (margins.left(comma)).toDouble(&m1ok);
-            double m2 = (margins.mid(comma + 1)).toDouble(&m2ok);
+                double m1 = (marginsView.first(comma)).toDouble(&m1ok);
+                double m2 = (marginsView.sliced(comma + 1)).toDouble(&m2ok);
 #else
-            double m1 = (margins.leftRef(comma)).toDouble(&m1ok);
-            double m2 = (margins.midRef(comma + 1)).toDouble(&m2ok);
+                double m1 = (marginsView.left(comma)).toDouble(&m1ok);
+                double m2 = (marginsView.mid(comma + 1)).toDouble(&m2ok);
 #endif
-            if (m1ok && m2ok) {
-                m_dBarStart = m1 * scaleFactor;
-                m_dBarEnd = m2 * scaleFactor;
+                if (m1ok && m2ok) {
+                    m_dBarStart = m1 * scaleFactor;
+                    m_dBarEnd = m2 * scaleFactor;
+                }
             }
         }
 
@@ -104,18 +108,21 @@ void WSliderComposed::setup(const QDomNode& node, const SkinContext& context) {
             }
             if (context.hasNodeSelectString(node, "BarBgMargins", &bgMargins)) {
                 int comma = bgMargins.indexOf(",");
-                bool m1ok;
-                bool m2ok;
+                if (comma > 0 && comma + 1 < margins.size()) {
+                    bool m1ok;
+                    bool m2ok;
+                    QStringView bgMarginsView(bgMargins);
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-                double m1 = (bgMargins.left(comma)).toDouble(&m1ok);
-                double m2 = (bgMargins.mid(comma + 1)).toDouble(&m2ok);
-#else
-                double m1 = (bgMargins.leftRef(comma)).toDouble(&m1ok);
-                double m2 = (bgMargins.midRef(comma + 1)).toDouble(&m2ok);
+                    double m1 = (bgMarginsView.first(comma)).toDouble(&m1ok);
+                    double m2 = (bgMarginsView.sliced(comma + 1)).toDouble(&m2ok);
+#else                
+                    double m1 = (bgMarginsView.left(comma)).toDouble(&m1ok);
+                    double m2 = (bgMarginsView.mid(comma + 1)).toDouble(&m2ok);
 #endif
-                if (m1ok && m2ok) {
-                    m_dBarBgStart = m1 * scaleFactor;
-                    m_dBarBgEnd = m2 * scaleFactor;
+                    if (m1ok && m2ok) {
+                        m_dBarBgStart = m1 * scaleFactor;
+                        m_dBarBgEnd = m2 * scaleFactor;
+                    }
                 }
             } else {
                 m_dBarBgStart = m_dBarStart;