Trace: Removed coloured_bg state

[pulseview.git] / pv / globalsettings.hpp

diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp
index 9581e294ba658518e393f7e5966324e9a92f3433..1c07c308d71a5170e9c227a251fa14238aafde01 100644 (file)
--- a/pv/globalsettings.hpp
+++ b/pv/globalsettings.hpp
@@ -27,6 +27,10 @@
 #include <QString>
 #include <QVariant>
 
 #include <QString>
 #include <QVariant>
 

+using std::function;
+using std::map;
+using std::multimap;
+

 namespace pv {
 
 class GlobalSettings : public QSettings
 namespace pv {
 
 class GlobalSettings : public QSettings


@@ -36,12 +40,15 @@ class GlobalSettings : public QSettings
 public:
        static const QString Key_View_AlwaysZoomToFit;
        static const QString Key_View_ColouredBG;
 public:
        static const QString Key_View_AlwaysZoomToFit;
        static const QString Key_View_ColouredBG;

+       static const QString Key_View_StickyScrolling;
+       static const QString Key_View_ShowSamplingPoints;
+       static const QString Key_View_ShowAnalogMinorGrid;

 
 public:
        GlobalSettings();
 
        static void register_change_handler(const QString key,
 
 public:
        GlobalSettings();
 
        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);
 
 
        void setValue(const QString& key, const QVariant& value);
 


@@ -64,10 +71,10 @@ public:
        void undo_tracked_changes();
 
 private:
        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 bool tracking_;

-       static std::map<QString, QVariant> tracked_changes_;
+       static map<QString, QVariant> tracked_changes_;

 };
 
 } // namespace pv
 };
 
 } // namespace pv