projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainBar: fixup file extension filter in "Import File" dialog
[pulseview.git]
/
pv
/
prop
/
enum.hpp
diff --git
a/pv/prop/enum.hpp
b/pv/prop/enum.hpp
index 7b7fcc5dc73329a7e0289276762f48959066c789..0193e238d562b224828bc98ac70b49c105b63dd0 100644
(file)
--- 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
* 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 <http://www.gnu.org/licenses/>.
*/
*/
-#ifndef PULSEVIEW_PV_PROP_ENUM_H
-#define PULSEVIEW_PV_PROP_ENUM_H
+#ifndef PULSEVIEW_PV_PROP_ENUM_H
PP
+#define PULSEVIEW_PV_PROP_ENUM_H
PP
#include <utility>
#include <vector>
#include <utility>
#include <vector>
@@
-28,6
+27,9
@@
#include <QMetaType>
#include <QMetaType>
+using std::pair;
+using std::vector;
+
Q_DECLARE_METATYPE(Glib::VariantBase);
class QComboBox;
Q_DECLARE_METATYPE(Glib::VariantBase);
class QComboBox;
@@
-40,10
+42,11
@@
class Enum : public Property
Q_OBJECT;
public:
Q_OBJECT;
public:
- Enum(QString name, std::vector<std::pair<Glib::VariantBase, QString> > values,
+ Enum(QString name, QString desc,
+ vector<pair<Glib::VariantBase, QString> > values,
Getter getter, Setter setter);
Getter getter, Setter setter);
- virtual ~Enum();
+ virtual ~Enum()
= default
;
QWidget* get_widget(QWidget *parent, bool auto_commit);
QWidget* get_widget(QWidget *parent, bool auto_commit);
@@
-53,12
+56,12
@@
private Q_SLOTS:
void on_current_item_changed(int);
private:
void on_current_item_changed(int);
private:
- const
std::vector< std::
pair<Glib::VariantBase, QString> > values_;
+ const
vector<
pair<Glib::VariantBase, QString> > values_;
QComboBox *selector_;
};
QComboBox *selector_;
};
-}
//
prop
-}
//
pv
+}
// namespace
prop
+}
// namespace
pv
-#endif // PULSEVIEW_PV_PROP_ENUM_H
+#endif // PULSEVIEW_PV_PROP_ENUM_H
PP