X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=d5d571a9ec487396b921cdae5b45855bb7bbabde;hb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff;hp=473e3d5f1a3ad36582a3d5c770d4793f607b6124;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;p=pulseview.git
diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 473e3d5..d5d571a 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -14,15 +14,14 @@
* 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 .
*/
-#include
+#include
#include
-#include "enum.h"
+#include "enum.hpp"
using std::pair;
using std::vector;
@@ -30,16 +29,12 @@ using std::vector;
namespace pv {
namespace prop {
-Enum::Enum(QString name,
+Enum::Enum(QString name, QString desc,
vector > values,
Getter getter, Setter setter) :
- Property(name, getter, setter),
+ Property(name, desc, getter, setter),
values_(values),
- selector_(NULL)
-{
-}
-
-Enum::~Enum()
+ selector_(nullptr)
{
}
@@ -49,11 +44,11 @@ QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
return selector_;
if (!getter_)
- return NULL;
+ return nullptr;
Glib::VariantBase variant = getter_();
if (!variant.gobj())
- return NULL;
+ return nullptr;
selector_ = new QComboBox(parent);
for (unsigned int i = 0; i < values_.size(); i++) {
@@ -89,5 +84,5 @@ void Enum::on_current_item_changed(int)
commit();
}
-} // prop
-} // pv
+} // namespace prop
+} // namespace pv