X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fenum.hpp;h=0193e238d562b224828bc98ac70b49c105b63dd0;hb=90ee1ed9a90bc0651f86ee4af07e0958572f86da;hp=63f78af0d272c89215c1b770fa40a5a1b0c59bab;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f;p=pulseview.git
diff --git a/pv/prop/enum.hpp b/pv/prop/enum.hpp
index 63f78af..0193e23 100644
--- a/pv/prop/enum.hpp
+++ b/pv/prop/enum.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_PROP_ENUM_HPP
@@ -28,6 +27,9 @@
#include
+using std::pair;
+using std::vector;
+
Q_DECLARE_METATYPE(Glib::VariantBase);
class QComboBox;
@@ -40,10 +42,11 @@ 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);
@@ -53,12 +56,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_HPP