projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.gitignore: Ignore QtCreator generated files.
[pulseview.git]
/
pv
/
prop
/
enum.h
diff --git
a/pv/prop/enum.h
b/pv/prop/enum.h
index a7e6ed8d53f58bdcf8f5418ad7e695b1677e72e3..6ff785a3ba430562fffbfacb47d97b5990a0ed04 100644
(file)
--- a/
pv/prop/enum.h
+++ b/
pv/prop/enum.h
@@
-26,6
+26,10
@@
#include "property.h"
#include "property.h"
+#include <QMetaType>
+
+Q_DECLARE_METATYPE(Glib::VariantBase);
+
class QComboBox;
namespace pv {
class QComboBox;
namespace pv {
@@
-36,7
+40,7
@@
class Enum : public Property
Q_OBJECT;
public:
Q_OBJECT;
public:
- Enum(QString name, std::vector<std::pair<G
Variant*
, QString> > values,
+ Enum(QString name, std::vector<std::pair<G
lib::VariantBase
, QString> > values,
Getter getter, Setter setter);
virtual ~Enum();
Getter getter, Setter setter);
virtual ~Enum();
@@
-45,11
+49,11
@@
public:
void commit();
void commit();
-private
slots
:
+private
Q_SLOTS
:
void on_current_item_changed(int);
private:
void on_current_item_changed(int);
private:
- const std::vector< std::pair<G
Variant*
, QString> > _values;
+ const std::vector< std::pair<G
lib::VariantBase
, QString> > _values;
QComboBox *_selector;
};
QComboBox *_selector;
};