X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fstandardbar.hpp;h=09c7907f3da3f4fc5fdb55bfa548267bd0fbce28;hp=ce9bf91b4c7f6dc7fc79e5a9f40a084b6818752c;hb=2601ce965fc455d23f5a964b84ddd74eb93705c4;hpb=dfe1bf82619704af27e4cbf83b75c6b5f367f425

diff --git a/pv/views/trace/standardbar.hpp b/pv/views/trace/standardbar.hpp
index ce9bf91b..09c7907f 100644
--- a/pv/views/trace/standardbar.hpp
+++ b/pv/views/trace/standardbar.hpp
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_PV_VIEWS_TRACE_STANDARDBAR_HPP
 #define PULSEVIEW_PV_VIEWS_TRACE_STANDARDBAR_HPP
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <QAction>
 #include <QToolBar>
@@ -37,7 +36,7 @@ class Session;
 
 namespace views {
 
-namespace TraceView {
+namespace trace {
 class View;
 }
 
@@ -49,9 +48,9 @@ class StandardBar : public QToolBar
 
 public:
 	StandardBar(Session &session, QWidget *parent,
-		TraceView::View *view, bool add_default_widgets=true);
+		trace::View *view, bool add_default_widgets = true);
 
-	Session &session(void) const;
+	Session &session() const;
 
 	QAction* action_view_zoom_in() const;
 	QAction* action_view_zoom_out() const;
@@ -63,7 +62,7 @@ protected:
 	virtual void add_toolbar_widgets();
 
 	Session &session_;
-	TraceView::View *view_;
+	trace::View *view_;
 
 	QAction *const action_view_zoom_in_;
 	QAction *const action_view_zoom_out_;