projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify Qt5 setup, require cmake >= 2.8.12.
[pulseview.git]
/
pv
/
globalsettings.cpp
diff --git
a/pv/globalsettings.cpp
b/pv/globalsettings.cpp
index d24822413038c5a63be439c1d1038b53fd49d1e4..7bd77f69b2ae2ec06ea5157449487efea5ec4ee3 100644
(file)
--- a/
pv/globalsettings.cpp
+++ b/
pv/globalsettings.cpp
@@
-19,14
+19,20
@@
#include "globalsettings.hpp"
#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";
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";
-
std::multimap< QString, std::
function<void(QVariant)> > GlobalSettings::callbacks_;
+
multimap< QString,
function<void(QVariant)> > GlobalSettings::callbacks_;
bool GlobalSettings::tracking_ = false;
bool GlobalSettings::tracking_ = false;
-
std::
map<QString, QVariant> GlobalSettings::tracked_changes_;
+map<QString, QVariant> GlobalSettings::tracked_changes_;
GlobalSettings::GlobalSettings() :
QSettings()
GlobalSettings::GlobalSettings() :
QSettings()
@@
-35,7
+41,7
@@
GlobalSettings::GlobalSettings() :
}
void GlobalSettings::register_change_handler(const QString key,
}
void GlobalSettings::register_change_handler(const QString key,
-
std::
function<void(QVariant)> cb)
+ function<void(QVariant)> cb)
{
callbacks_.emplace(key, cb);
}
{
callbacks_.emplace(key, cb);
}