X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=7bd77f69b2ae2ec06ea5157449487efea5ec4ee3;hp=e0b7197b966c4c1f1f1841c0651f4d85823e9cd7;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=00f6bae935837b38b0d03a5928ba8175d460413f

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index e0b7197..7bd77f6 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -19,6 +19,10 @@
 
 #include "globalsettings.hpp"
 
+using std::function;
+using std::map;
+using std::multimap;
+
 namespace pv {
 
 const QString GlobalSettings::Key_View_AlwaysZoomToFit = "View_AlwaysZoomToFit";
@@ -26,9 +30,9 @@ 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;
-std::map<QString, QVariant> GlobalSettings::tracked_changes_;
+map<QString, QVariant> GlobalSettings::tracked_changes_;
 
 GlobalSettings::GlobalSettings() :
 	QSettings()
@@ -37,7 +41,7 @@ GlobalSettings::GlobalSettings() :
 }
 
 void GlobalSettings::register_change_handler(const QString key,
-	std::function<void(QVariant)> cb)
+	function<void(QVariant)> cb)
 {
 	callbacks_.emplace(key, cb);
 }