projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename colour* to color*
[pulseview.git]
/
pv
/
prop
/
enum.cpp
diff --git
a/pv/prop/enum.cpp
b/pv/prop/enum.cpp
index a4c542af55fb9f05caaccd5043b0d7b098bbdaf2..d5d571a9ec487396b921cdae5b45855bb7bbabde 100644
(file)
--- a/
pv/prop/enum.cpp
+++ b/
pv/prop/enum.cpp
@@
-17,7
+17,7
@@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <
assert.h
>
+#include <
cassert
>
#include <QComboBox>
#include <QComboBox>
@@
-29,10
+29,10
@@
using std::vector;
namespace pv {
namespace prop {
namespace pv {
namespace prop {
-Enum::Enum(QString name,
+Enum::Enum(QString name,
QString desc,
vector<pair<Glib::VariantBase, QString> > values,
Getter getter, Setter setter) :
vector<pair<Glib::VariantBase, QString> > values,
Getter getter, Setter setter) :
- Property(name, getter, setter),
+ Property(name,
desc,
getter, setter),
values_(values),
selector_(nullptr)
{
values_(values),
selector_(nullptr)
{
@@
-84,5
+84,5
@@
void Enum::on_current_item_changed(int)
commit();
}
commit();
}
-}
//
prop
-}
//
pv
+}
// namespace
prop
+}
// namespace
pv