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 1a91b8b7a411eaeca048f1a3065e1d4045c8e923..46c6b6754655d4067e5b5e8c6fd5e1124cfd24ae 100644 (file)
--- 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:
                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();
 
 
        void append_payload_to_envelope_levels();
 

diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp
index 121286f17aeed8e748d90045d019f3ae63b8b0fa..2d9fcc639591a5226101f40eb8ded32911447dbf 100644 (file)
--- a/pv/data/decode/decoder.hpp
+++ b/pv/data/decode/decoder.hpp
@@ -47,7 +47,7 @@ namespace decode {
 class Decoder
 {
 public:
 class Decoder
 {
 public:

-       Decoder(const srd_decoder *const decoder);
+       Decoder(const srd_decoder *const dec);

 
        virtual ~Decoder();
 
 
        virtual ~Decoder();
 

diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
index e2bf1bd9283b1ed8c39f580f9de039915ffabd2e..7be7308bdda98ec8bd68edcb83ec02c44f573012 100644 (file)
--- a/pv/data/decoderstack.hpp
+++ b/pv/data/decoderstack.hpp
@@ -79,8 +79,7 @@ private:
        static const unsigned int DecodeNotifyPeriod;
 
 public:
        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();
 
 
        virtual ~DecoderStack();
 

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index 6ba86469f04ff64b44e22f8aa427736f7101d6e8..62721ee177a36080d87e842668405fe1424a8c81 100644 (file)
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -58,7 +58,7 @@ class Channels : public pv::widgets::Popup
        Q_OBJECT
 
 public:
        Q_OBJECT
 
 public:

-       Channels(Session &session_, QWidget *parent);
+       Channels(Session &session, QWidget *parent);

 
 private:
        void set_all_channels(bool set);
 
 private:
        void set_all_channels(bool set);

diff --git a/pv/util.hpp b/pv/util.hpp
index 71177ccf1e9c44504435fd15e3421ef242031446..fa67472181990a3dfdf251094cbe057f9ab39b88 100644 (file)
--- a/pv/util.hpp
+++ b/pv/util.hpp
@@ -76,7 +76,7 @@ typedef boost::multiprecision::number<
  * @return The formatted value.
  */
 QString format_time_si(
  * @return The formatted value.
  */
 QString format_time_si(

-       const Timestamp& t,
+       const Timestamp& v,

        SIPrefix prefix = SIPrefix::unspecified,
        unsigned precision = 0,
        QString unit = "s",
        SIPrefix prefix = SIPrefix::unspecified,
        unsigned precision = 0,
        QString unit = "s",

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index eb011e74367df36951046beb5c582a8dd06ef8c1..b5da2dc2400082f8842167fffe398636e4e3331e 100644 (file)
--- 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,
                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;
 
                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,
                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 8c3525e6c47427bf94587fbfd82203ec1c2964e0..d34b65e755a399540ff96ee965b1f73d93a930c5 100644 (file)
--- 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 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);
        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 704e73115514b2183cb4ce058b86bbc9a9000a9d..cde9f3f57673dc9df71aded63ccfe8617c98245e 100644 (file)
--- 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.
         */
         * 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);
 
 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_;
 
 private:
        boost::optional<pv::util::Timestamp> drag_offset_;

diff --git a/pv/view/viewwidget.hpp b/pv/view/viewwidget.hpp
index e2c04f297a0c9b81a084ec1886a9d86cd35dd66d..7051c66608792bb1304cdeb03193dda3380dca76 100644 (file)
--- a/pv/view/viewwidget.hpp
+++ b/pv/view/viewwidget.hpp
@@ -128,7 +128,7 @@ protected:
 
        void mousePressEvent(QMouseEvent * event);
        void mouseReleaseEvent(QMouseEvent *event);
 
        void mousePressEvent(QMouseEvent * event);
        void mouseReleaseEvent(QMouseEvent *event);

-       void mouseMoveEvent(QMouseEvent *event);
+       void mouseMoveEvent(QMouseEvent *e);

 
        void leaveEvent(QEvent *event);
 
 
        void leaveEvent(QEvent *event);
 

diff --git a/pv/widgets/colourpopup.hpp b/pv/widgets/colourpopup.hpp
index 2abf1b78c94aa59c6e4fcd8fe4941d87e4b4fbe0..bf6553680ae421f33aaf6389b8984dc76389e858 100644 (file)
--- a/pv/widgets/colourpopup.hpp
+++ b/pv/widgets/colourpopup.hpp
@@ -34,7 +34,7 @@ class ColourPopup : public Popup
        Q_OBJECT
 
 public:
        Q_OBJECT
 
 public:

-       ColourPopup(int rows, int cols, QWidget *partent);
+       ColourPopup(int rows, int cols, QWidget *parent);

 
        WellArray& well_array();
 
 
        WellArray& well_array();