X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Flogicsignal.cpp;h=28d71d3cbc5070b853842bec03b81d70c23dafa2;hp=7543f1396e233003f58ff2c4a4f6131c3b3b6a1b;hb=640d091b45b196cc586fbc6a7bec71c5c7d75544;hpb=51e77110d4316fd0106f8306f5e1f0523c5bf7d7

diff --git a/pv/logicsignal.cpp b/pv/logicsignal.cpp
index 7543f139..28d71d3c 100644
--- a/pv/logicsignal.cpp
+++ b/pv/logicsignal.cpp
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <math.h>
+#include <extdef.h>
 
-#include "extdef.h"
+#include <math.h>
 
 #include "logicdata.h"
 #include "logicdatasnapshot.h"
@@ -54,8 +54,8 @@ const QColor LogicSignal::LogicSignalColours[10] = {
 LogicSignal::LogicSignal(QString name, shared_ptr<LogicData> data,
 	int probe_index) :
 	Signal(name),
-	_data(data),
-	_probe_index(probe_index)
+	_probe_index(probe_index),
+	_data(data)
 {
 	assert(_probe_index >= 0);
 }
@@ -125,7 +125,7 @@ void LogicSignal::paint(QPainter &p, const QRect &rect, double scale,
 	delete[] cap_lines;
 }
 
-int LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
+void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
 	vector< pair<int64_t, bool> > &edges, bool level,
 	double samples_per_pixel, double pixels_offset, int x_offset,
 	int y_offset)