projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use alphabetical order for #includes.
[pulseview.git]
/
pv
/
view
/
view.hpp
diff --git
a/pv/view/view.hpp
b/pv/view/view.hpp
index e083fa13fdc1899d31da1ad6fe5978ebc2bb5483..05d9d60193a00c2b7120f4a8dca1b4719c9d63a4 100644
(file)
--- 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
#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
-#include <stdint.h>
-
+#include <cstdint>
#include <list>
#include <memory>
#include <set>
#include <list>
#include <memory>
#include <set>
@@
-33,8
+32,8
@@
#include <QTimer>
#include <pv/data/signaldata.hpp>
#include <QTimer>
#include <pv/data/signaldata.hpp>
-#include <pv/views/viewbase.hpp>
#include <pv/util.hpp>
#include <pv/util.hpp>
+#include <pv/views/viewbase.hpp>
#include "cursorpair.hpp"
#include "flag.hpp"
#include "cursorpair.hpp"
#include "flag.hpp"
@@
-68,16
+67,18
@@
class Trace;
class Viewport;
class TriggerMarker;
class Viewport;
class TriggerMarker;
-class CustomAbstractScrollArea : public QAbstractScrollArea {
+class CustomAbstractScrollArea : public QAbstractScrollArea
+{
Q_OBJECT
public:
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);
};
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:
Q_OBJECT
private:
@@
-96,7
+97,7
@@
private:
static const int ScaleUnits[3];
public:
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;
Session& session();
const Session& session() const;