X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fproperty.hpp;h=322c608490c775803eeebe00b189a1140c3ba3c1;hp=77eb9a6a73ec61f36f828775e22fbd3cf1b501d1;hb=9a267f8dec48c9a28472c1a3bb146c624819e98b;hpb=8ada6ef1319fa11fd594a34853967c1f9688913b

diff --git a/pv/prop/property.hpp b/pv/prop/property.hpp
index 77eb9a6..322c608 100644
--- a/pv/prop/property.hpp
+++ b/pv/prop/property.hpp
@@ -14,8 +14,7 @@
  * 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_PROPERTY_HPP
@@ -28,9 +27,12 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 G_GNUC_END_IGNORE_DEPRECATIONS
 
 #include <functional>
+
 #include <QString>
 #include <QWidget>
 
+using std::function;
+
 class QWidget;
 
 namespace pv {
@@ -41,14 +43,15 @@ class Property : public QObject
 	Q_OBJECT;
 
 public:
-	typedef std::function<Glib::VariantBase ()> Getter;
-	typedef std::function<void (Glib::VariantBase)> Setter;
+	typedef function<Glib::VariantBase ()> Getter;
+	typedef function<void (Glib::VariantBase)> Setter;
 
 protected:
-	Property(QString name, Getter getter, Setter setter);
+	Property(QString name, QString desc, Getter getter, Setter setter);
 
 public:
 	const QString& name() const;
+	const QString& desc() const;
 
 	virtual QWidget* get_widget(QWidget *parent,
 		bool auto_commit = false) = 0;
@@ -62,9 +65,10 @@ protected:
 
 private:
 	QString name_;
+	QString desc_;
 };
 
-} // prop
-} // pv
+}  // namespace prop
+}  // namespace pv
 
 #endif // PULSEVIEW_PV_PROP_PROPERTY_HPP