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 e472fdffae05dece304a2c8330a2dac7d49fd164..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>
@@ -41,12 +41,10 @@ namespace sigrok {
 
 namespace pv {
 
-class SigSession;
+class Session;
 
-namespace prop {
 namespace binding {
-class DeviceOptions;
-}
+class Device;
 }
 
 namespace view {
@@ -60,7 +58,7 @@ class Channels : public pv::widgets::Popup
        Q_OBJECT
 
 public:
-       Channels(SigSession &session_, QWidget *parent);
+       Channels(Session &session, QWidget *parent);
 
 private:
        void set_all_channels(bool set);
@@ -72,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);
@@ -81,13 +79,13 @@ private Q_SLOTS:
        void disable_all_channels();
 
 private:
-       pv::SigSession &session_;
+       pv::Session &session_;
 
        QFormLayout layout_;
 
        bool updating_channels_;
 
-       std::vector< std::shared_ptr<pv::prop::binding::DeviceOptions> >
+       std::vector< std::shared_ptr<pv::binding::Device> >
                 group_bindings_;
        std::map< QCheckBox*, std::shared_ptr<pv::view::Signal> >
                check_box_signal_map_;
@@ -102,4 +100,4 @@ private:
 } // popups
 } // pv
 
-#endif // PULSEVIEW_PV_POPUPS_CHANNELS_H
+#endif // PULSEVIEW_PV_POPUPS_CHANNELS_HPP