X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.hpp;h=3701325bc704572758831b8781d800a56cc39065;hp=0ebe333f5f4836484ebf547f364e735445e50338;hb=b8f1cdeba7cf6c2b749ff60102ce4e260fa1309e;hpb=2b81ae4682ade4109ffa442794de36ceb32045eb

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index 0ebe333..3701325 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>
@@ -32,6 +31,10 @@
 
 #include <pv/widgets/popup.hpp>
 
+using std::map;
+using std::shared_ptr;
+using std::vector;
+
 class QCheckBox;
 class QGridLayout;
 
@@ -43,10 +46,12 @@ namespace pv {
 
 class Session;
 
-namespace prop {
 namespace binding {
-class DeviceOptions;
+class Device;
 }
+
+namespace data {
+class SignalBase;
 }
 
 namespace view {
@@ -60,19 +65,19 @@ 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);
 
-	void populate_group(std::shared_ptr<sigrok::ChannelGroup> group,
-		const std::vector< std::shared_ptr<pv::view::Signal> > sigs);
+	void populate_group(shared_ptr<sigrok::ChannelGroup> group,
+		const vector< shared_ptr<pv::data::SignalBase> > sigs);
 
 	QGridLayout* create_channel_group_grid(
-		const std::vector< std::shared_ptr<pv::view::Signal> > sigs);
+		const vector< shared_ptr<pv::data::SignalBase> > sigs);
 
 private:
-	void showEvent(QShowEvent *e);
+	void showEvent(QShowEvent *event);
 
 private Q_SLOTS:
 	void on_channel_checked(QWidget *widget);
@@ -87,9 +92,8 @@ private:
 
 	bool updating_channels_;
 
-	std::vector< std::shared_ptr<pv::prop::binding::DeviceOptions> >
-		 group_bindings_;
-	std::map< QCheckBox*, std::shared_ptr<pv::view::Signal> >
+	vector< shared_ptr<pv::binding::Device> > group_bindings_;
+	map< QCheckBox*, shared_ptr<pv::data::SignalBase> >
 		check_box_signal_map_;
 
 	QHBoxLayout buttons_bar_;
@@ -99,7 +103,7 @@ private:
 	QSignalMapper check_box_mapper_;
 };
 
-} // popups
-} // pv
+}  // namespace popups
+}  // namespace pv
 
-#endif // PULSEVIEW_PV_POPUPS_CHANNELS_H
+#endif // PULSEVIEW_PV_POPUPS_CHANNELS_HPP