X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.hpp;h=3701325bc704572758831b8781d800a56cc39065;hb=20f59e957e70250cfb876ac7a1743134d6b83339;hp=62721ee177a36080d87e842668405fe1424a8c81;hpb=520362f8c4082820193f09e43b27a8c7df2ef011;p=pulseview.git
diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index 62721ee..3701325 100644
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -14,8 +14,7 @@
* 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 .
*/
#ifndef PULSEVIEW_PV_POPUPS_CHANNELS_HPP
@@ -32,6 +31,10 @@
#include
+using std::map;
+using std::shared_ptr;
+using std::vector;
+
class QCheckBox;
class QGridLayout;
@@ -47,6 +50,10 @@ namespace binding {
class Device;
}
+namespace data {
+class SignalBase;
+}
+
namespace view {
class Signal;
}
@@ -63,14 +70,14 @@ public:
private:
void set_all_channels(bool set);
- void populate_group(std::shared_ptr group,
- const std::vector< std::shared_ptr > sigs);
+ void populate_group(shared_ptr group,
+ const vector< shared_ptr > sigs);
QGridLayout* create_channel_group_grid(
- const std::vector< std::shared_ptr > sigs);
+ const vector< shared_ptr > sigs);
private:
- void showEvent(QShowEvent *e);
+ void showEvent(QShowEvent *event);
private Q_SLOTS:
void on_channel_checked(QWidget *widget);
@@ -85,9 +92,8 @@ private:
bool updating_channels_;
- std::vector< std::shared_ptr >
- group_bindings_;
- std::map< QCheckBox*, std::shared_ptr >
+ vector< shared_ptr > group_bindings_;
+ map< QCheckBox*, shared_ptr >
check_box_signal_map_;
QHBoxLayout buttons_bar_;
@@ -97,7 +103,7 @@ private:
QSignalMapper check_box_mapper_;
};
-} // popups
-} // pv
+} // namespace popups
+} // namespace pv
#endif // PULSEVIEW_PV_POPUPS_CHANNELS_HPP