projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use alphabetical order for #includes.
[pulseview.git]
/
pv
/
prop
/
property.hpp
diff --git
a/pv/prop/property.hpp
b/pv/prop/property.hpp
index dd6d25bad37460d4e1fe9bac6992366a42933907..765cbb50d8bb7e629a6ee1164507ccd9cd9b1ae3 100644
(file)
--- a/
pv/prop/property.hpp
+++ b/
pv/prop/property.hpp
@@
-14,19
+14,25
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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_H
PP
+#define PULSEVIEW_PV_PROP_PROPERTY_H
PP
-#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 <functional>
+
#include <QString>
#include <QWidget>
#include <QString>
#include <QWidget>
+using std::function;
+
class QWidget;
namespace pv {
class QWidget;
namespace pv {
@@
-37,8
+43,8
@@
class Property : public QObject
Q_OBJECT;
public:
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);
protected:
Property(QString name, Getter getter, Setter setter);
@@
-60,7
+66,7
@@
private:
QString name_;
};
QString name_;
};
-}
//
prop
-}
//
pv
+}
// namespace
prop
+}
// namespace
pv
-#endif // PULSEVIEW_PV_PROP_PROPERTY_H
+#endif // PULSEVIEW_PV_PROP_PROPERTY_H
PP