X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdialogs%2Fstoreprogress.hpp;h=fd3558993ced162e12f0505c2f3ab0abd8ee4796;hb=8845be3c9c7d5aca02fb2efc4038f4735a5242d6;hp=e968ce4197c3e0e04da7d5d9050f9a511784251d;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git

diff --git a/pv/dialogs/storeprogress.hpp b/pv/dialogs/storeprogress.hpp
index e968ce41..fd355899 100644
--- a/pv/dialogs/storeprogress.hpp
+++ b/pv/dialogs/storeprogress.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
-#define PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
+#ifndef PULSEVIEW_PV_DIALOGS_STOREPROGRESS_HPP
+#define PULSEVIEW_PV_DIALOGS_STOREPROGRESS_HPP
 
 #include <memory>
 #include <set>
@@ -27,6 +27,11 @@
 
 #include <pv/storesession.hpp>
 
+using std::map;
+using std::pair;
+using std::shared_ptr;
+using std::string;
+
 namespace pv {
 
 class Session;
@@ -39,11 +44,10 @@ class StoreProgress : public QProgressDialog
 
 public:
 	StoreProgress(const QString &file_name,
-		const std::shared_ptr<sigrok::OutputFormat> output_format,
-		const std::map<std::string, Glib::VariantBase> &options,
-		const std::pair<uint64_t, uint64_t> sample_range,
-		const Session &session,
-		QWidget *parent = 0);
+		const shared_ptr<sigrok::OutputFormat> output_format,
+		const map<string, Glib::VariantBase> &options,
+		const pair<uint64_t, uint64_t> sample_range,
+		const Session &session, QWidget *parent = nullptr);
 
 	virtual ~StoreProgress();
 
@@ -61,7 +65,7 @@ private:
 	pv::StoreSession session_;
 };
 
-} // dialogs
-} // pv
+}  // namespace dialogs
+}  // namespace pv
 
-#endif // PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
+#endif // PULSEVIEW_PV_DIALOGS_STOREPROGRESS_HPP