X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.hpp;h=3701325bc704572758831b8781d800a56cc39065;hb=adb2a97bb18d0db0c936fa90b4164c8aac18e6fe;hp=25cd0ae66a3baf37a353acdc382ddfef8e2f92d7;hpb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;p=pulseview.git
diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index 25cd0ae6..3701325b 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;
@@ -67,11 +70,11 @@ 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 *event);
@@ -89,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_;
@@ -101,7 +103,7 @@ private:
QSignalMapper check_box_mapper_;
};
-} // popups
-} // pv
+} // namespace popups
+} // namespace pv
#endif // PULSEVIEW_PV_POPUPS_CHANNELS_HPP