Rename "always zoom-to-fit" to "zoom-to-fit during acquisition"

[pulseview.git] / pv / globalsettings.hpp

diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp
index 1b6560f99bfa4d1a451ae3e11b01731f4141224c..eb964fa2c677b802fe077e2da34de722328d6328 100644 (file)
--- a/pv/globalsettings.hpp
+++ b/pv/globalsettings.hpp
@@ -27,6 +27,10 @@
 #include <QString>
 #include <QVariant>
 
+using std::function;
+using std::map;
+using std::multimap;
+
 namespace pv {
 
 class GlobalSettings : public QSettings
@@ -34,16 +38,21 @@ class GlobalSettings : public QSettings
        Q_OBJECT
 
 public:
-       static const QString Key_View_AlwaysZoomToFit;
+       static const QString Key_View_ZoomToFitDuringAcq;
+       static const QString Key_View_ZoomToFitAfterAcq;
        static const QString Key_View_ColouredBG;
        static const QString Key_View_StickyScrolling;
        static const QString Key_View_ShowSamplingPoints;
+       static const QString Key_View_ShowAnalogMinorGrid;
+       static const QString Key_Dec_InitialStateConfigurable;
 
 public:
        GlobalSettings();
 
+       void set_defaults_where_needed();
+
        static void register_change_handler(const QString key,
-               std::function<void(QVariant)> cb);
+               function<void(QVariant)> cb);
 
        void setValue(const QString& key, const QVariant& value);
 
@@ -66,10 +75,10 @@ public:
        void undo_tracked_changes();
 
 private:
-       static std::multimap< QString, std::function<void(QVariant)> > callbacks_;
+       static multimap< QString, function<void(QVariant)> > callbacks_;
 
        static bool tracking_;
-       static std::map<QString, QVariant> tracked_changes_;
+       static map<QString, QVariant> tracked_changes_;
 };
 
 } // namespace pv