DecodeSignal: Re-set decoder metadata after stack termination

[pulseview.git] / pv / globalsettings.hpp

diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp
index 093ac59b59ca584ba028d3313cfd6753a3065f8a..b7f7af06de2d8ec5efbb7e15205187ff9090928c 100644 (file)
--- a/pv/globalsettings.hpp
+++ b/pv/globalsettings.hpp
@@ -20,7 +20,6 @@
 #ifndef PULSEVIEW_GLOBALSETTINGS_HPP
 #define PULSEVIEW_GLOBALSETTINGS_HPP
 
-#include <functional>
 #include <map>
 
 #include <glib.h>
@@ -29,7 +28,6 @@
 #include <QString>
 #include <QVariant>
 
-using std::function;
 using std::map;
 using std::vector;
 
@@ -50,7 +48,7 @@ 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;
@@ -58,6 +56,8 @@ public:
        static const QString Key_View_DefaultDivHeight;
        static const QString Key_View_DefaultLogicHeight;
        static const QString Key_Dec_InitialStateConfigurable;
+       static const QString Key_Log_BufferSize;
+       static const QString Key_Log_NotifyOfStacktrace;
 
        enum ConvThrDispMode {
                ConvThrDispMode_None = 0,