X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=0eff1915d15ed5d151b4d1eb364d40247231c532;hp=d24822413038c5a63be439c1d1038b53fd49d1e4;hb=1cc1c8dec120ed6d98071f939ea435d85ee853bf;hpb=2cca9ebfdc367aa8e4651cf063f0cdea8fccb798 diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp index d2482241..0eff1915 100644 --- a/pv/globalsettings.cpp +++ b/pv/globalsettings.cpp @@ -19,14 +19,22 @@ #include "globalsettings.hpp" +using std::function; +using std::map; +using std::multimap; + namespace pv { const QString GlobalSettings::Key_View_AlwaysZoomToFit = "View_AlwaysZoomToFit"; const QString GlobalSettings::Key_View_ColouredBG = "View_ColouredBG"; +const QString GlobalSettings::Key_View_StickyScrolling = "View_StickyScrolling"; +const QString GlobalSettings::Key_View_ShowSamplingPoints = "View_ShowSamplingPoints"; +const QString GlobalSettings::Key_View_ShowAnalogMinorGrid = "View_ShowAnalogMinorGrid"; +const QString GlobalSettings::Key_Dec_InitialStateConfigurable = "Dec_InitialStateConfigurable"; -std::multimap< QString, std::function > GlobalSettings::callbacks_; +multimap< QString, function > GlobalSettings::callbacks_; bool GlobalSettings::tracking_ = false; -std::map GlobalSettings::tracked_changes_; +map GlobalSettings::tracked_changes_; GlobalSettings::GlobalSettings() : QSettings() @@ -35,7 +43,7 @@ GlobalSettings::GlobalSettings() : } void GlobalSettings::register_change_handler(const QString key, - std::function cb) + function cb) { callbacks_.emplace(key, cb); }