X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.hpp;h=b7f7af06de2d8ec5efbb7e15205187ff9090928c;hp=ea43491c35b1a2b63d3656cbf375a8940113df5b;hb=5620539c5113781af252576f9b7af5420e875ba7;hpb=d0c0573b3ee694827a747727f862c5f91736ca05 diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp index ea43491..b7f7af0 100644 --- a/pv/globalsettings.hpp +++ b/pv/globalsettings.hpp @@ -28,7 +28,6 @@ #include #include -using std::function; using std::map; using std::vector; @@ -49,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; @@ -57,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,