projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AnalogSignal: Implement converted logic trace painting
[pulseview.git]
/
pv
/
globalsettings.hpp
diff --git
a/pv/globalsettings.hpp
b/pv/globalsettings.hpp
index 1b6560f99bfa4d1a451ae3e11b01731f4141224c..45247377391267eada5bb5438ce841870022c3ee 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
@@
-43,7
+47,7
@@
public:
GlobalSettings();
static void register_change_handler(const QString key,
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);
@@
-66,10
+70,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