projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply some clang-tidy fixes.
[pulseview.git]
/
pv
/
globalsettings.hpp
diff --git
a/pv/globalsettings.hpp
b/pv/globalsettings.hpp
index ba0e28032b18ea995feab78928ede7f334995ad6..05ff126dd092e9070264a8ee55afeb24bc8c2970 100644
(file)
--- a/
pv/globalsettings.hpp
+++ b/
pv/globalsettings.hpp
@@
-23,10
+23,16
@@
#include <functional>
#include <map>
#include <functional>
#include <map>
+#include <glib.h>
+
#include <QSettings>
#include <QString>
#include <QVariant>
#include <QSettings>
#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
@@
-34,15
+40,21
@@
class GlobalSettings : public QSettings
Q_OBJECT
public:
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_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();
public:
GlobalSettings();
+ void set_defaults_where_needed();
+
static void register_change_handler(const QString key,
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,11
+76,15
@@
public:
*/
void undo_tracked_changes();
*/
void undo_tracked_changes();
+ static void store_gvariant(QSettings &settings, GVariant *v);
+
+ static GVariant* restore_gvariant(QSettings &settings);
+
private:
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