* 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_H
-#define PULSEVIEW_PV_PROP_PROPERTY_H
+#ifndef PULSEVIEW_PV_PROP_PROPERTY_HPP
+#define PULSEVIEW_PV_PROP_PROPERTY_HPP
-#include <glibmm-2.4/glibmm.h>
+#include <glib.h>
+// Suppress warnings due to use of deprecated std::auto_ptr<> by glibmm.
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+#include <glibmm.h>
+G_GNUC_END_IGNORE_DEPRECATIONS
#include <functional>
+
#include <QString>
#include <QWidget>
+using std::function;
+
class QWidget;
namespace pv {
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;
+ virtual QWidget* get_widget(QWidget *parent, bool auto_commit = false) = 0;
virtual bool labeled_widget() const;
+ virtual void update_widget() = 0;
virtual void commit() = 0;
private:
QString name_;
+ QString desc_;
};
-} // prop
-} // pv
+} // namespace prop
+} // namespace pv
-#endif // PULSEVIEW_PV_PROP_PROPERTY_H
+#endif // PULSEVIEW_PV_PROP_PROPERTY_HPP