X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=ee62d11369b373ddd60d5b26820944ed7012f0b2;hb=fdfd5b3e246a4d4a8bcf7dbb25a6179cc86c9569;hp=e083fa13fdc1899d31da1ad6fe5978ebc2bb5483;hpb=6f925ba9d6faf1077b73c5a5808259576081716a;p=pulseview.git diff --git a/pv/view/view.hpp b/pv/view/view.hpp index e083fa1..ee62d11 100644 --- a/pv/view/view.hpp +++ b/pv/view/view.hpp @@ -20,8 +20,7 @@ #ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP #define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP -#include - +#include #include #include #include @@ -68,16 +67,18 @@ class Trace; class Viewport; class TriggerMarker; -class CustomAbstractScrollArea : public QAbstractScrollArea { +class CustomAbstractScrollArea : public QAbstractScrollArea +{ Q_OBJECT public: - CustomAbstractScrollArea(QWidget *parent = 0); + CustomAbstractScrollArea(QWidget *parent = nullptr); void setViewportMargins(int left, int top, int right, int bottom); bool viewportEvent(QEvent *event); }; -class View : public ViewBase, public TraceTreeItemOwner { +class View : public ViewBase, public TraceTreeItemOwner +{ Q_OBJECT private: @@ -96,7 +97,7 @@ private: static const int ScaleUnits[3]; public: - explicit View(Session &session, bool is_main_view=false, QWidget *parent = 0); + explicit View(Session &session, bool is_main_view=false, QWidget *parent = nullptr); Session& session(); const Session& session() const;