Standardize on 'event' as name for all Qt events.

[pulseview.git] / pv / popups / channels.hpp

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index a0b0693f608d59ed3577d0d673bb9ae8d0507110..5ed5d4768ff18ec4fb14a86be53ed3fe10f8d422 100644 (file)
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_POPUPS_CHANNELS_H
-#define PULSEVIEW_PV_POPUPS_CHANNELS_H
+#ifndef PULSEVIEW_PV_POPUPS_CHANNELS_HPP
+#define PULSEVIEW_PV_POPUPS_CHANNELS_HPP
 
 #include <map>
 #include <memory>
@@ -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);
@@ -70,7 +70,7 @@ private:
                const std::vector< std::shared_ptr<pv::view::Signal> > sigs);
 
 private:
-       void showEvent(QShowEvent *e);
+       void showEvent(QShowEvent *event);
 
 private Q_SLOTS:
        void on_channel_checked(QWidget *widget);
@@ -100,4 +100,4 @@ private:
 } // popups
 } // pv
 
-#endif // PULSEVIEW_PV_POPUPS_CHANNELS_H
+#endif // PULSEVIEW_PV_POPUPS_CHANNELS_HPP