From: Uwe Hermann <redacted>
Date: Wed, 10 Feb 2016 20:55:49 +0000 (+0100)
Subject: Fix inconsistent declaration parameter names.
X-Git-Tag: pulseview-0.4.0~337
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=520362f8c4082820193f09e43b27a8c7df2ef011

Fix inconsistent declaration parameter names.

This patch was generated using clang-tidy:

  clang-tidy -checks="-*,readability-inconsistent-declaration-parameter-name" -fix

(with some manual fixups of false-positives)
---

diff --git a/pv/data/analogsegment.hpp b/pv/data/analogsegment.hpp
index 1a91b8b7..46c6b675 100644
--- a/pv/data/analogsegment.hpp
+++ b/pv/data/analogsegment.hpp
@@ -80,7 +80,7 @@ public:
 		uint64_t start, uint64_t end, float min_length) const;
 
 private:
-	void reallocate_envelope(Envelope &l);
+	void reallocate_envelope(Envelope &e);
 
 	void append_payload_to_envelope_levels();
 
diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp
index 121286f1..2d9fcc63 100644
--- a/pv/data/decode/decoder.hpp
+++ b/pv/data/decode/decoder.hpp
@@ -47,7 +47,7 @@ namespace decode {
 class Decoder
 {
 public:
-	Decoder(const srd_decoder *const decoder);
+	Decoder(const srd_decoder *const dec);
 
 	virtual ~Decoder();
 
diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
index e2bf1bd9..7be7308b 100644
--- a/pv/data/decoderstack.hpp
+++ b/pv/data/decoderstack.hpp
@@ -79,8 +79,7 @@ private:
 	static const unsigned int DecodeNotifyPeriod;
 
 public:
-	DecoderStack(pv::Session &session_,
-		const srd_decoder *const decoder);
+	DecoderStack(pv::Session &session, const srd_decoder *const dec);
 
 	virtual ~DecoderStack();
 
diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index 6ba86469..62721ee1 100644
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -58,7 +58,7 @@ class Channels : public pv::widgets::Popup
 	Q_OBJECT
 
 public:
-	Channels(Session &session_, QWidget *parent);
+	Channels(Session &session, QWidget *parent);
 
 private:
 	void set_all_channels(bool set);
diff --git a/pv/util.hpp b/pv/util.hpp
index 71177ccf..fa674721 100644
--- a/pv/util.hpp
+++ b/pv/util.hpp
@@ -76,7 +76,7 @@ typedef boost::multiprecision::number<
  * @return The formatted value.
  */
 QString format_time_si(
-	const Timestamp& t,
+	const Timestamp& v,
 	SIPrefix prefix = SIPrefix::unspecified,
 	unsigned precision = 0,
 	QString unit = "s",
diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index eb011e74..b5da2dc2 100644
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -131,10 +131,10 @@ private:
 		size_t base_colour, int row_title_width);
 
 	void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
-		int text_height, const ViewItemPaintParams &pp, int y,
+		int h, const ViewItemPaintParams &pp, int y,
 		size_t base_colour, int row_title_width) const;
 
-	void draw_annotation_block(std::vector<pv::data::decode::Annotation> a,
+	void draw_annotation_block(std::vector<pv::data::decode::Annotation> annotations,
 		QPainter &p, int h, int y, size_t base_colour) const;
 
 	void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index 8c3525e6..d34b65e7 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -118,7 +118,7 @@ private:
 
 	const std::vector<int32_t> get_trigger_types() const;
 	QAction* action_from_trigger_type(
-		const sigrok::TriggerMatchType *match);
+		const sigrok::TriggerMatchType *type);
 	const sigrok::TriggerMatchType* trigger_type_from_action(
 		QAction *action);
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
diff --git a/pv/view/viewport.hpp b/pv/view/viewport.hpp
index 704e7311..cde9f3f5 100644
--- a/pv/view/viewport.hpp
+++ b/pv/view/viewport.hpp
@@ -87,13 +87,13 @@ private:
 	 * Handles touch begin update and end events.
 	 * @param e the event that triggered this handler.
 	 */
-	bool touch_event(QTouchEvent *e);
+	bool touch_event(QTouchEvent *event);
 
 private:
 	void paintEvent(QPaintEvent *event);
 
 	void mouseDoubleClickEvent(QMouseEvent * event);
-	void wheelEvent(QWheelEvent *event);
+	void wheelEvent(QWheelEvent *e);
 
 private:
 	boost::optional<pv::util::Timestamp> drag_offset_;
diff --git a/pv/view/viewwidget.hpp b/pv/view/viewwidget.hpp
index e2c04f29..7051c666 100644
--- a/pv/view/viewwidget.hpp
+++ b/pv/view/viewwidget.hpp
@@ -128,7 +128,7 @@ protected:
 
 	void mousePressEvent(QMouseEvent * event);
 	void mouseReleaseEvent(QMouseEvent *event);
-	void mouseMoveEvent(QMouseEvent *event);
+	void mouseMoveEvent(QMouseEvent *e);
 
 	void leaveEvent(QEvent *event);
 
diff --git a/pv/widgets/colourpopup.hpp b/pv/widgets/colourpopup.hpp
index 2abf1b78..bf655368 100644
--- a/pv/widgets/colourpopup.hpp
+++ b/pv/widgets/colourpopup.hpp
@@ -34,7 +34,7 @@ class ColourPopup : public Popup
 	Q_OBJECT
 
 public:
-	ColourPopup(int rows, int cols, QWidget *partent);
+	ColourPopup(int rows, int cols, QWidget *parent);
 
 	WellArray& well_array();