X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.hpp;h=617ff071b3784621aa3ecac67aad215f9f9c775a;hp=7b7fcc5dc73329a7e0289276762f48959066c789;hb=dbed5609ae31cdfc3e9db10f3ab91b7607c08372;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329 diff --git a/pv/prop/enum.hpp b/pv/prop/enum.hpp index 7b7fcc5d..617ff071 100644 --- a/pv/prop/enum.hpp +++ b/pv/prop/enum.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 . */ -#ifndef PULSEVIEW_PV_PROP_ENUM_H -#define PULSEVIEW_PV_PROP_ENUM_H +#ifndef PULSEVIEW_PV_PROP_ENUM_HPP +#define PULSEVIEW_PV_PROP_ENUM_HPP #include #include @@ -28,6 +27,9 @@ #include +using std::pair; +using std::vector; + Q_DECLARE_METATYPE(Glib::VariantBase); class QComboBox; @@ -40,12 +42,14 @@ class Enum : public Property Q_OBJECT; public: - Enum(QString name, std::vector > values, + Enum(QString name, QString desc, + vector > values, Getter getter, Setter setter); - virtual ~Enum(); + virtual ~Enum() = default; QWidget* get_widget(QWidget *parent, bool auto_commit); + void update_widget(); void commit(); @@ -53,12 +57,12 @@ private Q_SLOTS: void on_current_item_changed(int); private: - const std::vector< std::pair > values_; + const vector< pair > values_; QComboBox *selector_; }; -} // prop -} // pv +} // namespace prop +} // namespace pv -#endif // PULSEVIEW_PV_PROP_ENUM_H +#endif // PULSEVIEW_PV_PROP_ENUM_HPP