X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=d5d571a9ec487396b921cdae5b45855bb7bbabde;hp=6717101b9288f51d66f0c294a95def76590a14f0;hb=9a267f8dec48c9a28472c1a3bb146c624819e98b;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 6717101..d5d571a 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -14,11 +14,10 @@
  * 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/>.
  */
 
-#include <assert.h>
+#include <cassert>
 
 #include <QComboBox>
 
@@ -30,16 +29,12 @@ using std::vector;
 namespace pv {
 namespace prop {
 
-Enum::Enum(QString name,
+Enum::Enum(QString name, QString desc,
 	vector<pair<Glib::VariantBase, QString> > 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