Modified header guards to match file names
[pulseview.git] / pv / popups / channels.hpp
index 0ebe333f5f4836484ebf547f364e735445e50338..6ba86469f04ff64b44e22f8aa427736f7101d6e8 100644 (file)
@@ -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>
@@ -43,10 +43,8 @@ namespace pv {
 
 class Session;
 
-namespace prop {
 namespace binding {
-class DeviceOptions;
-}
+class Device;
 }
 
 namespace view {
@@ -87,7 +85,7 @@ private:
 
        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