X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fglobalsettings.hpp;h=b5cd24fd5ad809a3fcb769fa503523229864726b;hb=cd0b243a41af5c63f200a647bf435a50f03ad5d6;hp=093ac59b59ca584ba028d3313cfd6753a3065f8a;hpb=7671200bd71de8cdd922b41b025ea18de6422345;p=pulseview.git

diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp
index 093ac59..b5cd24f 100644
--- a/pv/globalsettings.hpp
+++ b/pv/globalsettings.hpp
@@ -20,16 +20,15 @@
 #ifndef PULSEVIEW_GLOBALSETTINGS_HPP
 #define PULSEVIEW_GLOBALSETTINGS_HPP
 
-#include <functional>
 #include <map>
 
 #include <glib.h>
+#include <glibmm/variant.h>
 
 #include <QSettings>
 #include <QString>
 #include <QVariant>
 
-using std::function;
 using std::map;
 using std::vector;
 
@@ -50,14 +49,18 @@ public:
 	static const QString Key_View_ZoomToFitDuringAcq;
 	static const QString Key_View_ZoomToFitAfterAcq;
 	static const QString Key_View_TriggerIsZeroTime;
-	static const QString Key_View_ColouredBG;
+	static const QString Key_View_ColoredBG;
 	static const QString Key_View_StickyScrolling;
 	static const QString Key_View_ShowSamplingPoints;
 	static const QString Key_View_ShowAnalogMinorGrid;
 	static const QString Key_View_ConversionThresholdDispMode;
 	static const QString Key_View_DefaultDivHeight;
 	static const QString Key_View_DefaultLogicHeight;
+	static const QString Key_View_ShowHoverMarker;
 	static const QString Key_Dec_InitialStateConfigurable;
+	static const QString Key_Dec_ExportFormat;
+	static const QString Key_Log_BufferSize;
+	static const QString Key_Log_NotifyOfStacktrace;
 
 	enum ConvThrDispMode {
 		ConvThrDispMode_None = 0,
@@ -97,6 +100,10 @@ public:
 
 	static GVariant* restore_gvariant(QSettings &settings);
 
+	static void store_variantbase(QSettings &settings, Glib::VariantBase v);
+
+	static Glib::VariantBase restore_variantbase(QSettings &settings);
+
 private:
 	static vector<GlobalSettingsInterface*> callbacks_;