projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b101c41
)
Replaced boost::function with std::function
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Fri, 23 May 2014 22:32:20 +0000
(23:32 +0100)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sat, 24 May 2014 08:10:08 +0000
(09:10 +0100)
pv/prop/binding/deviceoptions.cpp
patch
|
blob
|
history
pv/prop/binding/deviceoptions.h
patch
|
blob
|
history
pv/prop/property.h
patch
|
blob
|
history
pv/sigsession.cpp
patch
|
blob
|
history
pv/sigsession.h
patch
|
blob
|
history
pv/storesession.cpp
patch
|
blob
|
history
pv/view/logicsignal.cpp
patch
|
blob
|
history
pv/view/viewport.cpp
patch
|
blob
|
history
diff --git
a/pv/prop/binding/deviceoptions.cpp
b/pv/prop/binding/deviceoptions.cpp
index a1ae6ba71e6fe50531b88286ef221320b6f054e1..39e12816fd2e3243c22bfeaaea4ca0410235b179 100644
(file)
--- a/
pv/prop/binding/deviceoptions.cpp
+++ b/
pv/prop/binding/deviceoptions.cpp
@@
-35,7
+35,7
@@
#include <libsigrok/libsigrok.h>
using boost::bind;
#include <libsigrok/libsigrok.h>
using boost::bind;
-using
boost
::function;
+using
std
::function;
using boost::optional;
using std::make_pair;
using std::pair;
using boost::optional;
using std::make_pair;
using std::pair;
diff --git
a/pv/prop/binding/deviceoptions.h
b/pv/prop/binding/deviceoptions.h
index f0ba92ef777ee85ec1f27bdc955f4624bcedd5bd..1e422f67161d48d8349970cc4f04a52499073cae 100644
(file)
--- a/
pv/prop/binding/deviceoptions.h
+++ b/
pv/prop/binding/deviceoptions.h
@@
-21,7
+21,6
@@
#ifndef PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
#define PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
#ifndef PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
#define PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
-#include <boost/function.hpp>
#include <boost/optional.hpp>
#include <QString>
#include <boost/optional.hpp>
#include <QString>
@@
-52,7
+51,7
@@
private:
void bind_bool(const QString &name, int key);
void bind_enum(const QString &name, int key,
GVariant *const gvar_list,
void bind_bool(const QString &name, int key);
void bind_enum(const QString &name, int key,
GVariant *const gvar_list,
-
boost
::function<QString (GVariant*)> printer = print_gvariant);
+
std
::function<QString (GVariant*)> printer = print_gvariant);
void bind_int(const QString &name, int key, QString suffix,
boost::optional< std::pair<int64_t, int64_t> > range);
void bind_int(const QString &name, int key, QString suffix,
boost::optional< std::pair<int64_t, int64_t> > range);
diff --git
a/pv/prop/property.h
b/pv/prop/property.h
index 0b4bc7b0ed9223bca1f20706688924812d41a51f..e5a523f93758ac6612f87637a06b7cad5770bd5e 100644
(file)
--- a/
pv/prop/property.h
+++ b/
pv/prop/property.h
@@
-23,8
+23,6
@@
#include <glib.h>
#include <glib.h>
-#include <boost/function.hpp>
-
#include <QString>
#include <QWidget>
#include <QString>
#include <QWidget>
@@
-38,8
+36,8
@@
class Property : public QObject
Q_OBJECT;
public:
Q_OBJECT;
public:
- typedef
boost
::function<GVariant* ()> Getter;
- typedef
boost
::function<void (GVariant*)> Setter;
+ typedef
std
::function<GVariant* ()> Getter;
+ typedef
std
::function<void (GVariant*)> Setter;
protected:
Property(QString name, Getter getter, Setter setter);
protected:
Property(QString name, Getter getter, Setter setter);
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index 84e1d48fdf19b0f62747745e0d60215d8330c066..cbcbaa8897e3add1bf5506e2c31a8438da14108a 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-47,8
+47,8
@@
#include <QDebug>
#include <QDebug>
-using boost::function;
using std::dynamic_pointer_cast;
using std::dynamic_pointer_cast;
+using std::function;
using std::lock_guard;
using std::mutex;
using std::list;
using std::lock_guard;
using std::mutex;
using std::list;
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 10d1e23de55d618d9a44ea36085955d23b55b3e7..927b2e7c3a5e41800b0669aff04997d267e18b7d 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-21,8
+21,6
@@
#ifndef PULSEVIEW_PV_SIGSESSION_H
#define PULSEVIEW_PV_SIGSESSION_H
#ifndef PULSEVIEW_PV_SIGSESSION_H
#define PULSEVIEW_PV_SIGSESSION_H
-#include <boost/function.hpp>
-
#include <map>
#include <memory>
#include <mutex>
#include <map>
#include <memory>
#include <mutex>
@@
-94,7
+92,7
@@
public:
capture_state get_capture_state() const;
capture_state get_capture_state() const;
- void start_capture(
boost
::function<void (const QString)> error_handler);
+ void start_capture(
std
::function<void (const QString)> error_handler);
void stop_capture();
void stop_capture();
@@
-135,11
+133,11
@@
private:
static sr_input* load_input_file_format(
const std::string &filename,
static sr_input* load_input_file_format(
const std::string &filename,
-
boost
::function<void (const QString)> error_handler,
+
std
::function<void (const QString)> error_handler,
sr_input_format *format = NULL);
void sample_thread_proc(std::shared_ptr<device::DevInst> dev_inst,
sr_input_format *format = NULL);
void sample_thread_proc(std::shared_ptr<device::DevInst> dev_inst,
-
boost
::function<void (const QString)> error_handler);
+
std
::function<void (const QString)> error_handler);
void feed_in_header(const sr_dev_inst *sdi);
void feed_in_header(const sr_dev_inst *sdi);
diff --git
a/pv/storesession.cpp
b/pv/storesession.cpp
index a97513433b9aa6601f7c13ced9e08e569b94ebc9..5eaff586b6ff787a7fc6a9bb4308a3b2deac3132 100644
(file)
--- a/
pv/storesession.cpp
+++ b/
pv/storesession.cpp
@@
-18,6
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <cassert>
+
#include "storesession.h"
#include <pv/sigsession.h>
#include "storesession.h"
#include <pv/sigsession.h>
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 8363383ac2125bfae2b04c21fa30d5749f87b147..77771f82e494d4f3d953c1b4006ad173a32debf2 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-20,7
+20,8
@@
#include <extdef.h>
#include <extdef.h>
-#include <math.h>
+#include <cassert>
+#include <cmath>
#include <QFormLayout>
#include <QToolBar>
#include <QFormLayout>
#include <QToolBar>
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index f8d568109f3c198f78e145ba0bdc25be041779b7..c5789630be883ed2bb45b3154576eafb4bad0a4b 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-18,6
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <cassert>
+
#include "view.h"
#include "viewport.h"
#include "view.h"
#include "viewport.h"