X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.hpp;h=810cab27919f3cca59ed450710ec9701d1bb8e17;hp=0242dc9da0ec73f184902b9570c40af6716aaf7c;hb=b5940cf0ef30b3519389da8c8768aee4d4424415;hpb=efdec55aec1a137460fa362a381ed1904182bfed

diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
index 0242dc9d..810cab27 100644
--- a/pv/toolbars/mainbar.hpp
+++ b/pv/toolbars/mainbar.hpp
@@ -20,8 +20,7 @@
 #ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
 #define PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <list>
 #include <memory>
 
@@ -39,13 +38,15 @@
 #include <pv/widgets/popuptoolbutton.hpp>
 #include <pv/widgets/sweeptimingwidget.hpp>
 
+using std::shared_ptr;
+
 namespace sigrok {
 class Device;
 class InputFormat;
 class OutputFormat;
 }
 
-Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Device>)
+Q_DECLARE_METATYPE(shared_ptr<sigrok::Device>)
 
 class QAction;
 
@@ -55,7 +56,7 @@ class MainWindow;
 class Session;
 
 namespace views {
-namespace TraceView {
+namespace trace {
 class View;
 }
 }
@@ -85,7 +86,7 @@ private:
 
 public:
 	MainBar(Session &session, QWidget *parent,
-		pv::views::TraceView::View *view);
+		pv::views::trace::View *view);
 
 	void update_device_list();
 
@@ -126,9 +127,9 @@ private Q_SLOTS:
 
 	void add_decoder(srd_decoder *decoder);
 
-	void export_file(std::shared_ptr<sigrok::OutputFormat> format,
+	void export_file(shared_ptr<sigrok::OutputFormat> format,
 		bool selection_only = false);
-	void import_file(std::shared_ptr<sigrok::InputFormat> format);
+	void import_file(shared_ptr<sigrok::InputFormat> format);
 
 	void on_device_selected();
 	void on_device_changed();