Session: Fix issue #67 by improving error handling

[pulseview.git] / pv / globalsettings.cpp

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index b59f6721acb313b3ee6a7ed281592f316fa265d1..ecca21d5216ed534ef433f0b95740cb14cd34f0b 100644 (file)
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -67,6 +67,7 @@ const QString GlobalSettings::Key_View_ConversionThresholdDispMode = "View_Conve
 const QString GlobalSettings::Key_View_DefaultDivHeight = "View_DefaultDivHeight";
 const QString GlobalSettings::Key_View_DefaultLogicHeight = "View_DefaultLogicHeight";
 const QString GlobalSettings::Key_View_ShowHoverMarker = "View_ShowHoverMarker";
+const QString GlobalSettings::Key_View_KeepRulerItemSelected = "View_KeepRulerItemSelected";
 const QString GlobalSettings::Key_View_SnapDistance = "View_SnapDistance";
 const QString GlobalSettings::Key_View_CursorFillColor = "View_CursorFillColor";
 const QString GlobalSettings::Key_View_CursorShowFrequency = "View_CursorShowFrequency";
@@ -152,6 +153,9 @@ void GlobalSettings::set_defaults_where_needed()
        if (!contains(Key_View_ShowHoverMarker))
                setValue(Key_View_ShowHoverMarker, true);
 
+       if (!contains(Key_View_KeepRulerItemSelected))
+               setValue(Key_View_KeepRulerItemSelected, false);
+
        if (!contains(Key_View_SnapDistance))
                setValue(Key_View_SnapDistance, 15);
 
@@ -330,7 +334,11 @@ void GlobalSettings::store_gvariant(QSettings &settings, GVariant *v)
                g_variant_get_size(v));
 
        settings.setValue("value", var_data);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+       settings.setValue("type", (const char *)var_type_str);
+#else
        settings.setValue("type", var_type_str);
+#endif
 
        g_free(var_type_str);
 }
@@ -343,7 +351,7 @@ GVariant* GlobalSettings::restore_gvariant(QSettings &settings)
        QByteArray data = settings.value("value").toByteArray();
 
 #if GLIB_CHECK_VERSION(2, 67, 3)  // See https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538
-       gpointer var_data = g_memdup2((gconstpointer)data.constData(), (guint)data.size());
+       gpointer var_data = g_memdup2((gconstpointer)data.constData(), (gsize)data.size());
 #else
        gpointer var_data = g_memdup((gconstpointer)data.constData(), (guint)data.size());
 #endif
@@ -372,7 +380,7 @@ Glib::VariantBase GlobalSettings::restore_variantbase(QSettings &settings)
        QByteArray data = settings.value("value").toByteArray();
 
 #if GLIB_CHECK_VERSION(2, 67, 3)  // See https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538
-       gpointer var_data = g_memdup2((gconstpointer)data.constData(), (guint)data.size());
+       gpointer var_data = g_memdup2((gconstpointer)data.constData(), (gsize)data.size());
 #else
        gpointer var_data = g_memdup((gconstpointer)data.constData(), (guint)data.size());
 #endif