X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.hpp;h=6fe9159d3f854f862b989645fb6b410001a848e8;hp=e472fdffae05dece304a2c8330a2dac7d49fd164;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index e472fdf..6fe9159 100644
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -14,12 +14,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#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 +40,14 @@ namespace sigrok {
 
 namespace pv {
 
-class SigSession;
+class Session;
 
-namespace prop {
 namespace binding {
-class DeviceOptions;
+class Device;
 }
+
+namespace data {
+class SignalBase;
 }
 
 namespace view {
@@ -60,19 +61,19 @@ 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);
 
 	void populate_group(std::shared_ptr<sigrok::ChannelGroup> group,
-		const std::vector< std::shared_ptr<pv::view::Signal> > sigs);
+		const std::vector< std::shared_ptr<pv::data::SignalBase> > sigs);
 
 	QGridLayout* create_channel_group_grid(
-		const std::vector< std::shared_ptr<pv::view::Signal> > sigs);
+		const std::vector< std::shared_ptr<pv::data::SignalBase> > sigs);
 
 private:
-	void showEvent(QShowEvent *e);
+	void showEvent(QShowEvent *event);
 
 private Q_SLOTS:
 	void on_channel_checked(QWidget *widget);
@@ -81,15 +82,15 @@ 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> >
+	std::map< QCheckBox*, std::shared_ptr<pv::data::SignalBase> >
 		check_box_signal_map_;
 
 	QHBoxLayout buttons_bar_;
@@ -102,4 +103,4 @@ private:
 } // popups
 } // pv
 
-#endif // PULSEVIEW_PV_POPUPS_CHANNELS_H
+#endif // PULSEVIEW_PV_POPUPS_CHANNELS_HPP